diff options
| author | kay.sievers@vrfy.org <kay.sievers@vrfy.org> | 2003-12-17 00:58:01 -0800 |
|---|---|---|
| committer | Greg KH <gregkh@suse.de> | 2005-04-26 21:13:09 -0700 |
| commit | 4868e8fba7fda5074fc7d64f4f22236127afc3c8 (patch) | |
| tree | c1ef49b4514136a83376856054a900d12320aefa | |
| parent | 9c23ec09a04529b3875fb496ed34765a84199aee (diff) | |
[PATCH] trivial cleanup parser changes
o use defines in debug strings
o replace my 'xxx' debug :)
o shorten line in man page example to not to exceed 80 chars when printed
| -rw-r--r-- | namedev_parse.c | 12 | ||||
| -rw-r--r-- | udev.8 | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/namedev_parse.c b/namedev_parse.c index 3578058a76..9cd96a6224 100644 --- a/namedev_parse.c +++ b/namedev_parse.c @@ -257,7 +257,7 @@ keys: /* check presence of keys according to method type */ switch (dev.type) { case LABEL: - dbg_parse("LABEL name='%s', bus='%s', " + dbg_parse(TYPE_LABEL " name='%s', bus='%s', " "sysfs_file='%s', sysfs_value='%s', symlink='%s'", dev.name, dev.bus, dev.sysfs_file, dev.sysfs_value, dev.symlink); @@ -268,7 +268,7 @@ keys: goto error; break; case NUMBER: - dbg_parse("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') || @@ -276,7 +276,7 @@ keys: goto error; break; case TOPOLOGY: - dbg_parse("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') || @@ -285,14 +285,14 @@ keys: goto error; break; case REPLACE: - dbg_parse("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: - dbg_parse("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); @@ -303,7 +303,7 @@ keys: goto error; break; default: - dbg_parse("xxx default method"); + dbg_parse("unknown type of method"); goto error; } @@ -178,7 +178,7 @@ TOPOLOGY, BUS="usb", PLACE="2.3", NAME="mouse1" REPLACE, KERNEL="ttyUSB1", NAME="pda", SYMLINK="palmtop handheld" # multiple USB webcams with symlinks to be called webcam0, webcam1, ... -LABEL, BUS="usb", SYSFS_model="WebCam V3", NAME="video%n", SYMLINK="webcam%n" +LABEL, BUS="usb", SYSFS_model="XV3", NAME="video%n", SYMLINK="webcam%n" .fi .P Permissions and ownership for the created device files may specified at |