diff options
| author | kay.sievers@vrfy.org <kay.sievers@vrfy.org> | 2003-11-21 06:47:29 -0800 |
|---|---|---|
| committer | Greg KH <gregkh@suse.de> | 2005-04-26 21:06:25 -0700 |
| commit | cb08e0f2531f910fcd46a24b2fa0eb8049165b02 (patch) | |
| tree | baa309004fba5f025460fa4827d98a2b92a68484 /namedev.c | |
| parent | 8f43a65e4f0b545d705cc4cf9f31fa336b0cf8f3 (diff) | |
| download | systemd-cb08e0f2531f910fcd46a24b2fa0eb8049165b02.tar.gz | |
[PATCH] namedev.c - change order of fields in CALLOUT
I want to bring the CALLOUT field ordering in line with the other
methods, cause the current parsing relies on the ordering it's good
to have it like the others. The BUS= is now the first expected field.
Also made the last two remaining field names to uppercase and the man page
callout example is updated.
Diffstat (limited to 'namedev.c')
| -rw-r--r-- | namedev.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -286,7 +286,7 @@ static int namedev_init_config(void) /* ID="id" */ temp2 = strsep(&temp, ","); - retval = get_value("id", &temp, &temp3); + retval = get_value("ID", &temp, &temp3); if (retval) break; strfieldcpy(dev.id, temp3); @@ -314,7 +314,7 @@ static int namedev_init_config(void) /* PLACE="place" */ temp2 = strsep(&temp, ","); - retval = get_value("place", &temp, &temp3); + retval = get_value("PLACE", &temp, &temp3); if (retval) break; strfieldcpy(dev.place, temp3); @@ -353,18 +353,18 @@ static int namedev_init_config(void) /* number type */ dev.type = CALLOUT; - /* PROGRAM="executable" */ - retval = get_value("PROGRAM", &temp, &temp3); + /* BUS="bus" */ + retval = get_value("BUS", &temp, &temp3); if (retval) break; - strfieldcpy(dev.exec_program, temp3); + strfieldcpy(dev.bus, temp3); - /* BUS="bus" */ + /* PROGRAM="executable" */ temp2 = strsep(&temp, ","); - retval = get_value("BUS", &temp, &temp3); + retval = get_value("PROGRAM", &temp, &temp3); if (retval) break; - strfieldcpy(dev.bus, temp3); + strfieldcpy(dev.exec_program, temp3); /* ID="id" */ temp2 = strsep(&temp, ","); |