[Pcsclite-cvs-commit] Drivers/ccid/src ccid.c,1.6,1.7 ccid.h,1.6,1.7

[rousseau@haydn.debian.org]

Update of /cvsroot/pcsclite/Drivers/ccid/src
In directory haydn:/tmp/cvs-serv10235

Modified Files:
	ccid.c ccid.h 
Log Message:
ccid_error() now also has a "char *function" argument to log the name of
the function in which the error occured


Index: ccid.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ccid.c	24 May 2004 12:58:43 -0000	1.6
+++ ccid.c	30 Jun 2004 09:43:45 -0000	1.7
@@ -22,8 +22,8 @@
  */
 
 #include <stdio.h>
-#include <pcsclite.h>
-#include <ifdhandler.h>
+#include <PCSC/pcsclite.h>
+#include <PCSC/ifdhandler.h>
 
 #include "config.h"
 #include "debug.h"
@@ -79,7 +79,7 @@
  *					ccid_error
  *
  ****************************************************************************/
-void ccid_error(int error, char *file, int line)
+void ccid_error(int error, char *file, int line, char *function)
 {
 	char *text;
 
@@ -197,7 +197,7 @@
 				text = "Unknown CCID error";
 			break;
 	}
-	debug_msg("%s:%d %s", file, line, text);
+	debug_msg("%s:%d:%s %s", file, line, function, text);
 
 } /* ccid_error */
 

Index: ccid.h
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ccid.h	25 May 2004 14:46:02 -0000	1.6
+++ ccid.h	30 Jun 2004 09:43:45 -0000	1.7
@@ -97,7 +97,7 @@
 
 
 int ccid_open_hack(int lun);
-void ccid_error(int error, char *file, int line);
+void ccid_error(int error, char *file, int line, char *function);
 _ccid_descriptor *get_ccid_descriptor(int lun);
 
 /* convert a 4 byte integer in USB format into an int */