hal/drive_id drive_id.h,1.1,1.2 logging.h,1.1,1.2

[David Zeuthen]

Update of /cvs/hal/hal/drive_id
In directory gabe:/tmp/cvs-serv25568/drive_id

Modified Files:
	drive_id.h logging.h 
Log Message:
2005-02-16  David Zeuthen  <davidz at redhat.com>

	* volume_id/luks.[ch]: New files (forgot to commit before) 

	* hald/linux2/probing/shared.h: Redefine logging a bit

	* hald/linux2/probing/probe-volume.c: Use new shared.h logging;
	implement volume_id_log and drive_id_log functions

	* hald/linux2/probing/probe-storage.c: Use new shared.h logging;
	implement volume_id_log and drive_id_log functions

	* hald/linux2/addons/addon-storage.c: Use new shared.h logging

	* drive_id/logging.h: Use drive_id_log function

	* drive_id/drive_id.h (drive_id_log): Add drive_id_log prototype



Index: drive_id.h
===================================================================
RCS file: /cvs/hal/hal/drive_id/drive_id.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- drive_id.h	7 Feb 2005 21:24:16 -0000	1.1
+++ drive_id.h	16 Feb 2005 22:25:20 -0000	1.2
@@ -56,4 +56,9 @@
 /* free allocated device info */
 extern void drive_id_close(struct drive_id *id);
 
+/* User of this library is supposed to export the drive_id_log symbol
+ * if sources are built with -DDEBUG
+ */
+extern void drive_id_log (const char *format, ...);
+
 #endif /* _DRIVE_ID_H_ */

Index: logging.h
===================================================================
RCS file: /cvs/hal/hal/drive_id/logging.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- logging.h	7 Feb 2005 21:24:16 -0000	1.1
+++ logging.h	16 Feb 2005 22:25:20 -0000	1.2
@@ -16,9 +16,9 @@
 #endif
 
 #ifdef DEBUG
-#define dbg(format, arg...)						\
-	do {								\
-		printf("%s: " format "\n", __FUNCTION__ , ## arg);	\
+#define dbg(format, arg...)							\
+	do {									\
+		drive_id_log("%s: " format "\n", __FUNCTION__ , ## arg);	\
 	} while (0)
 #else
 #define dbg(format, arg...)	do {} while (0)