components/pcsc-lite/patches/03-comp_warning_pcscdaemon.patch
author pkidd <patrick.kidd@oracle.com>
Wed, 26 Apr 2017 08:46:08 -0700
branchs11u3-sru
changeset 7947 3fa78a5a2366
parent 6361 2a305758f590
permissions -rw-r--r--
build metadata for S11.3SRU20.3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6361
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
     1
Upstream fix that will be included in another release of pcsclite.
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
     2
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
     3
From 2360debebf1c35c8599cd2e0fc484e5f5029ab87 Mon Sep 17 00:00:00 2001
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
     4
From: Ludovic Rousseau <[email protected]>
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
     5
Date: Sun, 24 Apr 2016 18:52:45 +0200
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
     6
Subject: [PATCH] Fix compiler warning on SunOS
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
     7
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
     8
pcscdaemon.c: In function 'main':
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
     9
pcscdaemon.c:402:5: warning: format '%d' expects argument of type 'int', but argument 6 has type 'pid_t' [-Wformat=]
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    10
     Log2(PCSC_LOG_CRITICAL,
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    11
     ^
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    12
---
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    13
 src/pcscdaemon.c | 2 +-
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    14
 1 file changed, 1 insertion(+), 1 deletion(-)
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    15
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    16
diff --git a/src/pcscdaemon.c b/src/pcscdaemon.c
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    17
index 624e759..099b18c 100644
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    18
--- a/src/pcscdaemon.c
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    19
+++ b/src/pcscdaemon.c
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    20
@@ -491,7 +491,7 @@ int main(int argc, char **argv)
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    21
 				Log1(PCSC_LOG_CRITICAL,
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    22
 					"file " PCSCLITE_CSOCK_NAME " already exists.");
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    23
 				Log2(PCSC_LOG_CRITICAL,
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    24
-					"Another pcscd (pid: %d) seems to be running.", pid);
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    25
+					"Another pcscd (pid: %ld) seems to be running.", (long)pid);
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    26
 				return EXIT_FAILURE;
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    27
 			}
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    28
 			else
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    29
-- 
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    30
1.9.1
2a305758f590 PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    31