[Pcsclite-cvs-commit] CVS PCSC/src
CVS User rousseau
ludovic.rousseau@free.fr
Tue, 12 Apr 2005 07:38:44 +0000
Update of /cvsroot/pcsclite/PCSC/src
In directory haydn:/tmp/cvs-serv6541
Modified Files:
dyn_unix.c strlcat.c strlcpy.c sys_unix.c thread_unix.c
winscard_msg.c
Log Message:
define some/most functions as INTERNAL (see misc.h) so the function symbols
are not visible in libpcsclite.so
This will prevent function names collision with homonym functions
defined in a library or program linked with libpcsclite.so
--- /cvsroot/pcsclite/PCSC/src/dyn_unix.c 2005/02/22 14:40:26 1.13
+++ /cvsroot/pcsclite/PCSC/src/dyn_unix.c 2005/04/12 07:38:44 1.14
@@ -8,7 +8,7 @@
* Copyright (C) 2004
* Ludovic Rousseau <ludovic.rousseau@free.fr>
*
- * $Id: dyn_unix.c,v 1.13 2005/02/22 14:40:26 rousseau Exp $
+ * $Id: dyn_unix.c,v 1.14 2005/04/12 07:38:44 rousseau Exp $
*/
#include "config.h"
@@ -21,8 +21,9 @@
#include "pcsclite.h"
#include "debuglog.h"
#include "dyn_generic.h"
+#include "misc.h"
-int DYN_LoadLibrary(void **pvLHandle, char *pcLibrary)
+INTERNAL int DYN_LoadLibrary(void **pvLHandle, char *pcLibrary)
{
*pvLHandle = NULL;
*pvLHandle = dlopen(pcLibrary, RTLD_LAZY);
@@ -36,7 +37,7 @@
return SCARD_S_SUCCESS;
}
-int DYN_CloseLibrary(void **pvLHandle)
+INTERNAL int DYN_CloseLibrary(void **pvLHandle)
{
int ret;
@@ -52,7 +53,7 @@
return SCARD_S_SUCCESS;
}
-int DYN_GetAddress(void *pvLHandle, void **pvFHandle, char *pcFunction)
+INTERNAL int DYN_GetAddress(void *pvLHandle, void **pvFHandle, char *pcFunction)
{
char pcFunctionName[256];
int rv;
--- /cvsroot/pcsclite/PCSC/src/strlcat.c 2005/02/23 14:31:58 1.2
+++ /cvsroot/pcsclite/PCSC/src/strlcat.c 2005/04/12 07:38:44 1.3
@@ -25,6 +25,7 @@
#include <sys/types.h>
#include <string.h>
+#include "misc.h"
/*
* Appends src to string dst of size siz (unlike strncat, siz is the
@@ -33,7 +34,7 @@
* Returns strlen(src) + MIN(siz, strlen(initial dst)).
* If retval >= siz, truncation occurred.
*/
-size_t
+INTERNAL size_t
strlcat(char *dst, const char *src, size_t siz)
{
register char *d = dst;
--- /cvsroot/pcsclite/PCSC/src/strlcpy.c 2005/02/23 14:31:58 1.2
+++ /cvsroot/pcsclite/PCSC/src/strlcpy.c 2005/04/12 07:38:44 1.3
@@ -25,13 +25,14 @@
#include <sys/types.h>
#include <string.h>
+#include "misc.h"
/*
* Copy src to string dst of size siz. At most siz-1 characters
* will be copied. Always NUL terminates (unless siz == 0).
* Returns strlen(src); if retval >= siz, truncation occurred.
*/
-size_t
+INTERNAL size_t
strlcpy(char *dst, const char *src, size_t siz)
{
register char *d = dst;
--- /cvsroot/pcsclite/PCSC/src/sys_unix.c 2005/02/22 14:40:26 1.15
+++ /cvsroot/pcsclite/PCSC/src/sys_unix.c 2005/04/12 07:38:44 1.16
@@ -6,7 +6,7 @@
* Copyright (C) 1999
* David Corcoran <corcoran@linuxnet.com>
*
- * $Id: sys_unix.c,v 1.15 2005/02/22 14:40:26 rousseau Exp $
+ * $Id: sys_unix.c,v 1.16 2005/04/12 07:38:44 rousseau Exp $
*/
#include "config.h"
@@ -27,8 +27,9 @@
#include "sys_generic.h"
#include "debuglog.h"
+#include "misc.h"
-int SYS_Initialize(void)
+INTERNAL int SYS_Initialize(void)
{
/*
* Nothing special
@@ -36,17 +37,17 @@
return 0;
}
-int SYS_Mkdir(char *path, int perms)
+INTERNAL int SYS_Mkdir(char *path, int perms)
{
return mkdir(path, perms);
}
-int SYS_GetPID(void)
+INTERNAL int SYS_GetPID(void)
{
return getpid();
}
-int SYS_Sleep(int iTimeVal)
+INTERNAL int SYS_Sleep(int iTimeVal)
{
#ifdef HAVE_NANOSLEEP
struct timespec mrqtp;
@@ -59,7 +60,7 @@
#endif
}
-int SYS_USleep(int iTimeVal)
+INTERNAL int SYS_USleep(int iTimeVal)
{
#ifdef HAVE_NANOSLEEP
struct timespec mrqtp;
@@ -73,62 +74,62 @@
#endif
}
-int SYS_OpenFile(char *pcFile, int flags, int mode)
+INTERNAL int SYS_OpenFile(char *pcFile, int flags, int mode)
{
return open(pcFile, flags, mode);
}
-int SYS_CloseFile(int iHandle)
+INTERNAL int SYS_CloseFile(int iHandle)
{
return close(iHandle);
}
-int SYS_RemoveFile(char *pcFile)
+INTERNAL int SYS_RemoveFile(char *pcFile)
{
return remove(pcFile);
}
-int SYS_Chmod(const char *path, int mode)
+INTERNAL int SYS_Chmod(const char *path, int mode)
{
return chmod(path, mode);
}
-int SYS_Chdir(const char *path)
+INTERNAL int SYS_Chdir(const char *path)
{
return chdir(path);
}
-int SYS_Mkfifo(const char *path, int mode)
+INTERNAL int SYS_Mkfifo(const char *path, int mode)
{
return mkfifo(path, mode);
}
-int SYS_Mknod(const char *path, int mode, int dev)
+INTERNAL int SYS_Mknod(const char *path, int mode, int dev)
{
return mknod(path, mode, dev);
}
-int SYS_GetUID(void)
+INTERNAL int SYS_GetUID(void)
{
return getuid();
}
-int SYS_GetGID(void)
+INTERNAL int SYS_GetGID(void)
{
return getgid();
}
-int SYS_Chown(const char *fname, int uid, int gid)
+INTERNAL int SYS_Chown(const char *fname, int uid, int gid)
{
return chown(fname, uid, gid);
}
-int SYS_ChangePermissions(char *pcFile, int mode)
+INTERNAL int SYS_ChangePermissions(char *pcFile, int mode)
{
return chmod(pcFile, mode);
}
-int SYS_LockFile(int iHandle)
+INTERNAL int SYS_LockFile(int iHandle)
{
#ifdef HAVE_FLOCK
return flock(iHandle, LOCK_EX | LOCK_NB);
@@ -144,7 +145,7 @@
#endif
}
-int SYS_LockAndBlock(int iHandle)
+INTERNAL int SYS_LockAndBlock(int iHandle)
{
#ifdef HAVE_FLOCK
return flock(iHandle, LOCK_EX);
@@ -160,7 +161,7 @@
#endif
}
-int SYS_UnlockFile(int iHandle)
+INTERNAL int SYS_UnlockFile(int iHandle)
{
#ifdef HAVE_FLOCK
return flock(iHandle, LOCK_UN);
@@ -176,29 +177,29 @@
#endif
}
-int SYS_SeekFile(int iHandle, int iSeekLength)
+INTERNAL int SYS_SeekFile(int iHandle, int iSeekLength)
{
int iOffset;
iOffset = lseek(iHandle, iSeekLength, SEEK_SET);
return iOffset;
}
-int SYS_ReadFile(int iHandle, char *pcBuffer, int iLength)
+INTERNAL int SYS_ReadFile(int iHandle, char *pcBuffer, int iLength)
{
return read(iHandle, pcBuffer, iLength);
}
-int SYS_WriteFile(int iHandle, char *pcBuffer, int iLength)
+INTERNAL int SYS_WriteFile(int iHandle, char *pcBuffer, int iLength)
{
return write(iHandle, pcBuffer, iLength);
}
-int SYS_GetPageSize(void)
+INTERNAL int SYS_GetPageSize(void)
{
return getpagesize();
}
-void *SYS_MemoryMap(int iSize, int iFid, int iOffset)
+INTERNAL void *SYS_MemoryMap(int iSize, int iFid, int iOffset)
{
void *vAddress;
@@ -217,7 +218,7 @@
return vAddress;
}
-void *SYS_PublicMemoryMap(int iSize, int iFid, int iOffset)
+INTERNAL void *SYS_PublicMemoryMap(int iSize, int iFid, int iOffset)
{
void *vAddress;
@@ -227,7 +228,7 @@
return vAddress;
}
-int SYS_MMapSynchronize(void *begin, int length)
+INTERNAL int SYS_MMapSynchronize(void *begin, int length)
{
int flags = 0;
@@ -237,12 +238,12 @@
return msync(begin, length, MS_SYNC | flags);
}
-int SYS_Fork(void)
+INTERNAL int SYS_Fork(void)
{
return fork();
}
-int SYS_Daemon(int nochdir, int noclose)
+INTERNAL int SYS_Daemon(int nochdir, int noclose)
{
#ifdef HAVE_DAEMON
return daemon(nochdir, noclose);
@@ -275,23 +276,23 @@
#endif
}
-int SYS_Wait(int iPid, int iWait)
+INTERNAL int SYS_Wait(int iPid, int iWait)
{
return waitpid(-1, 0, WNOHANG);
}
-int SYS_Stat(char *pcFile, struct stat *psStatus)
+INTERNAL int SYS_Stat(char *pcFile, struct stat *psStatus)
{
return stat(pcFile, psStatus);
}
-int SYS_Fstat(int iFd)
+INTERNAL int SYS_Fstat(int iFd)
{
struct stat sStatus;
return fstat(iFd, &sStatus);
}
-int SYS_RandomInt(int fStart, int fEnd)
+INTERNAL int SYS_RandomInt(int fStart, int fEnd)
{
static int iInitialized = 0;
int iRandNum = 0;
@@ -307,7 +308,7 @@
return iRandNum;
}
-int SYS_GetSeed(void)
+INTERNAL int SYS_GetSeed(void)
{
struct timeval tv;
struct timezone tz;
@@ -325,17 +326,18 @@
return myseed;
}
-void SYS_Exit(int iRetVal)
+INTERNAL void SYS_Exit(int iRetVal)
{
_exit(iRetVal);
}
-int SYS_Rmdir(char *pcFile)
+INTERNAL int SYS_Rmdir(char *pcFile)
{
return rmdir(pcFile);
}
-int SYS_Unlink(char *pcFile)
+INTERNAL int SYS_Unlink(char *pcFile)
{
return unlink(pcFile);
}
+
--- /cvsroot/pcsclite/PCSC/src/thread_unix.c 2004/08/06 12:12:20 1.17
+++ /cvsroot/pcsclite/PCSC/src/thread_unix.c 2005/04/12 07:38:44 1.18
@@ -8,39 +8,40 @@
* Damien Sauveron <damien.sauveron@labri.fr>
* Ludovic Rousseau <ludovic.rousseau@free.fr>
*
- * $Id: thread_unix.c,v 1.17 2004/08/06 12:12:20 rousseau Exp $
+ * $Id: thread_unix.c,v 1.18 2005/04/12 07:38:44 rousseau Exp $
*/
#include "config.h"
#include "wintypes.h"
#include "thread_generic.h"
+#include "misc.h"
#ifndef TRUE
#define TRUE 1
#define FALSE 0
#endif
-int SYS_MutexInit(PCSCLITE_MUTEX_T mMutex)
+INTERNAL int SYS_MutexInit(PCSCLITE_MUTEX_T mMutex)
{
return pthread_mutex_init(mMutex, NULL);
}
-int SYS_MutexDestroy(PCSCLITE_MUTEX_T mMutex)
+INTERNAL int SYS_MutexDestroy(PCSCLITE_MUTEX_T mMutex)
{
return pthread_mutex_destroy(mMutex);
}
-int SYS_MutexLock(PCSCLITE_MUTEX_T mMutex)
+INTERNAL int SYS_MutexLock(PCSCLITE_MUTEX_T mMutex)
{
return pthread_mutex_lock(mMutex);
}
-int SYS_MutexUnLock(PCSCLITE_MUTEX_T mMutex)
+INTERNAL int SYS_MutexUnLock(PCSCLITE_MUTEX_T mMutex)
{
return pthread_mutex_unlock(mMutex);
}
-int SYS_ThreadCreate(PCSCLITE_THREAD_T * pthThread, int attributes,
+INTERNAL int SYS_ThreadCreate(PCSCLITE_THREAD_T * pthThread, int attributes,
PCSCLITE_THREAD_FUNCTION(pvFunction), LPVOID pvArg)
{
pthread_attr_t attr;
@@ -58,7 +59,7 @@
return FALSE;
}
-int SYS_ThreadCancel(PCSCLITE_THREAD_T * pthThread)
+INTERNAL int SYS_ThreadCancel(PCSCLITE_THREAD_T * pthThread)
{
if (0 == pthread_cancel(*pthThread))
return TRUE;
@@ -66,7 +67,7 @@
return FALSE;
}
-int SYS_ThreadDetach(PCSCLITE_THREAD_T pthThread)
+INTERNAL int SYS_ThreadDetach(PCSCLITE_THREAD_T pthThread)
{
if (0 == pthread_detach(pthThread))
return TRUE;
@@ -74,7 +75,7 @@
return FALSE;
}
-int SYS_ThreadJoin(PCSCLITE_THREAD_T *pthThread, LPVOID* pvRetVal)
+INTERNAL int SYS_ThreadJoin(PCSCLITE_THREAD_T *pthThread, LPVOID* pvRetVal)
{
if (0 == pthread_join(*pthThread, pvRetVal))
return TRUE;
@@ -82,18 +83,18 @@
return FALSE;
}
-int SYS_ThreadExit(LPVOID pvRetVal)
+INTERNAL int SYS_ThreadExit(LPVOID pvRetVal)
{
pthread_exit(pvRetVal);
return 1;
}
-PCSCLITE_THREAD_T SYS_ThreadSelf(void)
+INTERNAL PCSCLITE_THREAD_T SYS_ThreadSelf(void)
{
return pthread_self();
}
-int SYS_ThreadEqual(PCSCLITE_THREAD_T *pthThread1, PCSCLITE_THREAD_T *pthThread2)
+INTERNAL int SYS_ThreadEqual(PCSCLITE_THREAD_T *pthThread1, PCSCLITE_THREAD_T *pthThread2)
{
return pthread_equal(*pthThread1, *pthThread2);
}
--- /cvsroot/pcsclite/PCSC/src/winscard_msg.c 2005/02/22 14:40:26 1.26
+++ /cvsroot/pcsclite/PCSC/src/winscard_msg.c 2005/04/12 07:38:44 1.27
@@ -8,7 +8,7 @@
* Damien Sauveron <damien.sauveron@labri.fr>
* Ludoic Rousseau <ludovic.rousseau@free.fr>
*
- * $Id: winscard_msg.c,v 1.26 2005/02/22 14:40:26 rousseau Exp $
+ * $Id: winscard_msg.c,v 1.27 2005/04/12 07:38:44 rousseau Exp $
*/
#include "config.h"
@@ -33,15 +33,16 @@
#include "debuglog.h"
#include "winscard_msg.h"
#include "sys_generic.h"
+#include "misc.h"
static int commonSocket = 0;
-int SHMClientRead(psharedSegmentMsg msgStruct, DWORD dwClientID, int blockamount)
+INTERNAL int SHMClientRead(psharedSegmentMsg msgStruct, DWORD dwClientID, int blockamount)
{
return SHMMessageReceive(msgStruct, dwClientID, blockamount);
}
-int SHMClientSetupSession(PDWORD pdwClientID)
+INTERNAL int SHMClientSetupSession(PDWORD pdwClientID)
{
struct sockaddr_un svc_addr;
int one;
@@ -78,13 +79,13 @@
return 0;
}
-int SHMClientCloseSession(DWORD dwClientID)
+INTERNAL int SHMClientCloseSession(DWORD dwClientID)
{
SYS_CloseFile(dwClientID);
return 0;
}
-int SHMInitializeCommonSegment(void)
+INTERNAL int SHMInitializeCommonSegment(void)
{
static struct sockaddr_un serv_adr;
@@ -128,7 +129,7 @@
return 0;
}
-int SHMProcessCommonChannelRequest(PDWORD pdwClientID)
+INTERNAL int SHMProcessCommonChannelRequest(PDWORD pdwClientID)
{
socklen_t clnt_len;
int new_sock;
@@ -160,7 +161,7 @@
return 0;
}
-int SHMProcessEventsServer(PDWORD pdwClientID, int blocktime)
+INTERNAL int SHMProcessEventsServer(PDWORD pdwClientID, int blocktime)
{
fd_set read_fd;
int selret;
@@ -211,7 +212,7 @@
return -1;
}
-int SHMProcessEventsContext(PDWORD pdwClientID, psharedSegmentMsg msgStruct, int blocktime)
+INTERNAL int SHMProcessEventsContext(PDWORD pdwClientID, psharedSegmentMsg msgStruct, int blocktime)
{
fd_set read_fd;
int selret, rv;
@@ -268,7 +269,7 @@
}
-int SHMMessageSend(psharedSegmentMsg msgStruct, int filedes,
+INTERNAL int SHMMessageSend(psharedSegmentMsg msgStruct, int filedes,
int blockAmount)
{
/*
@@ -380,7 +381,7 @@
return retval;
}
-int SHMMessageReceive(psharedSegmentMsg msgStruct, int filedes,
+INTERNAL int SHMMessageReceive(psharedSegmentMsg msgStruct, int filedes,
int blockAmount)
{
/*
@@ -492,7 +493,7 @@
return retval;
}
-int WrapSHMWrite(unsigned int command, DWORD dwClientID,
+INTERNAL int WrapSHMWrite(unsigned int command, DWORD dwClientID,
unsigned int size, unsigned int blockAmount, void *data)
{
sharedSegmentMsg msgStruct;
@@ -512,7 +513,7 @@
return SHMMessageSend(&msgStruct, dwClientID, blockAmount);
}
-void SHMCleanupSharedSegment(int sockValue, char *pcFilePath)
+INTERNAL void SHMCleanupSharedSegment(int sockValue, char *pcFilePath)
{
SYS_CloseFile(sockValue);
SYS_Unlink(pcFilePath);