fix debug in volume id / fix clashing global var name

fix debug in volume id / fix clashing global var name

[Kay Sievers]

[-- Attachment #1: Type: text/plain, Size: 173 bytes --]

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.

Queue is empty now :)

Thanks,
Kay

[-- Attachment #2: udev-volume_id-log-01.patch --]
[-- Type: text/plain, Size: 3367 bytes --]

===== wait_for_sysfs.c 1.24 vs edited =====
--- 1.24/wait_for_sysfs.c	2004-10-18 18:53:13 +02:00
+++ edited/wait_for_sysfs.c	2004-10-18 23:32:41 +02:00
@@ -386,7 +386,7 @@ int main(int argc, char *argv[], char *e
 	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;
@@ -421,14 +421,14 @@ int main(int argc, char *argv[], char *e
 		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 */
@@ -445,7 +445,7 @@ int main(int argc, char *argv[], char *e
 		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 */
===== extras/volume_id/Makefile 1.4 vs edited =====
--- 1.4/extras/volume_id/Makefile	2004-10-15 19:49:26 +02:00
+++ edited/extras/volume_id/Makefile	2004-10-18 23:28:29 +02:00
@@ -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
 
===== extras/volume_id/udev_volume_id.c 1.4 vs edited =====
--- 1.4/extras/volume_id/udev_volume_id.c	2004-09-18 22:40:49 +02:00
+++ edited/extras/volume_id/udev_volume_id.c	2004-10-18 23:35:49 +02:00
@@ -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);
@@ -260,6 +262,8 @@ exit:
 		sysfs_close_class_device(class_dev);
 	if (vid != NULL)
 		volume_id_close(vid);
+
+	logging_close();
 
 	exit(rc);
 }

Re: fix debug in volume id / fix clashing global var name

[Greg KH]

On Mon, Oct 18, 2004 at 11:46:57PM +0200, Kay Sievers wrote:
> 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.
> 
> Queue is empty now :)

Applied, thanks.

greg k-h


-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
Linux-hotplug-devel mailing list  http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel