commit caf58e76b4dbda33207c48b5a30f2cf19aa772d2
Author: Jan Palus <[email protected]>
Date: Sat Feb 27 20:57:03 2021 +0100
rediff patches
debuglog-pid.patch | 8 ++++----
pcsc-lite-any.patch | 12 ++++++------
2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/debuglog-pid.patch b/debuglog-pid.patch
index f681d95..a4b3491 100644
--- 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 58eaab6..e1acd3c 100644
--- 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;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pcsc-lite.git/commitdiff/02325f614671b6b32207625944919723c084abdf
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
