Hi,
attached patch marks several read-only function parameters and
datastructures as such by adding const.
This patch is an extended and rediffed version of the
warzone_const1.diff sent some time ago.
Please consider applying.
Regards,
Stefan
--- lib/script/interp.c (working copy)
+++ lib/script/interp.c (working copy)
@@ -222,7 +222,7 @@
UDWORD CurEvent;
BOOL bStop,bEvent;
SDWORD callDepth;
- STRING *pTrigLab, *pEventLab;
+ const STRING *pTrigLab, *pEventLab;
//debug(LOG_SCRIPT, "interpRunScript 1");
--- lib/framework/frameresource.c (working copy)
+++ lib/framework/frameresource.c (working copy)
@@ -145,7 +145,7 @@
/* Allocate a RES_TYPE structure */
-static BOOL resAlloc(STRING *pType, RES_TYPE **ppsFunc)
+static BOOL resAlloc(const STRING *pType, RES_TYPE **ppsFunc)
{
RES_TYPE *psT;
@@ -183,7 +183,7 @@
/* Add a buffer load function for a file type */
-BOOL resAddBufferLoad(STRING *pType, RES_BUFFERLOAD buffLoad,
+BOOL resAddBufferLoad(const STRING *pType, RES_BUFFERLOAD buffLoad,
RES_FREE release)
{
RES_TYPE *psT;
@@ -486,7 +486,7 @@
/* Return the resource for a type and hashedname */
-void *resGetDataFromHash(STRING *pType, UDWORD HashedID)
+void *resGetDataFromHash(const STRING *pType, UDWORD HashedID)
{
RES_TYPE *psT;
RES_DATA *psRes;
@@ -583,7 +583,7 @@
}
-BOOL resGetHashfromData(STRING *pType, void *pData, UDWORD *pHash)
+BOOL resGetHashfromData(const STRING *pType, const void *pData, UDWORD *pHash)
{
RES_TYPE *psT;
RES_DATA *psRes;
@@ -628,7 +628,7 @@
/* Simply returns true if a resource is present */
-BOOL resPresent(STRING *pType, STRING *pID)
+BOOL resPresent(const STRING *pType, const STRING *pID)
{
RES_TYPE *psT;
RES_DATA *psRes;
--- src/miscimd.h (revision 347)
+++ src/miscimd.h (working copy)
@@ -50,7 +50,7 @@
typedef struct _misc_imd
{
iIMDShape *pImd;
-STRING *pName;
+const STRING *pName;
} MISC_IMD;
--- src/data.c (revision 347)
+++ src/data.c (working copy)
@@ -1199,7 +1199,7 @@
// this is also defined in frameresource.c - needs moving to a .h file
typedef struct
{
- STRING *aType; // points to the string
defining the type (e.g. SCRIPT) - NULL indicates end of list
+ const STRING *aType; // points to the string
defining the type (e.g. SCRIPT) - NULL indicates end of list
RES_BUFFERLOAD buffLoad; // routine to process the data
for this type
RES_FREE release; // routine to release the data
(NULL indicates none)
void *ResourceData; // Linked list of data - set to
null initially
--- src/audio_id.c (revision 347)
+++ src/audio_id.c (working copy)
@@ -14,7 +14,7 @@
typedef struct AUDIO_ID
{
SDWORD iID;
- STRING *pWavStr;
+ const STRING *pWavStr;
}
AUDIO_ID;
@@ -481,7 +481,7 @@
/***************************************************************************/
BOOL
-audioID_GetIDFromStr( STRING *pWavStr, SDWORD *piID )
+audioID_GetIDFromStr( const STRING *pWavStr, SDWORD *piID )
{
SDWORD i;
--- src/audio_id.h (revision 347)
+++ src/audio_id.h (working copy)
@@ -480,7 +480,7 @@
/***************************************************************************/
-extern BOOL audioID_GetIDFromStr( STRING *pWavStr, SDWORD *piID );
+extern BOOL audioID_GetIDFromStr( const STRING *pWavStr, SDWORD *piID );
/***************************************************************************/
--- lib/script/script_parser.y (revision 347)
+++ lib/script/script_parser.y (working copy)
@@ -5184,7 +5184,7 @@
/* Add a new trigger symbol */
-BOOL scriptAddTrigger(STRING *pIdent, TRIGGER_DECL *psDecl, UDWORD line)
+BOOL scriptAddTrigger(const STRING *pIdent, TRIGGER_DECL *psDecl, UDWORD line)
{
TRIGGER_SYMBOL *psTrigger, *psCurr, *psPrev;
--- lib/script/parse.h (revision 347)
+++ lib/script/parse.h (working copy)
@@ -265,7 +265,7 @@
extern BOOL scriptAddVariable(VAR_DECL *psStorage, VAR_IDENT_DECL *psVarIdent);
/* Add a new trigger symbol */
-extern BOOL scriptAddTrigger(STRING *pIdent, TRIGGER_DECL *psDecl, UDWORD
line);
+extern BOOL scriptAddTrigger(const STRING *pIdent, TRIGGER_DECL *psDecl,
UDWORD line);
/* Add a new event symbol */
extern BOOL scriptDeclareEvent(STRING *pIdent, EVENT_SYMBOL **ppsEvent, SDWORD
numArgs);
--- lib/script/event.c (revision 347)
+++ lib/script/event.c (working copy)
@@ -193,9 +193,9 @@
// get the trigger id string
-STRING *eventGetTriggerID(SCRIPT_CODE *psCode, SDWORD trigger)
+const STRING *eventGetTriggerID(SCRIPT_CODE *psCode, SDWORD trigger)
{
- STRING *pID, *pTrigType;
+ const STRING *pID, *pTrigType;
static STRING aIDNum[255];
SDWORD i;
TRIGGER_TYPE type;
@@ -257,9 +257,9 @@
}
// get the event id string
-STRING *eventGetEventID(SCRIPT_CODE *psCode, SDWORD event)
+const STRING *eventGetEventID(SCRIPT_CODE *psCode, SDWORD event)
{
- STRING *pID;
+ const STRING *pID;
static STRING aIDNum[255];
SDWORD i;
@@ -288,7 +288,7 @@
{
SCRIPT_CODE *psCode = psTrigger->psContext->psCode;
// BOOL debugInfo = psCode->psDebug != NULL;
- STRING *pTrigLab, *pEventLab;
+ const STRING *pTrigLab, *pEventLab;
// find the debug info for the trigger
pTrigLab = eventGetTriggerID(psCode, psTrigger->trigger);
--- lib/script/event.h (revision 347)
+++ lib/script/event.h (working copy)
@@ -135,8 +135,8 @@
//resets the event timer - updateTime
extern void eventTimeReset(UDWORD initTime);
-extern STRING *eventGetEventID(SCRIPT_CODE *psCode, SDWORD event);
-extern STRING *eventGetTriggerID(SCRIPT_CODE *psCode, SDWORD trigger);
+extern const STRING *eventGetEventID(SCRIPT_CODE *psCode, SDWORD event);
+extern const STRING *eventGetTriggerID(SCRIPT_CODE *psCode, SDWORD trigger);
extern BOOL resetLocalVars(SCRIPT_CODE *psCode, UDWORD EventIndex);
--- lib/framework/frame.h (revision 347)
+++ lib/framework/frame.h (working copy)
@@ -163,10 +163,10 @@
extern BOOL saveFile(const char *pFileName, const char *pFileData, UDWORD
fileSize);
// load a file from disk into a fixed memory buffer
-BOOL loadFileToBuffer(char *pFileName, char *pFileBuffer, UDWORD bufferSize,
UDWORD *pSize);
+BOOL loadFileToBuffer(const char *pFileName, char *pFileBuffer, UDWORD
bufferSize, UDWORD *pSize);
// as above but returns quietly if no file found
-BOOL loadFileToBufferNoError(char *pFileName, char *pFileBuffer, UDWORD
bufferSize,
+BOOL loadFileToBufferNoError(const char *pFileName, char *pFileBuffer, UDWORD
bufferSize,
UDWORD *pSize);
extern SDWORD ftol(float f);
--- lib/framework/frameresource.h (revision 347)
+++ lib/framework/frameresource.h (working copy)
@@ -93,7 +93,7 @@
extern void resReleaseAllData(void);
/* Add a buffer load and release function for a file type */
-extern BOOL resAddBufferLoad(STRING *pType, RES_BUFFERLOAD buffLoad,
+extern BOOL resAddBufferLoad(const STRING *pType, RES_BUFFERLOAD buffLoad,
RES_FREE release);
/* Add a file name load and release function for a file type */
@@ -107,13 +107,13 @@
extern BOOL resAddData(STRING *pType, STRING *pID, void *pData);
/* Return the resource for a type and ID */
-extern void *resGetDataFromHash(STRING *pType, UDWORD HashedID);
+extern void *resGetDataFromHash(const STRING *pType, UDWORD HashedID);
extern void *resGetData(const STRING *pType, const STRING *pID);
-extern BOOL resPresent(STRING *pType, STRING *pID);
+extern BOOL resPresent(const STRING *pType, const STRING *pID);
void resToLower(STRING *pStr);
// return the HashedID string for a piece of data
-extern BOOL resGetHashfromData(STRING *pType, void *pData, UDWORD *pHash);
+extern BOOL resGetHashfromData(const STRING *pType, const void *pData, UDWORD
*pHash);
void resDoResLoadCallback(void);
--- lib/framework/configfile.c (revision 347)
+++ lib/framework/configfile.c (working copy)
@@ -150,7 +150,7 @@
//
=======================================================================================================================
//
=======================================================================================================================
//
-BOOL registry_load( char *filename )
+BOOL registry_load( const char *filename )
{
char buffer[MAXLINESIZE];
char *bptr = NULL, *bufstart = NULL;
@@ -210,7 +210,7 @@
//
=======================================================================================================================
//
=======================================================================================================================
//
-BOOL registry_save( char *filename )
+BOOL registry_save( const char *filename )
{
char buffer[MAXLINESIZE * REGISTRY_HASH_SIZE];
unsigned int i;
--- lib/framework/frame.c (revision 347)
+++ lib/framework/frame.c (working copy)
@@ -608,14 +608,14 @@
}
// load a file from disk into a fixed memory buffer
-BOOL loadFileToBuffer(char *pFileName, char *pFileBuffer, UDWORD bufferSize,
UDWORD *pSize)
+BOOL loadFileToBuffer(const char *pFileName, char *pFileBuffer, UDWORD
bufferSize, UDWORD *pSize)
{
*pSize = bufferSize;
return loadFile2(unix_path(pFileName), &pFileBuffer, pSize, FALSE,
TRUE);
}
// as above but returns quietly if no file found
-BOOL loadFileToBufferNoError(char *pFileName, char *pFileBuffer, UDWORD
bufferSize, UDWORD *pSize)
+BOOL loadFileToBufferNoError(const char *pFileName, char *pFileBuffer, UDWORD
bufferSize, UDWORD *pSize)
{
*pSize = bufferSize;
return loadFile2(unix_path(pFileName), &pFileBuffer, pSize, FALSE,
FALSE);
@@ -704,7 +704,7 @@
//
// PosOfDot and/of PosOfSlash can be NULL and then nothing will be stored
//
-void ScanFilename(char *Fullname, int *PosOfDot, int *PosOfSlash)
+void ScanFilename(const char *Fullname, int *PosOfDot, int *PosOfSlash)
{
int Namelength;
_______________________________________________
Warzone-dev mailing list
[email protected]
https://mail.gna.org/listinfo/warzone-dev
