[PATCH] udev_volume_id: version 39

[elogind.git] / udevinfo.c

diff --git a/udevinfo.c b/udevinfo.c
index 6dfb918de58afedc7e880dc8366b30295ce8f867..e30a036ac6ee17be4cd2e95cbd8398116beb5f05 100644 (file)
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -3,7 +3,6 @@
  *
  * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
  *
- *
  *     This program is free software; you can redistribute it and/or modify it
  *     under the terms of the GNU General Public License as published by the
  *     Free Software Foundation version 2 of the License.
@@ -38,7 +37,7 @@
 
 #define SYSFS_VALUE_SIZE               256
 
-#ifdef LOG
+#ifdef USE_LOG
 void log_message (int level, const char *format, ...)
 {
        va_list args;
@@ -181,8 +180,8 @@ exit:
        return retval;
 }
 
-static int print_dump(struct udevice *udev) {
-       printf("%s:%s/%s\n", udev->devpath, udev_root, udev->name);
+static int print_dump(const char *devpath, const char *name) {
+       printf("%s:%s/%s\n", devpath, udev_root, name);
        return 0;
 }
 
@@ -260,7 +259,7 @@ int main(int argc, char *argv[], char *envp[])
                        break;
 
                case 'd':
-                       udev_db_call_foreach(print_dump);
+                       udev_db_dump_names(print_dump);
                        goto exit;
 
                case 'V':