move some info() to dbg()

[elogind.git] / udev / lib / libudev-enumerate.c

diff --git a/udev/lib/libudev-enumerate.c b/udev/lib/libudev-enumerate.c
index b35a82d0ceda8819fece12360eaf4edb3bdf627e..1b40d634845ffed0b466784c4cdf57c1303ff621 100644 (file)
--- a/udev/lib/libudev-enumerate.c
+++ b/udev/lib/libudev-enumerate.c
@@ -53,10 +53,9 @@ struct udev_enumerate *udev_enumerate_new(struct udev *udev)
 {
        struct udev_enumerate *udev_enumerate;
 
-       udev_enumerate = malloc(sizeof(struct udev_enumerate));
+       udev_enumerate = calloc(1, sizeof(struct udev_enumerate));
        if (udev_enumerate == NULL)
                return NULL;
-       memset(udev_enumerate, 0x00, (sizeof(struct udev_enumerate)));
        udev_enumerate->refcount = 1;
        udev_enumerate->udev = udev;
        udev_list_init(&udev_enumerate->devices_list);
@@ -311,7 +310,7 @@ static int devices_delay(struct udev *udev, const char *syspath)
        len = strlen(udev_get_sys_path(udev));
        for (i = 0; delay_device_list[i] != NULL; i++) {
                if (strstr(&syspath[len], delay_device_list[i]) != NULL) {
-                       info(udev, "delaying: %s\n", syspath);
+                       dbg(udev, "delaying: %s\n", syspath);
                        return 1;
                }
        }
@@ -369,23 +368,23 @@ int udev_enumerate_scan_devices(struct udev_enumerate *udev_enumerate)
        util_strlcat(base, "/subsystem", sizeof(base));
        if (stat(base, &statbuf) == 0) {
                /* we have /subsystem/, forget all the old stuff */
-               info(udev, "searching '/subsystem/*/devices/*' dir\n");
+               dbg(udev, "searching '/subsystem/*/devices/*' dir\n");
                scan_dir(udev_enumerate, "subsystem", "devices", NULL);
        } else {
-               info(udev, "searching '/bus/*/devices/*' dir\n");
+               dbg(udev, "searching '/bus/*/devices/*' dir\n");
                scan_dir(udev_enumerate, "bus", "devices", NULL);
-               info(udev, "searching '/class/*' dir\n");
+               dbg(udev, "searching '/class/*' dir\n");
                scan_dir(udev_enumerate, "class", NULL, NULL);
                /* if block isn't a class, scan /block/ */
                util_strlcpy(base, udev_get_sys_path(udev), sizeof(base));
                util_strlcat(base, "/class/block", sizeof(base));
                if (stat(base, &statbuf) != 0) {
                        if (match_subsystem(udev_enumerate, "block")) {
-                               info(udev, "searching '/block/*' dir\n");
+                               dbg(udev, "searching '/block/*' dir\n");
                                /* scan disks */
                                scan_dir_and_add_devices(udev_enumerate, "block", NULL, NULL);
                                /* scan partitions */
-                               info(udev, "searching '/block/*/*' dir\n");
+                               dbg(udev, "searching '/block/*/*' dir\n");
                                scan_dir(udev_enumerate, "block", NULL, "block");
                        }
                }
@@ -420,11 +419,11 @@ int udev_enumerate_scan_subsystems(struct udev_enumerate *udev_enumerate)
        else
                subsysdir = "bus";
        if (match_subsystem(udev_enumerate, "subsystem")) {
-               info(udev, "searching '%s/*' dir\n", subsysdir);
+               dbg(udev, "searching '%s/*' dir\n", subsysdir);
                scan_dir_and_add_devices(udev_enumerate, subsysdir, NULL, NULL);
        }
        if (match_subsystem(udev_enumerate, "drivers")) {
-               info(udev, "searching '%s/*/drivers/*' dir\n", subsysdir);
+               dbg(udev, "searching '%s/*/drivers/*' dir\n", subsysdir);
                scan_dir(udev_enumerate, subsysdir, "drivers", "drivers");
        }
        return 0;