shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-31 16:21:11 +03:00
Code

fix dbg() callers

Browse Source
This commit is contained in:
Kay Sievers 2008-09-29 19:03:08 +02:00
parent 9176ac1f4e
commit 4aa0b15efb
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
extras/scsi_id/scsi_id.c
View File

@ -256,7 +256,7 @@ static int get_file_options(struct udev *udev,
if (*buf == '#') if (*buf == '#')
continue; continue;
dbg("lineno %d: '%s'\n", lineno, buf); dbg(udev, "lineno %d: '%s'\n", lineno, buf);
str1 = strsep(&buf, "="); str1 = strsep(&buf, "=");
if (str1 && strcasecmp(str1, "VENDOR") == 0) { if (str1 && strcasecmp(str1, "VENDOR") == 0) {
str1 = get_value(&buf); 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", " vendor '%s'; model '%s'; options '%s'\n",
lineno, vendor_in, model_in, options_in); lineno, vendor_in, model_in, options_in);
/* /*
@ -299,7 +299,7 @@ static int get_file_options(struct udev *udev,
} }
if (vendor == NULL) { if (vendor == NULL) {
if (vendor_in == NULL) { if (vendor_in == NULL) {
dbg("matched global option\n"); dbg(udev, "matched global option\n");
break; break;
} }
} else if ((vendor_in && strncmp(vendor, vendor_in, } 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 * give a partial match (that is FOO
* matches FOOBAR). * matches FOOBAR).
*/ */
dbg("matched vendor/model\n"); dbg(udev, "matched vendor/model\n");
break; break;
} else { } 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 */ /* get per device (vendor + model) options from the config file */
retval = per_dev_options(udev, &dev_scsi, &good_dev, &page_code); 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) { if (!good_dev) {
retval = 1; retval = 1;
@ -617,7 +617,7 @@ static int scsi_id(struct udev *udev, char *maj_min_dev)
format_serial(dev_scsi.serial); format_serial(dev_scsi.serial);
printf("%s\n", 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;
} }

4
extras/usb_id/usb_id.c
View File

@ -208,7 +208,7 @@ static int usb_id(struct udev *udev, const char *devpath)
int if_class_num; int if_class_num;
int protocol = 0; 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 */ /* get all usb specific information: dev_interface, if_class, dev_usb */
dev = sysfs_device_get(udev, devpath); dev = sysfs_device_get(udev, devpath);
@ -327,7 +327,7 @@ fallback:
usb_model = sysfs_attr_get_value(udev, dev_usb->devpath, "idProduct"); usb_model = sysfs_attr_get_value(udev, dev_usb->devpath, "idProduct");
if (!usb_model) { if (!usb_model) {
dbg("No USB model information available\n"); dbg(udev, "No USB model information available\n");
return 1; return 1;
} }
set_str(model_str, usb_model, sizeof(model_str)-1); set_str(model_str, usb_model, sizeof(model_str)-1);

3
udev/udevadm-info.c
View File

@ -32,6 +32,7 @@
static void print_all_attributes(struct udev_device *device, const char *key) static void print_all_attributes(struct udev_device *device, const char *key)
{ {
struct udev *udev = udev_device_get_udev(device);
DIR *dir; DIR *dir;
struct dirent *dent; 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])) while (len > 0 && isprint(value[len-1]))
len--; len--;
if (len > 0) { 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; continue;
} }