[PATCH] improve klibc fixup integration

[elogind.git] / udevinfo.c

diff --git a/udevinfo.c b/udevinfo.c
index b23f9d0aef45fb5f29619be091bc6d1facaa2f5e..af2346c8f566e8e9fad54868a98ec0e2446cff28 100644 (file)
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -104,17 +104,18 @@ exit:
 }
 
 /* callback for database dump */
-static int print_record(char *path, struct udevice *dev)
+static int print_record(const char *path, struct udevice *dev)
 {
        printf("P: %s\n", path);
        printf("N: %s\n", dev->name);
+       printf("T: %c\n", dev->type);
        printf("M: %#o\n", dev->mode);
        printf("S: %s\n", dev->symlink);
        printf("O: %s\n", dev->owner);
        printf("G: %s\n", dev->group);
        printf("F: %s\n", dev->config_file);
        printf("L: %i\n", dev->config_line);
-       printf("T: %li\n", dev->config_time);
+       printf("U: %li\n", dev->config_uptime);
        printf("\n");
        return 0;
 }
@@ -446,18 +447,18 @@ help:
 
 int main(int argc, char *argv[], char *envp[])
 {
-       int retval;
+       int rc = 0;
 
        main_argv = argv;
        main_argc = argc;
 
-       init_logging("udevinfo");
+       logging_init("udevinfo");
 
        /* initialize our configuration */
        udev_init_config();
 
-       retval = process_options();
-       if (retval != 0)
-               exit(1);
-       exit(0);
+       rc = process_options();
+
+       logging_close();
+       exit(rc);
 }