From a23913ff9c29b705f920c39e3d0c368bb3a40ad3 Mon Sep 17 00:00:00 2001 From: Frank Morgner Date: Fri, 18 Sep 2015 08:46:50 +0200 Subject: [PATCH] Uses %Ix instead of %x Fixes compiler warning about implicit type conversion on 64 bit machine --- virtualsmartcard/src/vpcd/vpcd.c | 5 ++++- virtualsmartcard/win32/BixVReader/PipeReader.cpp | 2 +- virtualsmartcard/win32/BixVReader/sectionLocker.cpp | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/virtualsmartcard/src/vpcd/vpcd.c b/virtualsmartcard/src/vpcd/vpcd.c index f5fd969..c43abad 100644 --- a/virtualsmartcard/src/vpcd/vpcd.c +++ b/virtualsmartcard/src/vpcd/vpcd.c @@ -70,7 +70,10 @@ ssize_t sendall(SOCKET sock, const void *buffer, size_t size) * size_t to ssize_t (or int), which have both the same width! */ for (sent = 0; sent < size; sent += r) { r = send(sock, (void *) (((unsigned char *) buffer)+sent), - ((int) size)-sent, MSG_NOSIGNAL); +#ifdef _WIN32 + (int) +#endif + (size-sent), MSG_NOSIGNAL); if (r < 0) return r; diff --git a/virtualsmartcard/win32/BixVReader/PipeReader.cpp b/virtualsmartcard/win32/BixVReader/PipeReader.cpp index 3027e9d..fdef72d 100644 --- a/virtualsmartcard/win32/BixVReader/PipeReader.cpp +++ b/virtualsmartcard/win32/BixVReader/PipeReader.cpp @@ -144,7 +144,7 @@ DWORD PipeReader::startServer() { swprintf(temp,L"\\\\.\\pipe\\%s",pipeEventName); HANDLE _eventpipe=CreateNamedPipe(temp,PIPE_ACCESS_DUPLEX|FILE_FLAG_OVERLAPPED,PIPE_TYPE_BYTE,PIPE_UNLIMITED_INSTANCES,0,0,0,&sa); wchar_t log[300]; - swprintf(log,L"[BixVReader]Pipe created:%s:%08x",pipeName,_pipe); + swprintf(log,L"[BixVReader]Pipe created:%s:%08Ix",pipeName,_pipe); OutputDebugString(log); while (true) { diff --git a/virtualsmartcard/win32/BixVReader/sectionLocker.cpp b/virtualsmartcard/win32/BixVReader/sectionLocker.cpp index f2beace..a2ed5fd 100644 --- a/virtualsmartcard/win32/BixVReader/sectionLocker.cpp +++ b/virtualsmartcard/win32/BixVReader/sectionLocker.cpp @@ -10,7 +10,7 @@ SectionLocker::SectionLocker(CRITICAL_SECTION &critsection,char *function,int li if (TryEnterCriticalSection(section)==0) { OutputDebugStringA("[BixVReader]RACE!"); char logBuffer[500]; - sprintf(logBuffer,"[BixVReader]Richiesto da:Function:%s,Line:%i,Object:%x,Lock:%x",Function,Line,Object,section); + sprintf(logBuffer,"[BixVReader]Richiesto da:Function:%s,Line:%i,Object:%Ix,Lock:%Ix",Function,Line,Object,section); OutputDebugStringA(logBuffer); ShowMe=section; EnterCriticalSection(section); @@ -23,7 +23,7 @@ SectionLocker::SectionLocker(CRITICAL_SECTION &critsection,char *function,int li SectionLocker::~SectionLocker() { if (section==ShowMe) { char logBuffer[500]; - sprintf(logBuffer,"[BixVReader]Posseduto da:Function:%s,Line:%i,Object:%x,Lock:%x",Function,Line,Object,section); + sprintf(logBuffer,"[BixVReader]Posseduto da:Function:%s,Line:%i,Object:%Ix,Lock:%Ix",Function,Line,Object,section); OutputDebugStringA(logBuffer); ShowMe=NULL; }