[Pcsclite-cvs-commit] CVS HandlerTest/Host

CVS User rousseau ludovic.rousseau@free.fr
Tue, 21 Sep 2004 11:08:57 -0600


Update of /cvsroot/pcsclite/HandlerTest/Host
In directory haydn:/tmp/cvs-serv13676

Modified Files:
	handler_test.c 
Log Message:
rename pcsc_error() in ifd_error() since the error comes from the ifd
handler and not from pcsc


--- /cvsroot/pcsclite/HandlerTest/Host/handler_test.c	2004/09/21 17:05:35	1.16
+++ /cvsroot/pcsclite/HandlerTest/Host/handler_test.c	2004/09/21 17:08:57	1.17
@@ -18,7 +18,7 @@
 */
 
 /*
- * $Id: handler_test.c,v 1.16 2004/09/21 17:05:35 rousseau Exp $
+ * $Id: handler_test.c,v 1.17 2004/09/21 17:08:57 rousseau Exp $
  */
 
 #include <stdio.h>
@@ -41,7 +41,7 @@
 #endif
 
 int handler_test(int lun, int channel, char device_name[]);
-char *pcsc_error(int rv);
+char *ifd_error(int rv);
 int exchange(char *text, DWORD lun, SCARD_IO_HEADER SendPci,
 	PSCARD_IO_HEADER RecvPci,
 	UCHAR s[], DWORD s_length,
@@ -63,7 +63,7 @@
 	printf("--------> OK\n"); \
 	}
 
-#define PCSC_ERROR(x) printf("%s:%d " x ": %s\n", __FILE__, __LINE__, pcsc_error(rv))
+#define PCSC_ERROR(x) printf("%s:%d " x ": %s\n", __FILE__, __LINE__, ifd_error(rv))
 
 struct f_t {
 	RESPONSECODE (*IFDHCreateChannel)(DWORD, DWORD);
@@ -315,7 +315,7 @@
 		}
 		else
 			PCSC_ERROR("IFDHControl");
-			//printf("IFDHControl: %s\n", pcsc_error(rv));
+			//printf("IFDHControl: %s\n", ifd_error(rv));
 	}
 
 	rv = f.IFDHICCPresence(LUN);
@@ -739,7 +739,7 @@
 	return 0;
 } /* handler_test */
 
-char *pcsc_error(int rv)
+char *ifd_error(int rv)
 {
 	static char strError[80];
 
@@ -778,7 +778,7 @@
 	}
 
 	return strError;
-} /* pcsc_error */
+} /* ifd_error */
 
 int exchange(char *text, DWORD lun, SCARD_IO_HEADER SendPci,
 	PSCARD_IO_HEADER RecvPci,