From 1bd660ca367fd02d82f177e10402783d3e14ed6a Mon Sep 17 00:00:00 2001 From: Stefan Huehner Date: Wed, 20 Sep 2006 20:58:13 +0000 Subject: [PATCH] mark readonly string parameter as const. Remove superflous protoype in keymap.c as the prototype from keymap.h is included. Remove 2 commented out prototypes in keymap.h git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@742 4a71c877-e1ca-e34f-864e-861f7616d084 --- src/keymap.c | 4 +--- src/keymap.h | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/keymap.c b/src/keymap.c index ef30cdbfc..fe9560f08 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -21,8 +21,6 @@ // ---------------------------------------------------------------------------------- /* Function Prototypes */ -KEY_MAPPING *keyAddMapping ( KEY_STATUS status, KEY_CODE metaCode, KEY_CODE subcode, - KEY_ACTION action, void (*pKeyMapFunc)(void), STRING *name ); BOOL keyRemoveMapping ( KEY_CODE metaCode, KEY_CODE subCode ); BOOL keyRemoveMappingPt ( KEY_MAPPING *psToRemove ); KEY_MAPPING *keyFindMapping ( KEY_CODE metaCode, KEY_CODE subCode ); @@ -491,7 +489,7 @@ void keyInitMappings( BOOL bForceDefaults ) /* Adds a new mapping to the list */ //BOOL keyAddMapping(KEY_CODE metaCode, KEY_CODE subCode, KEY_ACTION action,void *function, STRING *name) KEY_MAPPING *keyAddMapping(KEY_STATUS status,KEY_CODE metaCode, KEY_CODE subCode, KEY_ACTION action, - void (*pKeyMapFunc)(void), STRING *name) + void (*pKeyMapFunc)(void), const STRING *name) { KEY_MAPPING *newMapping; BLOCK_HEAP *psHeap; diff --git a/src/keymap.h b/src/keymap.h index 1e3d83c49..a8aa9a3fb 100644 --- a/src/keymap.h +++ b/src/keymap.h @@ -37,10 +37,8 @@ STRING *pName; struct _keyMapping *psNext; } KEY_MAPPING; -//extern BOOL keyAddMapping ( UDWORD functionId, KEY_CODE metaCode, KEY_CODE subCode ); -//extern BOOL keyAddMapping ( KEY_CODE metaCode, KEY_CODE subcode, KEY_ACTION action, void *function, STRING *name ); extern KEY_MAPPING *keyAddMapping ( KEY_STATUS status, KEY_CODE metaCode, KEY_CODE subcode, - KEY_ACTION action, void (*pKeyMapFunc)(void), STRING *name ); + KEY_ACTION action, void (*pKeyMapFunc)(void), const STRING *name ); extern BOOL keyRemoveMapping ( KEY_CODE metaCode, KEY_CODE subCode ); extern KEY_MAPPING *keyGetMappingFromFunction(void *function); extern BOOL keyRemoveMappingPt ( KEY_MAPPING *psToRemove );