hal/hald/linux2/addons addon-acpi.c, 1.16, 1.17 addon-hid-ups.c, 1.12, 1.13 addon-pmu.c, 1.7, 1.8 addon-storage.c, 1.18, 1.19 addon-usb-csr.c, 1.9, 1.10

[Danny Kukawka]

Update of /cvs/hal/hal/hald/linux2/addons
In directory kemper:/tmp/cvs-serv28920/hald/linux2/addons

Modified Files:
	addon-acpi.c addon-hid-ups.c addon-pmu.c addon-storage.c 
	addon-usb-csr.c 
Log Message:
2006-05-09  Danny Kukawka  <danny.kukawka at web.de>

        Added support for --use-syslog option to prober and addons. This
        should allow easy logging complete hal debug information to syslog
        if hald run in daemon mode:

        * hald/hald_runner.c: (add_basic_env): added HALD_USE_SYSLOG to env
        * hald/linux2/probing/shared.h: added support for HALD_USE_SYSLOG

        Replaced in prober and addons old debug code with support for
        --use-syslog instead of log to sterr.

        * hald/linux2/addons/addon-acpi.c: (main):
        * hald/linux2/addons/addon-hid-ups.c: (ups_get_string), (main):
        * hald/linux2/addons/addon-pmu.c: (main):
        * hald/linux2/addons/addon-storage.c: (main):
        * hald/linux2/addons/addon-usb-csr.c: (main):
        * hald/linux2/probing/probe-input.c: (main):
        * hald/linux2/probing/probe-pc-floppy.c: (main):
        * hald/linux2/probing/probe-printer.c: (main):
        * hald/linux2/probing/probe-serial.c: (main):
        * hald/linux2/probing/probe-smbios.c: (main): also fixed set debug
        option before use dbg() the first time
        * hald/linux2/probing/probe-storage.c: (main): replaced printf with
        dbg() and removed some needless debug lines.
        * hald/linux2/probing/probe-volume.c: (main):



Index: addon-acpi.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/addons/addon-acpi.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- addon-acpi.c	22 Feb 2006 21:10:06 -0000	1.16
+++ addon-acpi.c	9 May 2006 20:34:38 -0000	1.17
@@ -167,8 +167,7 @@
 	drop_privileges (0);
 #endif
 
-	if (getenv ("HALD_VERBOSE") != NULL)
-		is_verbose = TRUE;
+	_set_debug ();
 
 	dbus_error_init (&error);
 

Index: addon-hid-ups.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/addons/addon-hid-ups.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- addon-hid-ups.c	11 Jan 2006 14:13:47 -0000	1.12
+++ addon-hid-ups.c	9 May 2006 20:34:38 -0000	1.13
@@ -112,7 +112,7 @@
 	if (ioctl (fd, HIDIOCGSTRING, &sdesc) < 0) {
 		return "";
 	}
-	fprintf (stderr, "foo: '%s'\n", sdesc.value);
+	dbg ("foo: '%s'", sdesc.value);
 	return sdesc.value;
 }
 
@@ -272,6 +272,8 @@
 	struct hiddev_event ev[64];
 	int rd;
 
+	_set_debug ();
+	
 	udi = getenv ("UDI");
 	if (udi == NULL)
 		goto out;

Index: addon-pmu.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/addons/addon-pmu.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- addon-pmu.c	22 Feb 2006 21:57:03 -0000	1.7
+++ addon-pmu.c	9 May 2006 20:34:38 -0000	1.8
@@ -57,8 +57,7 @@
 
 	fd = -1;
 
-	if ((getenv ("HALD_VERBOSE")) != NULL)
-		is_verbose = TRUE;
+	_set_debug ();
 
 	udi = getenv ("UDI");
 	if (udi == NULL)

Index: addon-storage.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/addons/addon-storage.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- addon-storage.c	22 Feb 2006 21:10:06 -0000	1.18
+++ addon-storage.c	9 May 2006 20:34:38 -0000	1.19
@@ -284,8 +284,7 @@
 	if ((drive_type = getenv ("HAL_PROP_STORAGE_DRIVE_TYPE")) == NULL)
 		goto out;
 
-	if ((getenv ("HALD_VERBOSE")) != NULL)
-		is_verbose = TRUE;
+	_set_debug ();
 
 	support_media_changed_str = getenv ("HAL_PROP_STORAGE_CDROM_SUPPORT_MEDIA_CHANGED");
 	if (support_media_changed_str != NULL && strcmp (support_media_changed_str, "true") == 0)
@@ -297,11 +296,9 @@
 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
 		goto out;
 
-	printf ("**************************************************\n");
-	printf ("**************************************************\n");
-	printf ("Doing addon-storage for %s (bus %s) (drive_type %s) (udi %s)\n", device_file, bus, drive_type, udi);
-	printf ("**************************************************\n");
-	printf ("**************************************************\n");
+	dbg ("**************************************************");
+	dbg ("Doing addon-storage for %s (bus %s) (drive_type %s) (udi %s)", device_file, bus, drive_type, udi);
+	dbg ("**************************************************");
 
 	if (strcmp (drive_type, "cdrom") == 0)
 		is_cdrom = 1;

Index: addon-usb-csr.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/addons/addon-usb-csr.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- addon-usb-csr.c	2 Nov 2005 15:38:14 -0000	1.9
+++ addon-usb-csr.c	9 May 2006 20:34:38 -0000	1.10
@@ -260,9 +260,8 @@
 main (int argc, char *argv[])
 {
 	DBusError err;
-	
-	if ((getenv ("HALD_VERBOSE")) != NULL)
-		is_verbose = TRUE;
+
+	_set_debug ();	
 
 	device_udi = getenv ("UDI");