[Pcsclite-git-commit] [PCSC] 15/16: DebugLogSetCategory() returns void now

Ludovic Rousseau rousseau at moszumanska.debian.org
Thu May 11 16:26:04 UTC 2017


This is an automated email from the git hooks/post-receive script.

rousseau pushed a commit to branch master
in repository PCSC.

commit 091d501225eb1eef5535f4f7e0e07a0ae8cf909e
Author: Ludovic Rousseau <ludovic.rousseau at free.fr>
Date:   Thu May 11 15:16:19 2017 +0200

    DebugLogSetCategory() returns void now
    
    The value returned by DebugLogSetCategory() was ignored.
    Now the DebugLogSetCategory() function returns void.
---
 src/PCSC/debuglog.h | 2 +-
 src/debuglog.c      | 6 ++----
 src/pcscdaemon.c    | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/PCSC/debuglog.h b/src/PCSC/debuglog.h
index 30c45fd..8f3ba0d 100644
--- a/src/PCSC/debuglog.h
+++ b/src/PCSC/debuglog.h
@@ -125,7 +125,7 @@ PCSC_API void log_xxd(const int priority, const char *msg,
 
 void DebugLogSuppress(const int);
 void DebugLogSetLogType(const int);
-int DebugLogSetCategory(const int);
+void DebugLogSetCategory(const int);
 void DebugLogCategory(const int, const unsigned char *, const int);
 PCSC_API void DebugLogSetLevel(const int level);
 
diff --git a/src/debuglog.c b/src/debuglog.c
index b326191..8c65e91 100644
--- a/src/debuglog.c
+++ b/src/debuglog.c
@@ -81,7 +81,7 @@ void DebugLogSetLevel(const int level)
 	(void)level;
 }
 
-INTERNAL int DebugLogSetCategory(const int dbginfo)
+INTERNAL void DebugLogSetCategory(const int dbginfo)
 {
 	(void)dbginfo;
 
@@ -296,7 +296,7 @@ void DebugLogSetLevel(const int level)
 	}
 }
 
-INTERNAL int DebugLogSetCategory(const int dbginfo)
+INTERNAL void DebugLogSetCategory(const int dbginfo)
 {
 	/* use a negative number to UNset
 	 * typically use ~DEBUG_CATEGORY_APDU
@@ -308,8 +308,6 @@ INTERNAL int DebugLogSetCategory(const int dbginfo)
 
 	if (LogCategory & DEBUG_CATEGORY_APDU)
 		Log1(PCSC_LOG_INFO, "Debug options: APDU");
-
-	return LogCategory;
 }
 
 INTERNAL void DebugLogCategory(const int category, const unsigned char *buffer,
diff --git a/src/pcscdaemon.c b/src/pcscdaemon.c
index 8745a96..7311e4c 100644
--- a/src/pcscdaemon.c
+++ b/src/pcscdaemon.c
@@ -371,7 +371,7 @@ int main(int argc, char **argv)
 				return EXIT_SUCCESS;
 
 			case 'a':
-				(void)DebugLogSetCategory(DEBUG_CATEGORY_APDU);
+				DebugLogSetCategory(DEBUG_CATEGORY_APDU);
 				break;
 
 			case 'H':

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pcsclite/PCSC.git



More information about the Pcsclite-cvs-commit mailing list