[Pcsclite-cvs-commit] r6953 - trunk/PCSC/src
ludovic.rousseau at free.fr
ludovic.rousseau at free.fr
Thu Aug 7 12:59:34 UTC 2014
Author: rousseau
Date: 2014-08-07 12:59:33 +0000 (Thu, 07 Aug 2014)
New Revision: 6953
Modified:
trunk/PCSC/src/hotplug_libudev.c
Log:
Udev is a global variable
Rename udev as Udev to make it more explicit it is a global variable.
Modified: trunk/PCSC/src/hotplug_libudev.c
===================================================================
--- trunk/PCSC/src/hotplug_libudev.c 2014-08-07 12:57:09 UTC (rev 6952)
+++ trunk/PCSC/src/hotplug_libudev.c 2014-08-07 12:59:33 UTC (rev 6953)
@@ -78,7 +78,7 @@
static pthread_t usbNotifyThread;
static int driverSize = -1;
-static struct udev *udev;
+static struct udev *Udev;
/**
@@ -569,7 +569,7 @@
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
- udev_monitor = udev_monitor_new_from_netlink(udev, "udev");
+ udev_monitor = udev_monitor_new_from_netlink(Udev, "udev");
if (NULL == udev_monitor)
{
Log1(PCSC_LOG_ERROR, "udev_monitor_new_from_netlink() error");
@@ -600,7 +600,7 @@
pthread_exit(NULL);
}
- HPScanUSB(udev);
+ HPScanUSB(Udev);
pfd.fd = fd;
pfd.events = POLLIN;
@@ -681,7 +681,7 @@
if (driverSize <= 0)
return 0;
- if (!udev)
+ if (!Udev)
return 0;
pthread_cancel(usbNotifyThread);
@@ -696,9 +696,9 @@
}
free(driverTracker);
- udev_unref(udev);
+ udev_unref(Udev);
- udev = NULL;
+ Udev = NULL;
driverSize = -1;
Log1(PCSC_LOG_INFO, "Hotplug stopped");
@@ -720,8 +720,8 @@
}
/* Create the udev object */
- udev = udev_new();
- if (!udev)
+ Udev = udev_new();
+ if (!Udev)
{
Log1(PCSC_LOG_ERROR, "udev_new() failed");
return SCARD_F_INTERNAL_ERROR;
More information about the Pcsclite-cvs-commit
mailing list