chiark / gitweb /
[PATCH] trivial cleanup parser changes
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>
Wed, 17 Dec 2003 08:58:01 +0000 (00:58 -0800)
committerGreg KH <gregkh@suse.de>
Wed, 27 Apr 2005 04:13:09 +0000 (21:13 -0700)
  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

namedev_parse.c
udev.8

index 3578058..9cd96a6 100644 (file)
@@ -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;
                }
 
diff --git a/udev.8 b/udev.8
index f26beb4..c4ee23d 100644 (file)
--- a/udev.8
+++ b/udev.8
@@ -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