chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] namedev.c - change order of fields in CALLOUT
[elogind.git]
/
namedev.c
diff --git
a/namedev.c
b/namedev.c
index 41480d50c02c0553061c5ece7ce55aedfc86f897..7c8761088f304036b4a3b3994fa3e06e082ed4da 100644
(file)
--- a/
namedev.c
+++ b/
namedev.c
@@
-286,7
+286,7
@@
static int namedev_init_config(void)
/* ID="id" */
temp2 = strsep(&temp, ",");
/* ID="id" */
temp2 = strsep(&temp, ",");
- retval = get_value("
id
", &temp, &temp3);
+ retval = get_value("
ID
", &temp, &temp3);
if (retval)
break;
strfieldcpy(dev.id, temp3);
if (retval)
break;
strfieldcpy(dev.id, temp3);
@@
-314,7
+314,7
@@
static int namedev_init_config(void)
/* PLACE="place" */
temp2 = strsep(&temp, ",");
/* PLACE="place" */
temp2 = strsep(&temp, ",");
- retval = get_value("
place
", &temp, &temp3);
+ retval = get_value("
PLACE
", &temp, &temp3);
if (retval)
break;
strfieldcpy(dev.place, temp3);
if (retval)
break;
strfieldcpy(dev.place, temp3);
@@
-353,18
+353,18
@@
static int namedev_init_config(void)
/* number type */
dev.type = CALLOUT;
/* number type */
dev.type = CALLOUT;
- /*
PROGRAM="executable
" */
- retval = get_value("
PROGRAM
", &temp, &temp3);
+ /*
BUS="bus
" */
+ retval = get_value("
BUS
", &temp, &temp3);
if (retval)
break;
if (retval)
break;
- strfieldcpy(dev.
exec_program
, temp3);
+ strfieldcpy(dev.
bus
, temp3);
- /*
BUS="bus
" */
+ /*
PROGRAM="executable
" */
temp2 = strsep(&temp, ",");
temp2 = strsep(&temp, ",");
- retval = get_value("
BUS
", &temp, &temp3);
+ retval = get_value("
PROGRAM
", &temp, &temp3);
if (retval)
break;
if (retval)
break;
- strfieldcpy(dev.
bus
, temp3);
+ strfieldcpy(dev.
exec_program
, temp3);
/* ID="id" */
temp2 = strsep(&temp, ",");
/* ID="id" */
temp2 = strsep(&temp, ",");