geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed compiler warnings in AuthTokenValidate.

Browse Source
This commit is contained in:
Juan Carlos Luciani
2006-10-09 15:28:03 +00:00
parent af9da1fff2
commit aa0df7c917
2 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
CASA-auth-token/non-java/server/AuthTokenValidate/linux/platform.c
View File

@@ -74,7 +74,7 @@ PlatAllocMutex(void)
//=======================================================================--
{
PlatformMutex *pPlatMutex;
pthread_mutexattr_t mutexAttr = {PTHREAD_MUTEX_RECURSIVE};
pthread_mutexattr_t mutexAttr;
DbgTrace(2, "-PlatAllocMutex- Start\n", 0);
@@ -83,7 +83,30 @@ PlatAllocMutex(void)
if (pPlatMutex)
{
// Finish initializing the mutex
pthread_mutex_init(&pPlatMutex->mutex, &mutexAttr);
if (pthread_mutexattr_init(&mutexAttr) == 0)
{
if (pthread_mutexattr_settype(&mutexAttr, PTHREAD_MUTEX_RECURSIVE) == 0)
{
if (pthread_mutex_init(&pPlatMutex->mutex, &mutexAttr) != 0)
{
DbgTrace(0, "-PlatAllocMutex- Error %d initing mutex\n", errno);
free(pPlatMutex);
pPlatMutex = NULL;
}
}
else
{
DbgTrace(0, "-PlatAllocMutex- Error %d setting mutex type\n", errno);
free(pPlatMutex);
pPlatMutex = NULL;
}
}
else
{
DbgTrace(0, "-PlatAllocMutex- Error %d initing mutexattr\n", errno);
free(pPlatMutex);
pPlatMutex = NULL;
}
}
else
{
@@ -204,10 +227,10 @@ OpenLibrary(
libHandle = dlopen(pFileName, RTLD_LAZY);
if (libHandle == NULL)
{
DbgTrace(0, "-OpenLibrary- Not able to load library, error = %d\n", dlerror());
DbgTrace(0, "-OpenLibrary- Not able to load library, error = %s\n", dlerror());
}
DbgTrace(1, "-OpenLibrary- End, handle = %08X\n", libHandle);
DbgTrace(1, "-OpenLibrary- End, handle = %0lX\n", (long) libHandle);
return libHandle;
}
@@ -261,10 +284,10 @@ GetFunctionPtr(
pFuncPtr = dlsym(libHandle, pFunctionName);
if (pFuncPtr == NULL)
{
DbgTrace(0, "-GetFunctionPtr- Not able to obtain func ptr, error = %d\n", dlerror());
DbgTrace(0, "-GetFunctionPtr- Not able to obtain func ptr, error = %s\n", dlerror());
}
DbgTrace(1, "-GetFunctionPtr- End, pFuncPtr = %08X\n", pFuncPtr);
DbgTrace(1, "-GetFunctionPtr- End, pFuncPtr = %0lX\n", (long) pFuncPtr);
return pFuncPtr;
}

2
CASA-auth-token/non-java/server/AuthTokenValidate/validate.c
View File

@@ -216,7 +216,7 @@ ValidateAuthToken(
}
else
{
DbgTrace(0, "-ValidateAuthToken- Failed to load Ipc library, error = %d\n", dlerror());
DbgTrace(0, "-ValidateAuthToken- Failed to load Ipc library, error = %s\n", dlerror());
}
}
else