picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[PATCH] rename attributes to options

Browse source
This commit is contained in:
kay.sievers@vrfy.org 2005-03-04 21:00:43 +01:00 committed by Greg KH
parent 75bc9b086f
commit c98cb35eb5
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
namedev.h
View file

@ -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

10
namedev_parse.c
View file

@ -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;
}