[Pcsclite-cvs-commit] r439 - in /trunk/PKCS11: include/cryptoki.h include/p11x_msc.h src/p11x_async.c src/p11x_error.c src/p11x_log.c src/p11x_msc.c src/p11x_object.c src/p11x_prefs.c src/p11x_slot.c src/p11x_state.c src/p11x_thread.c src/p11x_util.c
rousseau at users.alioth.debian.org
rousseau at users.alioth.debian.org
Wed Jun 24 12:07:24 UTC 2009
Author: rousseau
Date: Wed Jun 24 12:07:22 2009
New Revision: 439
URL: http://svn.debian.org/wsvn/muscleapps/?sc=1&rev=439
Log:
fix compile warnings
Modified:
trunk/PKCS11/include/cryptoki.h
trunk/PKCS11/include/p11x_msc.h
trunk/PKCS11/src/p11x_async.c
trunk/PKCS11/src/p11x_error.c
trunk/PKCS11/src/p11x_log.c
trunk/PKCS11/src/p11x_msc.c
trunk/PKCS11/src/p11x_object.c
trunk/PKCS11/src/p11x_prefs.c
trunk/PKCS11/src/p11x_slot.c
trunk/PKCS11/src/p11x_state.c
trunk/PKCS11/src/p11x_thread.c
trunk/PKCS11/src/p11x_util.c
Modified: trunk/PKCS11/include/cryptoki.h
URL: http://svn.debian.org/wsvn/muscleapps/trunk/PKCS11/include/cryptoki.h?rev=439&op=diff
==============================================================================
--- trunk/PKCS11/include/cryptoki.h (original)
+++ trunk/PKCS11/include/cryptoki.h Wed Jun 24 12:07:22 2009
@@ -299,8 +299,8 @@
******************************************************************************/
/* p11x_async.c */
-CK_RV async_StartSlotWatcher();
-CK_RV async_StopSlotWatcher();
+CK_RV async_StartSlotWatcher(void);
+CK_RV async_StopSlotWatcher(void);
void *async_WatchSlots(void *parent_pid);
void async_SignalHandler(int sig);
MSCULong32 async_TokenEventCallback(MSCTokenInfo *tokenInfo, MSCULong32 len, void *data);
@@ -309,22 +309,22 @@
int padRSAType1(CK_BYTE* to, CK_ULONG toLen, CK_BYTE *from, CK_ULONG fromLen);
/* p11x_debug.c */
-void debug_Init();
+void debug_Init(void);
void debug_CheckCorrupt(size_t i);
-void debug_Check();
+void debug_Check(void);
void *debug_Malloc(size_t size, int line, char *file);
void debug_Free(void *ptr, int line, char *file);
void *debug_Calloc(size_t size, int line, char *file);
/* p11x_error.c */
-CK_RV error_LogCmd(CK_RV err, CK_RV cond, CK_CHAR *file, CK_LONG line, char *(*stringifyFn)(CK_RV));
- char *error_Stringify(CK_RV rv);
+CK_RV error_LogCmd(CK_RV err, CK_RV cond, CK_CHAR *file, CK_LONG line, const char *(*stringifyFn)(CK_RV));
+const char *error_Stringify(CK_RV rv);
/* p11x_log.c */
-void log_Start(char *func);
-void log_End(char *func, CK_RV rv);
-void log_Err(char *msg, char *file, CK_LONG line);
-void log_Log(CK_ULONG level, char *format, ...);
+void log_Start(const char *func);
+void log_End(const char *func, CK_RV rv);
+void log_Err(const char *msg, const char *file, CK_LONG line);
+void log_Log(CK_ULONG level, const char *format, ...);
/* p11x_object.c */
void object_FreeAllObjects(CK_SLOT_ID slotID, P11_Object *list);
@@ -341,7 +341,7 @@
CK_RV object_UpdateObjectInfo(P11_Session *session, CK_OBJECT_HANDLE *hObject, MSCObjectInfo *pObjectInfo);
/* End of replacements */
-CK_RV object_FreeTokenObjects();
+CK_RV object_FreeTokenObjects(CK_SLOT_ID slotID);
CK_RV object_AddAttribute(P11_Object *object, CK_ATTRIBUTE_TYPE type, CK_BBOOL token, CK_BYTE *value, CK_ULONG value_len, P11_Attrib **attrib);
CK_RV object_MatchAttrib(CK_ATTRIBUTE *attrib, P11_Object *object);
CK_RV object_TemplateGetAttrib(CK_ATTRIBUTE_TYPE type, CK_ATTRIBUTE *attrib, CK_ULONG attrib_count, CK_ATTRIBUTE **attrib_out);
@@ -414,11 +414,11 @@
/* p11x_prefs.c */
void util_ParsePreference(char *buf, CK_ULONG buf_size);
-CK_RV util_ReadPreferences();
+CK_RV util_ReadPreferences(void);
/* p11x_state.c */
-CK_RV state_Init();
-CK_RV state_Free();
+CK_RV state_Init(void);
+CK_RV state_Free(void);
/* p11x_slot.c */
CK_RV slot_BeginTransaction(CK_ULONG slotID);
@@ -435,16 +435,16 @@
void slot_FreeAllMechanisms(P11_MechInfo *list);
CK_RV slot_AddMechanism(P11_Slot *slot, CK_MECHANISM_TYPE type, P11_MechInfo **mech_info);
CK_RV slot_UpdateToken(CK_ULONG slotID);
- CK_RV slot_UpdateSlotList();
- CK_RV slot_FreeAllSlots();
+ CK_RV slot_UpdateSlotList(void);
+ CK_RV slot_FreeAllSlots(void);
CK_RV slot_DisconnectSlot(CK_ULONG slotID, CK_ULONG action);
CK_RV slot_PublicMode(CK_ULONG slotID);
CK_RV slot_UserMode(CK_ULONG slotID);
CK_RV slot_TokenPresent(CK_ULONG slotID);
- CK_RV slot_TokenChanged();
- CK_RV slot_AsyncUpdateSlot();
+ CK_RV slot_TokenChanged(void);
+ CK_RV slot_AsyncUpdateSlot(void);
void slot_BlankTokenInfo(CK_TOKEN_INFO *token_info);
- CK_RV slot_ReverifyPins();
+ CK_RV slot_ReverifyPins(void);
/* Added by Netscape */
CK_RV slot_ReverifySlotPins(P11_Slot* slot, CK_ULONG slotID);
@@ -462,12 +462,12 @@
/* end of replacements */
/* p11x_thread_xxx.c */
-CK_RV thread_Initialize();
+CK_RV thread_Initialize(void);
CK_RV thread_InitFunctions(CK_CREATEMUTEX fn_init,
CK_DESTROYMUTEX fn_destroy,
CK_LOCKMUTEX fn_lock,
CK_UNLOCKMUTEX fn_unlock);
-CK_RV thread_Finalize();
+CK_RV thread_Finalize(void);
CK_RV thread_MutexInit(P11_Mutex *mutex);
CK_RV thread_MutexDestroy(P11_Mutex mutex);
CK_RV thread_MutexLock(P11_Mutex mutex);
@@ -481,7 +481,7 @@
#ifndef __USE_GNU
size_t strnlen(const char *__string, size_t __maxlen);
#endif /* __USE_GNU */
-CK_BBOOL util_IsLittleEndian();
+CK_BBOOL util_IsLittleEndian(void);
/* p11x_msc.c */
#include "p11x_msc.h"
Modified: trunk/PKCS11/include/p11x_msc.h
URL: http://svn.debian.org/wsvn/muscleapps/trunk/PKCS11/include/p11x_msc.h?rev=439&op=diff
==============================================================================
--- trunk/PKCS11/include/p11x_msc.h (original)
+++ trunk/PKCS11/include/p11x_msc.h Wed Jun 24 12:07:22 2009
@@ -47,7 +47,7 @@
MSCPVoid32 appData /* Application data */
);
-MSC_RV msc_CallbackCancelEvent();
+MSC_RV msc_CallbackCancelEvent(void);
MSC_RV msc_BeginTransaction(
MSCLPTokenConnection pConnection /* Connection handle */
Modified: trunk/PKCS11/src/p11x_async.c
URL: http://svn.debian.org/wsvn/muscleapps/trunk/PKCS11/src/p11x_async.c?rev=439&op=diff
==============================================================================
--- trunk/PKCS11/src/p11x_async.c (original)
+++ trunk/PKCS11/src/p11x_async.c Wed Jun 24 12:07:22 2009
@@ -30,7 +30,7 @@
** CKR_FUNCTION_FAILED on general error
** CKR_OK
*******************************************************************************/
-CK_RV async_StartSlotWatcher()
+CK_RV async_StartSlotWatcher(void)
{
CK_RV rv = CKR_OK;
CK_ULONG i;
@@ -86,7 +86,7 @@
** Returns:
** CKR_OK
*******************************************************************************/
-CK_RV async_StopSlotWatcher()
+CK_RV async_StopSlotWatcher(void)
{
CK_RV rv = CKR_OK;
Modified: trunk/PKCS11/src/p11x_error.c
URL: http://svn.debian.org/wsvn/muscleapps/trunk/PKCS11/src/p11x_error.c?rev=439&op=diff
==============================================================================
--- trunk/PKCS11/src/p11x_error.c (original)
+++ trunk/PKCS11/src/p11x_error.c Wed Jun 24 12:07:22 2009
@@ -28,7 +28,7 @@
** Returns:
** The error code that was passed in
*******************************************************************************/
-CK_RV error_LogCmd(CK_RV err, CK_RV cond, CK_CHAR *file, CK_LONG line, char *(*stringifyFn)(CK_RV))
+CK_RV error_LogCmd(CK_RV err, CK_RV cond, CK_CHAR *file, CK_LONG line, const char *(*stringifyFn)(CK_RV))
{
if (err != cond)
log_Log(LOG_MED, "(%s %ld): error: 0x%lX \"%s\"", file, line, err, stringifyFn(err));
@@ -47,9 +47,9 @@
** Returns:
** A static string error message (make this const?)
*******************************************************************************/
-char *error_Stringify(CK_RV rv)
+const char *error_Stringify(CK_RV rv)
{
- char *error;
+ const char *error;
switch(rv)
{
Modified: trunk/PKCS11/src/p11x_log.c
URL: http://svn.debian.org/wsvn/muscleapps/trunk/PKCS11/src/p11x_log.c?rev=439&op=diff
==============================================================================
--- trunk/PKCS11/src/p11x_log.c (original)
+++ trunk/PKCS11/src/p11x_log.c Wed Jun 24 12:07:22 2009
@@ -30,7 +30,7 @@
** Returns:
** none
*******************************************************************************/
-void log_Start(char *func)
+void log_Start(const char *func)
{
log_Log(LOG_LOW, "+%s : start", func);
}
@@ -46,9 +46,9 @@
** Returns:
** none
*******************************************************************************/
-void log_End(char *func, CK_RV rv)
+void log_End(const char *func, CK_RV rv)
{
- if (CKR_ERROR(rv));
+ if (CKR_ERROR(rv)) {}
log_Log(LOG_LOW, " -%s : end RV(0x%lX)", func, rv);
}
@@ -63,7 +63,7 @@
** Returns:
** none
*******************************************************************************/
-void log_Err(char *msg, char *file, CK_LONG line)
+void log_Err(const char *msg, const char *file, CK_LONG line)
{
log_Log(LOG_MED, "Error (%s %ld): %s", file, line, msg);
}
@@ -79,7 +79,7 @@
** Returns:
** none
*******************************************************************************/
-void log_Log(CK_ULONG level, char *msg, ...)
+void log_Log(CK_ULONG level, const char *msg, ...)
{
va_list args;
Modified: trunk/PKCS11/src/p11x_msc.c
URL: http://svn.debian.org/wsvn/muscleapps/trunk/PKCS11/src/p11x_msc.c?rev=439&op=diff
==============================================================================
--- trunk/PKCS11/src/p11x_msc.c (original)
+++ trunk/PKCS11/src/p11x_msc.c Wed Jun 24 12:07:22 2009
@@ -121,7 +121,7 @@
}
/* Cancels all callback registrations */
-MSC_RV msc_CallbackCancelEvent()
+MSC_RV msc_CallbackCancelEvent(void)
{
MSC_RV rv;
Modified: trunk/PKCS11/src/p11x_object.c
URL: http://svn.debian.org/wsvn/muscleapps/trunk/PKCS11/src/p11x_object.c?rev=439&op=diff
==============================================================================
--- trunk/PKCS11/src/p11x_object.c (original)
+++ trunk/PKCS11/src/p11x_object.c Wed Jun 24 12:07:22 2009
@@ -675,7 +675,7 @@
CK_RV object_MatchAttrib(CK_ATTRIBUTE *attrib, P11_Object *object)
{
CK_RV rv;
- P11_Attrib *obj_attrib;
+ P11_Attrib *obj_attrib = NULL;
CK_BYTE *reverse, *forward, temp;
CK_ULONG i;
@@ -816,8 +816,8 @@
P11_Slot *slot = &st.slots[session->session.slotID - 1];
P11_Object *objectPub;
P11_Object *objectPrv;
- CK_ATTRIBUTE *attrib;
- P11_Attrib *p11_attrib;
+ CK_ATTRIBUTE *attrib = NULL;
+ P11_Attrib *p11_attrib = NULL;
MSCKeyInfo keyInfo;
MSCKeyInfo keyInfoPub;
MSCKeyInfo keyInfoPrv;
@@ -1645,7 +1645,7 @@
{
CK_RV rv = CKR_OK;
CK_ATTRIBUTE attrib;
- P11_Attrib *obj_attrib, *t_attrib;
+ P11_Attrib *obj_attrib = NULL, *t_attrib;
CK_OBJECT_CLASS obj_class;
CK_BYTE buf[4096]; /* Fixme: don't hardcode this */
CK_ULONG len;
@@ -1956,7 +1956,7 @@
/* P11_Session *session = (P11_Session *)hSession; */
P11_Slot *slot = &st.slots[session->session.slotID - 1];
P11_Object *object_l;
- P11_Attrib *attrib;
+ P11_Attrib *attrib = NULL;
CK_BYTE tag, last;
CK_BYTE classRevCheck[sizeof(CK_ULONG)];
@@ -2025,8 +2025,8 @@
P11_Slot *slot = &st.slots[session->session.slotID - 1];
CK_BYTE keyNum = 0;
MSCKeyInfo keyInfo;
- P11_Attrib *modulus;
- P11_Attrib *public_exponent;
+ P11_Attrib *modulus = NULL;
+ P11_Attrib *public_exponent = NULL;
CK_ULONG keySize = 1024;
CK_BYTE *keyBlob;
CK_ULONG keyBlobSize;
@@ -2126,14 +2126,14 @@
P11_Slot *slot = &st.slots[session->session.slotID - 1];
CK_BYTE keyNum = 0;
MSCKeyInfo keyInfo;
- P11_Attrib *modulus;
+ P11_Attrib *modulus = NULL;
P11_Attrib *private_exponent;
P11_Attrib *public_exponent;
- P11_Attrib *prime_1;
- P11_Attrib *prime_2;
- P11_Attrib *exponent_1;
- P11_Attrib *exponent_2;
- P11_Attrib *coefficient;
+ P11_Attrib *prime_1 = NULL;
+ P11_Attrib *prime_2 = NULL;
+ P11_Attrib *exponent_1 = NULL;
+ P11_Attrib *exponent_2 = NULL;
+ P11_Attrib *coefficient = NULL;
CK_ULONG keySize = 1024;
CK_BYTE *keyBlob;
CK_ULONG keyBlobSize;
@@ -2250,7 +2250,7 @@
/* P11_Session *session = (P11_Session *)hSession; */
P11_Slot *slot = &st.slots[session->session.slotID - 1];
P11_Object *object_l;
- P11_Attrib *attrib;
+ P11_Attrib *attrib = NULL;
CK_BYTE tag, last;
CK_BYTE classRevCheck[sizeof(CK_ULONG)];
Modified: trunk/PKCS11/src/p11x_prefs.c
URL: http://svn.debian.org/wsvn/muscleapps/trunk/PKCS11/src/p11x_prefs.c?rev=439&op=diff
==============================================================================
--- trunk/PKCS11/src/p11x_prefs.c (original)
+++ trunk/PKCS11/src/p11x_prefs.c Wed Jun 24 12:07:22 2009
@@ -374,7 +374,7 @@
** none
*******************************************************************************/
#ifndef WIN32
-CK_RV util_ReadPreferences()
+CK_RV util_ReadPreferences(void)
{
CK_RV rv = CKR_OK;
FILE *fp = NULL;
@@ -384,7 +384,7 @@
char buf[1024];
char *homeenv;
- if (homeenv = getenv("HOME")) {
+ if ((homeenv = getenv("HOME"))) {
strncpy(rcfilepath, homeenv, sizeof(rcfilepath) - sizeof(rcfilename) - 1);
strcat(rcfilepath, rcfilename);
fp = fopen(rcfilepath, "rb");
Modified: trunk/PKCS11/src/p11x_slot.c
URL: http://svn.debian.org/wsvn/muscleapps/trunk/PKCS11/src/p11x_slot.c?rev=439&op=diff
==============================================================================
--- trunk/PKCS11/src/p11x_slot.c (original)
+++ trunk/PKCS11/src/p11x_slot.c Wed Jun 24 12:07:22 2009
@@ -766,7 +766,7 @@
** CKR_FUNCTION_FAILED on general error
** CKR_OK
*******************************************************************************/
-CK_RV slot_UpdateSlotList()
+CK_RV slot_UpdateSlotList(void)
{
CK_RV rv = CKR_OK;
CK_ULONG i;
@@ -834,7 +834,7 @@
** Returns:
** CKR_OK
*******************************************************************************/
-CK_RV slot_FreeAllSlots()
+CK_RV slot_FreeAllSlots(void)
{
CK_RV rv = CKR_OK;
CK_ULONG i;
@@ -1067,7 +1067,7 @@
** CKR_CRYPTOKI_NOT_INITIALIZED
** CKR_OK
*******************************************************************************/
-CK_RV slot_TokenChanged()
+CK_RV slot_TokenChanged(void)
{
CK_RV rv = CKR_OK;
CK_ULONG i;
@@ -1219,7 +1219,7 @@
** Error from slot_VerifyPIN
** CKR_OK
*******************************************************************************/
-CK_RV slot_ReverifyPins()
+CK_RV slot_ReverifyPins(void)
{
CK_RV rv = CKR_OK;
CK_ULONG i;
Modified: trunk/PKCS11/src/p11x_state.c
URL: http://svn.debian.org/wsvn/muscleapps/trunk/PKCS11/src/p11x_state.c?rev=439&op=diff
==============================================================================
--- trunk/PKCS11/src/p11x_state.c (original)
+++ trunk/PKCS11/src/p11x_state.c Wed Jun 24 12:07:22 2009
@@ -54,7 +54,7 @@
** CKR_HOST_MEMORY if memory alloc fails
** CKR_OK
*******************************************************************************/
-CK_RV state_Init()
+CK_RV state_Init(void)
{
CK_RV rv = CKR_OK;
@@ -81,7 +81,7 @@
** Error from slot_FreeAllSlots (not checked and everything gets blasted)
** CKR_OK
*******************************************************************************/
-CK_RV state_Free()
+CK_RV state_Free(void)
{
CK_RV rv = CKR_OK;
Modified: trunk/PKCS11/src/p11x_thread.c
URL: http://svn.debian.org/wsvn/muscleapps/trunk/PKCS11/src/p11x_thread.c?rev=439&op=diff
==============================================================================
--- trunk/PKCS11/src/p11x_thread.c (original)
+++ trunk/PKCS11/src/p11x_thread.c Wed Jun 24 12:07:22 2009
@@ -37,7 +37,7 @@
** CKR_FUNCTION_FAILED on error
** CKR_OK
*******************************************************************************/
-CK_RV thread_Initialize()
+CK_RV thread_Initialize(void)
{
CK_RV rv = CKR_OK;
@@ -103,7 +103,7 @@
** CKR_FUNCTION_FAILED on general error
** CKR_OK
*******************************************************************************/
-CK_RV thread_Finalize()
+CK_RV thread_Finalize(void)
{
CK_RV rv = CKR_OK;
Modified: trunk/PKCS11/src/p11x_util.c
URL: http://svn.debian.org/wsvn/muscleapps/trunk/PKCS11/src/p11x_util.c?rev=439&op=diff
==============================================================================
--- trunk/PKCS11/src/p11x_util.c (original)
+++ trunk/PKCS11/src/p11x_util.c Wed Jun 24 12:07:22 2009
@@ -163,7 +163,7 @@
** Returns:
** True/False if machine is little endian or not
*******************************************************************************/
-CK_BBOOL util_IsLittleEndian()
+CK_BBOOL util_IsLittleEndian(void)
{
CK_ULONG rv = 1;
More information about the Pcsclite-cvs-commit
mailing list