[PATCH] fix debug in volume id / fix clashing global var name

[elogind.git] / extras / volume_id / udev_volume_id.c

diff --git a/extras/volume_id/udev_volume_id.c b/extras/volume_id/udev_volume_id.c
index 6b62db0775e38c52bf0ea20fee07965732918d35..5d1ccf6a89d74c4ce5dce05dc545eee34a61c3ef 100644 (file)
--- a/extras/volume_id/udev_volume_id.c
+++ b/extras/volume_id/udev_volume_id.c
@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
                            "       -d disk label from main device\n"
                            "\n";
        static const char short_options[] = "htlud";
-       char sysfs_path[SYSFS_PATH_MAX];
+       char sysfs_mnt_path[SYSFS_PATH_MAX];
        char dev_path[SYSFS_PATH_MAX];
        struct sysfs_class_device *class_dev = NULL;
        struct sysfs_class_device *class_dev_parent = NULL;
@@ -118,6 +118,8 @@ int main(int argc, char *argv[])
        unsigned long long size;
        int rc = 1;
 
+       logging_init("udev_volume_id");
+
        while (1) {
                int option;
 
@@ -152,12 +154,12 @@ int main(int argc, char *argv[])
                goto exit;
        }
 
-       if (sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX) != 0) {
+       if (sysfs_get_mnt_path(sysfs_mnt_path, SYSFS_PATH_MAX) != 0) {
                printf("error getting sysfs mount path\n");
                goto exit;
        }
 
-       strfieldcpy(dev_path, sysfs_path);
+       strfieldcpy(dev_path, sysfs_mnt_path);
        strfieldcat(dev_path, devpath);
 
        class_dev = sysfs_open_class_device_path(dev_path);
@@ -261,5 +263,7 @@ exit:
        if (vid != NULL)
                volume_id_close(vid);
 
+       logging_close();
+
        exit(rc);
 }