[Pcsclite-cvs-commit] r4240 - /trunk/PCSC/src/hotplug_libhal.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Tue Jun  2 13:34:51 2009
New Revision: 4240

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4240
Log:
HPAddDevice(): use NULL instead of an libhal error field since we do not
use the error value

Modified:
    trunk/PCSC/src/hotplug_libhal.c

Modified: trunk/PCSC/src/hotplug_libhal.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/hotplug_libhal.c?rev=4240&op=diff
==============================================================================
--- trunk/PCSC/src/hotplug_libhal.c (original)
+++ trunk/PCSC/src/hotplug_libhal.c Tue Jun  2 13:34:51 2009
@@ -325,7 +325,6 @@
 {
 	int i;
 	char deviceName[MAX_DEVICENAME];
-	DBusError error;
 	struct _driverTracker *driver;
 	LONG ret;
 
@@ -368,15 +367,13 @@
 	readerTracker[i].udi = strdup(udi);
 
 #ifdef ADD_SERIAL_NUMBER
-	dbus_error_init (&error);
-
-	if (libhal_device_property_exists(ctx, udi, "usb.serial", &error))
+	if (libhal_device_property_exists(ctx, udi, "usb.serial", NULL))
 	{
 		char fullname[MAX_READERNAME];
 		char *sSerialNumber;
 
 		sSerialNumber = libhal_device_get_property_string(ctx, udi,
-			"usb.serial", &error);
+			"usb.serial", NULL);
 
 		(void)snprintf(fullname, sizeof(fullname), "%s (%s)",
 			driver->readerName, sSerialNumber);
@@ -385,10 +382,6 @@
 	else
 #endif
 		readerTracker[i].fullName = strdup(driver->readerName);
-#ifdef ADD_SERIAL_NUMBER
-	if (dbus_error_is_set(&error))
-		dbus_error_free(&error);
-#endif
 
 	ret = RFAddReader(readerTracker[i].fullName, PCSCLITE_HP_BASE_PORT + i,
 		driver->libraryPath, deviceName);