diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2011-04-17 22:09:08 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2011-04-17 22:09:08 +0200 |
| commit | 372b9bffa7197b345df35f75a577195a19b72eff (patch) | |
| tree | 8f052d72c594d9055a90615fdec4d6591cf70484 /udev | |
| parent | f2fd4d2723a082288f1bd2a1d647c4897732dfd8 (diff) | |
udevadm: test - use printf() instead of info() for non-debug output
Diffstat (limited to 'udev')
| -rw-r--r-- | udev/udevadm-test.c | 6 | ||||
| -rw-r--r-- | udev/udevadm.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/udev/udevadm-test.c b/udev/udevadm-test.c index 4db70c49dd..4137ce91fa 100644 --- a/udev/udevadm-test.c +++ b/udev/udevadm-test.c @@ -114,17 +114,17 @@ int udevadm_test(struct udev *udev, int argc, char *argv[]) err = udev_event_execute_rules(event, rules); if (udev_device_get_event_timeout(dev) >= 0) - info(udev, "custom event timeout: %i\n", udev_device_get_event_timeout(dev)); + printf("custom event timeout: %i\n", udev_device_get_event_timeout(dev)); udev_list_entry_foreach(entry, udev_device_get_properties_list_entry(dev)) - info(udev, "%s=%s\n", udev_list_entry_get_name(entry), udev_list_entry_get_value(entry)); + printf("%s=%s\n", udev_list_entry_get_name(entry), udev_list_entry_get_value(entry)); if (err == 0) udev_list_entry_foreach(entry, udev_list_get_entry(&event->run_list)) { char program[UTIL_PATH_SIZE]; udev_event_apply_format(event, udev_list_entry_get_name(entry), program, sizeof(program)); - info(udev, "run: '%s'\n", program); + printf("run: '%s'\n", program); } udev_event_unref(event); udev_device_unref(dev); diff --git a/udev/udevadm.c b/udev/udevadm.c index 336d723705..2a29158917 100644 --- a/udev/udevadm.c +++ b/udev/udevadm.c @@ -25,7 +25,7 @@ #include "udev.h" -static int debug; +static bool debug; static void log_fn(struct udev *udev, int priority, const char *file, int line, const char *fn, @@ -101,7 +101,7 @@ static const struct command cmds[] = { .name = "test", .cmd = udevadm_test, .help = "simulation run", - .debug = 1, + .debug = true, }, { .name = "version", @@ -117,7 +117,7 @@ static const struct command cmds[] = { static int run_command(struct udev *udev, const struct command *cmd, int argc, char *argv[]) { if (cmd->debug) { - debug = 1; + debug = true; if (udev_get_log_priority(udev) < LOG_INFO) udev_set_log_priority(udev, LOG_INFO); } @@ -155,7 +155,7 @@ int main(int argc, char *argv[]) switch (option) { case 'd': - debug = 1; + debug = true; if (udev_get_log_priority(udev) < LOG_INFO) udev_set_log_priority(udev, LOG_INFO); break; |