libudev: add global property list

[elogind.git] / extras / scsi_id / scsi_id.c

diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c
index bf06ed2794abd233a8fe2af4fecdd8391e4a54e9..6334af386b0910c9ee1a09c7ded395cfb513b85e 100644 (file)
--- a/extras/scsi_id/scsi_id.c
+++ b/extras/scsi_id/scsi_id.c
@@ -31,17 +31,17 @@
 #include "scsi_id.h"
 
 static const struct option options[] = {
 #include "scsi_id.h"
 
 static const struct option options[] = {

-       { "device", 1, NULL, 'd' },
-       { "config", 1, NULL, 'f' },
-       { "page", 1, NULL, 'p' },
-       { "blacklisted", 0, NULL, 'b' },
-       { "whitelisted", 0, NULL, 'g' },
-       { "replace-whitespace", 0, NULL, 'u' },
-       { "sg-version", 1, NULL, 's' },
-       { "verbose", 0, NULL, 'v' },
-       { "version", 0, NULL, 'V' },
-       { "export", 0, NULL, 'x' },
-       { "help", 0, NULL, 'h' },
+       { "device", required_argument, NULL, 'd' },
+       { "config", required_argument, NULL, 'f' },
+       { "page", required_argument, NULL, 'p' },
+       { "blacklisted", no_argument, NULL, 'b' },
+       { "whitelisted", no_argument, NULL, 'g' },
+       { "replace-whitespace", no_argument, NULL, 'u' },
+       { "sg-version", required_argument, NULL, 's' },
+       { "verbose", no_argument, NULL, 'v' },
+       { "version", no_argument, NULL, 'V' },
+       { "export", no_argument, NULL, 'x' },
+       { "help", no_argument, NULL, 'h' },

        {}
 };
 
        {}
 };
 


@@ -256,7 +256,7 @@ static int get_file_options(struct udev *udev,
                if (*buf == '#')
                        continue;
 
                if (*buf == '#')
                        continue;
 

-               dbg("lineno %d: '%s'\n", lineno, buf);
+               dbg(udev, "lineno %d: '%s'\n", lineno, buf);

                str1 = strsep(&buf, "=");
                if (str1 && strcasecmp(str1, "VENDOR") == 0) {
                        str1 = get_value(&buf);
                str1 = strsep(&buf, "=");
                if (str1 && strcasecmp(str1, "VENDOR") == 0) {
                        str1 = get_value(&buf);


@@ -286,7 +286,7 @@ static int get_file_options(struct udev *udev,
                        }
                        options_in = str1;
                }
                        }
                        options_in = str1;
                }

-               dbg("config file line %d:\n"
+               dbg(udev, "config file line %d:\n"

                        " vendor '%s'; model '%s'; options '%s'\n",
                        lineno, vendor_in, model_in, options_in);
                /*
                        " vendor '%s'; model '%s'; options '%s'\n",
                        lineno, vendor_in, model_in, options_in);
                /*


@@ -299,7 +299,7 @@ static int get_file_options(struct udev *udev,
                }
                if (vendor == NULL) {
                        if (vendor_in == NULL) {
                }
                if (vendor == NULL) {
                        if (vendor_in == NULL) {

-                               dbg("matched global option\n");
+                               dbg(udev, "matched global option\n");

                                break;
                        }
                } else if ((vendor_in && strncmp(vendor, vendor_in,
                                break;
                        }
                } else if ((vendor_in && strncmp(vendor, vendor_in,


@@ -313,10 +313,10 @@ static int get_file_options(struct udev *udev,
                                 * give a partial match (that is FOO
                                 * matches FOOBAR).
                                 */
                                 * give a partial match (that is FOO
                                 * matches FOOBAR).
                                 */

-                               dbg("matched vendor/model\n");
+                               dbg(udev, "matched vendor/model\n");

                                break;
                } else {
                                break;
                } else {

-                       dbg("no match\n");
+                       dbg(udev, "no match\n");

                }
        }
 
                }
        }
 


@@ -589,7 +589,7 @@ static int scsi_id(struct udev *udev, char *maj_min_dev)
 
        /* get per device (vendor + model) options from the config file */
        retval = per_dev_options(udev, &dev_scsi, &good_dev, &page_code);
 
        /* get per device (vendor + model) options from the config file */
        retval = per_dev_options(udev, &dev_scsi, &good_dev, &page_code);

-       dbg("per dev options: good %d; page code 0x%x\n", good_dev, page_code);
+       dbg(udev, "per dev options: good %d; page code 0x%x\n", good_dev, page_code);

 
        if (!good_dev) {
                retval = 1;
 
        if (!good_dev) {
                retval = 1;


@@ -617,7 +617,7 @@ static int scsi_id(struct udev *udev, char *maj_min_dev)
                                format_serial(dev_scsi.serial);
                        printf("%s\n", dev_scsi.serial);
                }
                                format_serial(dev_scsi.serial);
                        printf("%s\n", dev_scsi.serial);
                }

-               dbg("%s\n", dev_scsi.serial);
+               dbg(udev, "%s\n", dev_scsi.serial);

                retval = 0;
        }
 
                retval = 0;
        }