summary refs log tree commit diff
path: root/pkgs/tools/security/pcsclite/no-dropdir-literals.patch
blob: 6e6734c954329e49f0f5bf0fb8454d268cff8fdb (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
diff --git a/src/hotplug_libudev.c b/src/hotplug_libudev.c
index a8ba1b8..a53700b 100644
--- a/src/hotplug_libudev.c
+++ b/src/hotplug_libudev.c
@@ -119,7 +119,8 @@ static LONG HPReadBundleValues(void)
 
 	if (NULL == hpDir)
 	{
-		Log1(PCSC_LOG_ERROR, "Cannot open PC/SC drivers directory: " PCSCLITE_HP_DROPDIR);
+		Log2(PCSC_LOG_ERROR, "Cannot open PC/SC drivers directory: %s",
+			PCSCLITE_HP_DROPDIR);
 		Log1(PCSC_LOG_ERROR, "Disabling USB support for pcscd.");
 		return -1;
 	}
@@ -722,7 +723,7 @@ ULONG HPRegisterForHotplugEvents(void)
 
 	if (driverSize <= 0)
 	{
-		Log1(PCSC_LOG_INFO, "No bundle files in pcsc drivers directory: "
+		Log2(PCSC_LOG_INFO, "No bundle files in pcsc drivers directory: %s",
 			PCSCLITE_HP_DROPDIR);
 		Log1(PCSC_LOG_INFO, "Disabling USB support for pcscd");
 		return 0;
diff --git a/src/hotplug_libusb.c b/src/hotplug_libusb.c
index eff8519..8dd496d 100644
--- a/src/hotplug_libusb.c
+++ b/src/hotplug_libusb.c
@@ -138,7 +138,8 @@ static LONG HPReadBundleValues(void)
 
 	if (hpDir == NULL)
 	{
-		Log1(PCSC_LOG_ERROR, "Cannot open PC/SC drivers directory: " PCSCLITE_HP_DROPDIR);
+		Log2(PCSC_LOG_ERROR, "Cannot open PC/SC drivers directory: %s",
+			PCSCLITE_HP_DROPDIR);
 		Log1(PCSC_LOG_ERROR, "Disabling USB support for pcscd.");
 		return -1;
 	}
@@ -265,7 +266,8 @@ static LONG HPReadBundleValues(void)
 
 	if (driverSize == 0)
 	{
-		Log1(PCSC_LOG_INFO, "No bundle files in pcsc drivers directory: " PCSCLITE_HP_DROPDIR);
+		Log2(PCSC_LOG_INFO, "No bundle files in pcsc drivers directory: %s",
+			PCSCLITE_HP_DROPDIR);
 		Log1(PCSC_LOG_INFO, "Disabling USB support for pcscd");
 	}
 #ifdef DEBUG_HOTPLUG
diff --git a/src/hotplug_linux.c b/src/hotplug_linux.c
index bf69af8..64b0ed7 100644
--- a/src/hotplug_linux.c
+++ b/src/hotplug_linux.c
@@ -130,8 +130,8 @@ static LONG HPReadBundleValues(void)
 
 	if (hpDir == NULL)
 	{
-		Log1(PCSC_LOG_INFO,
-			"Cannot open PC/SC drivers directory: " PCSCLITE_HP_DROPDIR);
+		Log2(PCSC_LOG_INFO, "Cannot open PC/SC drivers directory: %s",
+			PCSCLITE_HP_DROPDIR);
 		Log1(PCSC_LOG_INFO, "Disabling USB support for pcscd.");
 		return -1;
 	}
@@ -219,8 +219,8 @@ end:
 
 	if (bundleSize == 0)
 	{
-		Log1(PCSC_LOG_INFO,
-			"No bundle files in pcsc drivers directory: " PCSCLITE_HP_DROPDIR);
+		Log2(PCSC_LOG_INFO, "No bundle files in pcsc drivers directory: %s",
+			PCSCLITE_HP_DROPDIR);
 		Log1(PCSC_LOG_INFO, "Disabling USB support for pcscd");
 	}