rediff patches

diff --git a/debuglog-pid.patch b/debuglog-pid.patch
index f681d95eea2bb089fa9be46afaa41cb089b0456b..a4b3491260ff3d10670e1fd49b8604239d753b53 100644 (file)
--- a/debuglog-pid.patch
+++ b/debuglog-pid.patch
@@ -7,10 +7,10 @@
 +      // boolean not to do openlog several times
 +      static int syslog_opened = 0;
  
-       if ((LogSuppress != DEBUGLOG_LOG_ENTRIES)
-               || (priority < LogLevel) /* log priority lower than threshold? */
+       if ((priority < LogLevel) /* log priority lower than threshold? */
+               || (DEBUGLOG_NO_DEBUG == LogMsgType))
 @@ -114,13 +116,18 @@
-       vsnprintf(DebugBuffer, DEBUG_BUF_SIZE, fmt, argptr);
+       vsnprintf(DebugBuffer, sizeof DebugBuffer, fmt, argptr);
        va_end(argptr);
  
 +      if (DEBUGLOG_SYSLOG_DEBUG == LogMsgType && !syslog_opened) {
@@ -28,4 +28,4 @@
 +              syslog(LOG_DEBUG, "%s", DebugBuffer);
        else
        {
-               if (LogDoColor)
+               static struct timeval last_time = { 0, 0 };

diff --git a/pcsc-lite-any.patch b/pcsc-lite-any.patch
index 58eaab6df263a4677d93e8bbb6534a0b6f2f6ca5..e1acd3ce6ad19db8831ca15ca7f3ca0b61f6539e 100644 (file)
--- a/pcsc-lite-any.patch
+++ b/pcsc-lite-any.patch
@@ -2,7 +2,7 @@
 +++ pcsc-lite-1.5.2/src/winscard.c     2009-04-02 22:54:43.137718835 +0200
 @@ -430,6 +430,12 @@
                        {
-                               (void)SYS_MutexUnLock(rContext->mMutex);
+                               (void)pthread_mutex_unlock(rContext->mMutex);
  
 +                              /*
 +                               * If it is set to ANY let it do any of the protocols
@@ -11,11 +11,11 @@
 +                                      dwPreferredProtocols = SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1;
 +
                                if (! (dwPreferredProtocols & rContext->readerState->cardProtocol))
-                                       return SCARD_E_PROTO_MISMATCH;
-                       }
+                               {
+                                       rv = SCARD_E_PROTO_MISMATCH;
 @@ -758,6 +764,12 @@
                        {
-                               (void)SYS_MutexUnLock(rContext->mMutex);
+                               (void)pthread_mutex_unlock(rContext->mMutex);
  
 +                              /*
 +                               * If it is set to ANY let it do any of the protocols
@@ -24,5 +24,5 @@
 +                                      dwPreferredProtocols = SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1;
 +
                                if (! (dwPreferredProtocols & rContext->readerState->cardProtocol))
-                                       return SCARD_E_PROTO_MISMATCH;
-                       }
+                               {
+                                       rv = SCARD_E_PROTO_MISMATCH;