diff options
| author | kay.sievers@vrfy.org <kay.sievers@vrfy.org> | 2004-10-18 22:57:41 -0700 |
|---|---|---|
| committer | Greg KH <gregkh@suse.de> | 2005-04-26 22:06:44 -0700 |
| commit | ff694eca172deb298e806246f6e88bc66235534a (patch) | |
| tree | 475aa7aee75d2c5d01cb4b8da7e6d471b459b496 | |
| parent | 3b2382de5192057d4c3ac25ddce9c70348d756f9 (diff) | |
[PATCH] fix debug in volume id / fix clashing global var name
Here we get the logging for udev_volume_id working if it is compiled
with DEBUG=true. Also fixed is a name clash with a global variable.
| -rw-r--r-- | extras/volume_id/Makefile | 5 | ||||
| -rw-r--r-- | extras/volume_id/udev_volume_id.c | 10 | ||||
| -rw-r--r-- | wait_for_sysfs.c | 8 |
3 files changed, 13 insertions, 10 deletions
diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile index d0c6e40fa3..c419e8860f 100644 --- a/extras/volume_id/Makefile +++ b/extras/volume_id/Makefile @@ -28,9 +28,8 @@ INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 INSTALL_SCRIPT = ${INSTALL_PROGRAM} -override CFLAGS+=-Wall -fno-builtin -Wchar-subscripts -Wmissing-declarations \ - -Wnested-externs -Wpointer-arith -Wcast-align \ - -Wsign-compare +override CFLAGS+=-Wall -fno-builtin -Wchar-subscripts \ + -Wpointer-arith -Wcast-align -Wsign-compare override CFLAGS+=-D_FILE_OFFSET_BITS=64 diff --git a/extras/volume_id/udev_volume_id.c b/extras/volume_id/udev_volume_id.c index 6b62db0775..5d1ccf6a89 100644 --- 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); } diff --git a/wait_for_sysfs.c b/wait_for_sysfs.c index b6de3947c8..45f84606b1 100644 --- a/wait_for_sysfs.c +++ b/wait_for_sysfs.c @@ -387,7 +387,7 @@ int main(int argc, char *argv[], char *envp[]) const char *devpath = ""; const char *action; const char *subsystem; - char sysfs_path[SYSFS_PATH_MAX]; + char sysfs_mnt_path[SYSFS_PATH_MAX]; char filename[SYSFS_PATH_MAX]; struct sysfs_class_device *class_dev; struct sysfs_device *devices_dev; @@ -422,14 +422,14 @@ int main(int argc, char *argv[], char *envp[]) 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) { dbg("error: no sysfs path"); rc = 2; goto exit; } if ((strncmp(devpath, "/block/", 7) == 0) || (strncmp(devpath, "/class/", 7) == 0)) { - snprintf(filename, SYSFS_PATH_MAX-1, "%s%s", sysfs_path, devpath); + snprintf(filename, SYSFS_PATH_MAX-1, "%s%s", sysfs_mnt_path, devpath); filename[SYSFS_PATH_MAX-1] = '\0'; /* open the class device we are called for */ @@ -446,7 +446,7 @@ int main(int argc, char *argv[], char *envp[]) sysfs_close_class_device(class_dev); } else if ((strncmp(devpath, "/devices/", 9) == 0)) { - snprintf(filename, SYSFS_PATH_MAX-1, "%s%s", sysfs_path, devpath); + snprintf(filename, SYSFS_PATH_MAX-1, "%s%s", sysfs_mnt_path, devpath); filename[SYSFS_PATH_MAX-1] = '\0'; /* open the path we are called for */ |