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] small cleanup
[elogind.git]
/
namedev_parse.c
diff --git
a/namedev_parse.c
b/namedev_parse.c
index 266fa35a1945939ab5f384d70980dfcd3b2c089e..4b1377dc32a43b64f26b4cdee86afebdb055e7eb 100644
(file)
--- a/
namedev_parse.c
+++ b/
namedev_parse.c
@@
-103,7
+103,7
@@
void dump_config_dev(struct config_device *dev)
dev->name, dev->bus, dev->place);
break;
case REPLACE:
dev->name, dev->bus, dev->place);
break;
case REPLACE:
- dbg_parse("REPLACE name=
%s, kernel_name=%s
",
+ dbg_parse("REPLACE name=
'%s', kernel_name='%s'
",
dev->name, dev->kernel_name);
break;
case CALLOUT:
dev->name, dev->kernel_name);
break;
case CALLOUT:
@@
-117,12
+117,10
@@
void dump_config_dev(struct config_device *dev)
void dump_config_dev_list(void)
{
void dump_config_dev_list(void)
{
- struct
list_head *tmp
;
+ struct
config_device *dev
;
- list_for_each(tmp, &config_device_list) {
- struct config_device *dev = list_entry(tmp, struct config_device, node);
+ list_for_each_entry(dev, &config_device_list, node)
dump_config_dev(dev);
dump_config_dev(dev);
- }
}
void dump_perm_dev(struct perm_device *dev)
}
void dump_perm_dev(struct perm_device *dev)
@@
-133,12
+131,10
@@
void dump_perm_dev(struct perm_device *dev)
void dump_perm_dev_list(void)
{
void dump_perm_dev_list(void)
{
- struct
list_head *tmp
;
+ struct
perm_device *dev
;
- list_for_each(tmp, &perm_device_list) {
- struct perm_device *dev = list_entry(tmp, struct perm_device, node);
+ list_for_each_entry(dev, &perm_device_list, node)
dump_perm_dev(dev);
dump_perm_dev(dev);
- }
}
}
@@
-176,7
+172,7
@@
int namedev_init_rules(void)
++temp;
/* empty line? */
++temp;
/* empty line? */
- if (
*temp == 0x00
)
+ if (
(*temp == '\0') || (*temp == '\n')
)
continue;
/* see if this is a comment */
continue;
/* see if this is a comment */
@@
-289,13
+285,12
@@
keys:
dev.name, dev.bus, dev.sysfs_pair[0].file,
dev.sysfs_pair[0].value, dev.symlink);
if ((*dev.name == '\0') ||
dev.name, dev.bus, dev.sysfs_pair[0].file,
dev.sysfs_pair[0].value, dev.symlink);
if ((*dev.name == '\0') ||
- (*dev.bus == '\0') ||
(*dev.sysfs_pair[0].file == '\0') ||
(*dev.sysfs_pair[0].value == '\0'))
goto error;
break;
case NUMBER:
(*dev.sysfs_pair[0].file == '\0') ||
(*dev.sysfs_pair[0].value == '\0'))
goto error;
break;
case NUMBER:
- dbg_parse(TYPE_NUMBER "name='%s', bus='%s', id='%s', symlink='%s'",
+ dbg_parse(TYPE_NUMBER "
name='%s', bus='%s', id='%s', symlink='%s'",
dev.name, dev.bus, dev.id, dev.symlink);
if ((*dev.name == '\0') ||
(*dev.bus == '\0') ||
dev.name, dev.bus, dev.id, dev.symlink);
if ((*dev.name == '\0') ||
(*dev.bus == '\0') ||
@@
-303,7
+298,7
@@
keys:
goto error;
break;
case TOPOLOGY:
goto error;
break;
case TOPOLOGY:
- dbg_parse(TYPE_TOPOLOGY "name='%s', bus='%s', "
+ dbg_parse(TYPE_TOPOLOGY "
name='%s', bus='%s', "
"place='%s', symlink='%s'",
dev.name, dev.bus, dev.place, dev.symlink);
if ((*dev.name == '\0') ||
"place='%s', symlink='%s'",
dev.name, dev.bus, dev.place, dev.symlink);
if ((*dev.name == '\0') ||
@@
-312,19
+307,18
@@
keys:
goto error;
break;
case REPLACE:
goto error;
break;
case REPLACE:
- dbg_parse(TYPE_REPLACE "name='%s', kernel_name='%s', symlink='%s'",
+ dbg_parse(TYPE_REPLACE "
name='%s', kernel_name='%s', symlink='%s'",
dev.name, dev.kernel_name, dev.symlink);
if ((*dev.name == '\0') ||
(*dev.kernel_name == '\0'))
goto error;
break;
case CALLOUT:
dev.name, dev.kernel_name, dev.symlink);
if ((*dev.name == '\0') ||
(*dev.kernel_name == '\0'))
goto error;
break;
case CALLOUT:
- dbg_parse(TYPE_CALLOUT "name='%s', bus='%s', program='%s', "
+ dbg_parse(TYPE_CALLOUT "
name='%s', bus='%s', program='%s', "
"id='%s', symlink='%s'",
dev.name, dev.bus, dev.exec_program,
dev.id, dev.symlink);
if ((*dev.name == '\0') ||
"id='%s', symlink='%s'",
dev.name, dev.bus, dev.exec_program,
dev.id, dev.symlink);
if ((*dev.name == '\0') ||
- (*dev.bus == '\0') ||
(*dev.id == '\0') ||
(*dev.exec_program == '\0'))
goto error;
(*dev.id == '\0') ||
(*dev.exec_program == '\0'))
goto error;
@@
-378,7
+372,7
@@
int namedev_init_permissions(void)
++temp;
/* empty line? */
++temp;
/* empty line? */
- if (
*temp == 0x00
)
+ if (
(*temp == '\0') || (*temp == '\n')
)
continue;
/* see if this is a comment */
continue;
/* see if this is a comment */