fix dbg() callers

diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c
index bf06ed2794abd233a8fe2af4fecdd8391e4a54e9..10ec98c8bf5c7f319cf888f76bffe4ee0776dd51 100644 (file)
--- a/extras/scsi_id/scsi_id.c
+++ b/extras/scsi_id/scsi_id.c
@@ -256,7 +256,7 @@ static int get_file_options(struct udev *udev,
                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);
@@ -286,7 +286,7 @@ static int get_file_options(struct udev *udev,
                        }
                        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);
                /*
@@ -299,7 +299,7 @@ static int get_file_options(struct udev *udev,
                }
                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,
@@ -313,10 +313,10 @@ static int get_file_options(struct udev *udev,
                                 * give a partial match (that is FOO
                                 * matches FOOBAR).
                                 */
-                               dbg("matched vendor/model\n");
+                               dbg(udev, "matched vendor/model\n");
                                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);
-       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;
@@ -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);
                }
-               dbg("%s\n", dev_scsi.serial);
+               dbg(udev, "%s\n", dev_scsi.serial);
                retval = 0;
        }
 

diff --git a/extras/usb_id/usb_id.c b/extras/usb_id/usb_id.c
index f482147b68cd270fad090a8b82eebb57d7418e7f..215455212042ce568c8dff0334033554a39fb508 100644 (file)
--- a/extras/usb_id/usb_id.c
+++ b/extras/usb_id/usb_id.c
@@ -208,7 +208,7 @@ static int usb_id(struct udev *udev, const char *devpath)
        int if_class_num;
        int protocol = 0;
 
-       dbg("devpath %s\n", devpath);
+       dbg(udev, "devpath %s\n", devpath);
 
        /* get all usb specific information: dev_interface, if_class, dev_usb */
        dev = sysfs_device_get(udev, devpath);
@@ -327,7 +327,7 @@ fallback:
                        usb_model = sysfs_attr_get_value(udev, dev_usb->devpath, "idProduct");
 
                if (!usb_model) {
-                       dbg("No USB model information available\n");
+                       dbg(udev, "No USB model information available\n");
                        return 1;
                }
                set_str(model_str, usb_model, sizeof(model_str)-1);

diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c
index 0a774b057f83a694c66e69c108750a1f907d1b2d..624fb01eb43a75ca77fde353d9e7a4713b3f9cfb 100644 (file)
--- a/udev/udevadm-info.c
+++ b/udev/udevadm-info.c
@@ -32,6 +32,7 @@
 
 static void print_all_attributes(struct udev_device *device, const char *key)
 {
+       struct udev *udev = udev_device_get_udev(device);
        DIR *dir;
        struct dirent *dent;
 
@@ -69,7 +70,7 @@ static void print_all_attributes(struct udev_device *device, const char *key)
                        while (len > 0 && isprint(value[len-1]))
                                len--;
                        if (len > 0) {
-                               dbg(info, "attribute value of '%s' non-printable, skip\n", dent->d_name);
+                               dbg(udev, "attribute value of '%s' non-printable, skip\n", dent->d_name);
                                continue;
                        }