From c98cb35eb5f24940cf8836be96de42c9e8795f27 Mon Sep 17 00:00:00 2001 From: "kay.sievers@vrfy.org" Date: Fri, 4 Mar 2005 21:00:43 +0100 Subject: [PATCH] [PATCH] rename attributes to options --- namedev.h | 6 +++--- namedev_parse.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/namedev.h b/namedev.h index 3a1614416..1d6920cc7 100644 --- a/namedev.h +++ b/namedev.h @@ -52,9 +52,9 @@ struct sysfs_class_device; #define FIELD_MODE "MODE" #define FIELD_OPTIONS "OPTIONS" -#define ATTR_IGNORE_DEVICE "ignore_device" -#define ATTR_IGNORE_REMOVE "ignore_remove" -#define ATTR_PARTITIONS "all_partitions" +#define OPTION_IGNORE_DEVICE "ignore_device" +#define OPTION_IGNORE_REMOVE "ignore_remove" +#define OPTION_PARTITIONS "all_partitions" #define MAX_SYSFS_PAIRS 5 diff --git a/namedev_parse.c b/namedev_parse.c index 02d8a6520..ed38db4b1 100644 --- a/namedev_parse.c +++ b/namedev_parse.c @@ -250,11 +250,11 @@ static int namedev_parse(const char *filename, void *data) attr = get_key_attribute(temp2 + sizeof(FIELD_NAME)-1); /* FIXME: remove old style options and make OPTIONS= mandatory */ if (attr != NULL) { - if (strstr(attr, ATTR_PARTITIONS) != NULL) { + if (strstr(attr, OPTION_PARTITIONS) != NULL) { dbg_parse("creation of partition nodes requested"); dev.partitions = DEFAULT_PARTITIONS_COUNT; } - if (strstr(attr, ATTR_IGNORE_REMOVE) != NULL) { + if (strstr(attr, OPTION_IGNORE_REMOVE) != NULL) { dbg_parse("remove event should be ignored"); dev.ignore_remove = 1; } @@ -292,15 +292,15 @@ static int namedev_parse(const char *filename, void *data) } if (strcasecmp(temp2, FIELD_OPTIONS) == 0) { - if (strstr(temp3, ATTR_IGNORE_DEVICE) != NULL) { + if (strstr(temp3, OPTION_IGNORE_DEVICE) != NULL) { dbg_parse("device should be ignored"); dev.ignore_device = 1; } - if (strstr(temp3, ATTR_IGNORE_REMOVE) != NULL) { + if (strstr(temp3, OPTION_IGNORE_REMOVE) != NULL) { dbg_parse("remove event should be ignored"); dev.ignore_remove = 1; } - if (strstr(temp3, ATTR_PARTITIONS) != NULL) { + if (strstr(temp3, OPTION_PARTITIONS) != NULL) { dbg_parse("creation of partition nodes requested"); dev.partitions = DEFAULT_PARTITIONS_COUNT; } -- 2.30.2