libcaccard: coding style: replace DWORD and BYTE with uint32_t and uint8_t

3 files changed, 7 insertions, 11 deletions

diff --git a/mutex.h b/mutex.h
index b28e000..db44814 100644
--- a/mutex.h
+++ b/mutex.h
@@ -35,7 +35,7 @@ typedef CONDITION_VARIABLE condition_t;
 #define CONDITION_WAIT(cond,mutex) \
             SleepConditionVariableCS(&cond,&mutex,INFINTE)
 #define CONDITION_NOTIFY(cond) WakeConditionVariable(&cond)
-typedef DWORD thread_t;
+typedef uint32_t thread_t;
 typedef HANDLE thread_status_t;
 #define THREAD_CREATE(tid, func, arg) \
         CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)func, arg, 0, &tid)
diff --git a/passthru.c b/passthru.c
index 7baa3d1..5c2c7bd 100644
--- a/passthru.c
+++ b/passthru.c
@@ -20,7 +20,7 @@ struct VCardAppletPrivateStruct {
     char *reader_name;
     /* pcsc-lite parameters */
     SCARDHANDLE hCard;
-    DWORD hProtocol;
+    uint32_t hProtocol;
     SCARD_IO_REQUEST *send_io;
     unsigned char atr[MAX_ATR_SIZE];
     int atr_len;
@@ -37,7 +37,7 @@ passthru_process_apdu(VCard *card, VCardAPDU *apdu, VCardResponse **response)
 {
     LONG rv;
     unsigned char buf[MAX_RESPONSE_LENGTH];
-    DWORD len = MAX_RESPONSE_LENGTH;
+    uint32_t len = MAX_RESPONSE_LENGTH;
     VCardAppletPrivate *applet_private = NULL;
     SCARD_IO_REQUEST receive_io;
 
@@ -142,7 +142,7 @@ passthru_get_reader_name(VReader *reader)
     char *reader_list = NULL;
     char *reader_entry = NULL;
     char *reader_match = NULL;
-    DWORD reader_string_length;
+    uint32_t reader_string_length;
     VCardStatus status;
     LONG rv;
 
diff --git a/vscclient.c b/vscclient.c
index 2d7f614..ee539c1 100644
--- a/vscclient.c
+++ b/vscclient.c
@@ -18,17 +18,13 @@
 
 #include "mutex.h"
 
-
-typedef unsigned char BYTE;
-typedef unsigned long LONG;
-
 int verbose = 0;
 
 int sock;
 
 void
 PrintByteArray (
-    BYTE *arrBytes,
+    uint8_t *arrBytes,
     unsigned int nSize
 ) {
     int i;
@@ -445,8 +441,8 @@ main (
     LONG rv;
     int dwSendLength;
     int dwRecvLength;
-    BYTE pbRecvBuffer[APDUBufSize];
-    BYTE pbSendBuffer[APDUBufSize];
+    uint8_t pbRecvBuffer[APDUBufSize];
+    uint8_t pbSendBuffer[APDUBufSize];
      VReaderStatus reader_status;
     VReader *reader = NULL;
     VCardEmulOptions *command_line_options = NULL;