Hi,
attached patch converts all functions declarations without parameters in
src/ from () to the ansi c (void) form.
Please consider applying.
Regards,
Stefan
Index: src/display.c
===================================================================
--- src/display.c (revision 345)
+++ src/display.c (working copy)
@@ -428,7 +428,7 @@
}
/* Tidy up after a mode change */
-BOOL dispModeChange()
+BOOL dispModeChange(void)
{
return TRUE;
}
Index: src/display.h
===================================================================
--- src/display.h (revision 345)
+++ src/display.h (working copy)
@@ -23,7 +23,7 @@
extern void shakeStart(void);
/* Tidy up after a mode change */
-extern BOOL dispModeChange();
+extern BOOL dispModeChange(void);
/* Process the user input. This just processes the key input and jumping
around the radar*/
//extern BOOL processInput(void);
Index: src/function.c
===================================================================
--- src/function.c (revision 345)
+++ src/function.c (working copy)
@@ -2228,7 +2228,7 @@
}
}
-BOOL FunctionShutDown()
+BOOL FunctionShutDown(void)
{
UDWORD inc;//, player;
FUNCTION *pFunction, **pStartList = asFunctions;
Index: src/function.h
===================================================================
--- src/function.h (revision 345)
+++ src/function.h (working copy)
@@ -99,7 +99,7 @@
//extern void bodyUpgrade(FUNCTION *pFunction, STRUCTURE *psBuilding);
//extern void resistanceUpgrade(FUNCTION *pFunction, STRUCTURE *psBuilding);
-extern BOOL FunctionShutDown();
+extern BOOL FunctionShutDown(void);
#endif //_function_h
Index: src/droid.c
===================================================================
--- src/droid.c (revision 345)
+++ src/droid.c (working copy)
@@ -3796,7 +3796,7 @@
}*/
//free the storage for the droid templates
-BOOL droidTemplateShutDown()
+BOOL droidTemplateShutDown(void)
{
DROID_TEMPLATE *pTemplate, *pNext;
UDWORD player;
Index: src/droid.h
===================================================================
--- src/droid.h (revision 345)
+++ src/droid.h (working copy)
@@ -192,7 +192,7 @@
extern BOOL droidRemove(DROID *psDroid, DROID *pList[MAX_PLAYERS]);
//free the storage for the droid templates
-extern BOOL droidTemplateShutDown();
+extern BOOL droidTemplateShutDown(void);
/* Return the type of a droid */
extern DROID_TYPE droidType(DROID *psDroid);
Index: src/data.c
===================================================================
--- src/data.c (revision 345)
+++ src/data.c (working copy)
@@ -82,7 +82,7 @@
return;
}
-void resetCheatHash()
+void resetCheatHash(void)
{
UDWORD i;
for(i=0;i<CHEAT_MAXCHEAT;i++)
Index: src/data.h
===================================================================
--- src/data.h (revision 345)
+++ src/data.h (working copy)
@@ -48,7 +48,7 @@
#define CHEAT_MAXCHEAT 29
-extern void resetCheatHash();
+extern void resetCheatHash(void);
extern UDWORD cheatHash[CHEAT_MAXCHEAT];
Index: src/multisync.c
===================================================================
--- src/multisync.c (revision 345)
+++ src/multisync.c (working copy)
@@ -84,7 +84,7 @@
// ////////////////////////////////////////////////////////////////////////////
// test traffic level.
-static BOOL okToSend()
+static BOOL okToSend(void)
{
//update checks & go no further if any exceeded.
if((NETgetRecentBytesSent() + NETgetRecentBytesRecvd()) >=
game.bytesPerSec)
Index: src/cluster.c
===================================================================
--- src/cluster.c (revision 345)
+++ src/cluster.c (working copy)
@@ -86,7 +86,7 @@
// check the cluster usage
-void clustValidateUsage()
+void clustValidateUsage(void)
{
SDWORD cluster, player, droidUsage, structUsage;
STRUCTURE *psStruct;
Index: src/keyedit.c
===================================================================
--- src/keyedit.c (revision 345)
+++ src/keyedit.c (working copy)
@@ -199,7 +199,7 @@
}
// ////////////////////////////////////////////////////////////////////////////
-static UDWORD scanKeyBoardForBinding()
+static UDWORD scanKeyBoardForBinding(void)
{
UDWORD i;
for(i = 0; i < KEY_MAXSCAN; i++)
Index: src/ingameop.c
===================================================================
--- src/ingameop.c (revision 345)
+++ src/ingameop.c (working copy)
@@ -103,7 +103,7 @@
}
-static BOOL _addSlideOptions()
+static BOOL _addSlideOptions(void)
{
W_FORMINIT sFormInit;
Index: src/game.c
===================================================================
--- src/game.c (revision 345)
+++ src/game.c (working copy)
@@ -1276,7 +1276,7 @@
static BOOL getSaveObjectName(STRING *pName);
/* set the global scroll values to use for the save game */
-static void setMapScroll();
+static void setMapScroll(void);
char *getSaveStructNameV19(SAVE_STRUCTURE_V17 *psSaveStructure)
{
@@ -11502,7 +11502,7 @@
//
-----------------------------------------------------------------------------------------
/* set the global scroll values to use for the save game */
-void setMapScroll()
+static void setMapScroll(void)
{
//if loading in a pre version5 then scroll values will not have been
set up so set to max poss
if (width == 0 AND height == 0)
Index: src/multijoin.c
===================================================================
--- src/multijoin.c (revision 345)
+++ src/multijoin.c (working copy)
@@ -55,7 +55,7 @@
// ////////////////////////////////////////////////////////////////////////////
// Local Functions
-BOOL sendVersionCheck ();
+BOOL sendVersionCheck (void);
BOOL recvVersionCheck (NETMSG *pMsg);
BOOL intDisplayMultiJoiningStatus (UBYTE joinCount);
void clearPlayer (UDWORD player,BOOL quietly,BOOL removeOil);//
what to do when a arena player leaves.
Index: src/multijoin.h
===================================================================
--- src/multijoin.h (revision 345)
+++ src/multijoin.h (working copy)
@@ -7,7 +7,7 @@
#include "lib/netplay/netplay.h"
-extern BOOL sendVersionCheck ();
+extern BOOL sendVersionCheck (void);
extern BOOL recvVersionCheck (NETMSG *pMsg);
extern BOOL intDisplayMultiJoiningStatus(UBYTE joinCount);
extern BOOL MultiPlayerLeave (DPID dp);
// A player has left the game.
Index: src/multiplay.c
===================================================================
--- src/multiplay.c (revision 345)
+++ src/multiplay.c (working copy)
@@ -1779,7 +1779,7 @@
return TRUE;
}
-BOOL isMsgStackEmpty()
+BOOL isMsgStackEmpty(void)
{
if(msgStackPos == (-1)) return TRUE;
return FALSE;
@@ -1853,7 +1853,7 @@
return TRUE;
}
-BOOL msgStackSort()
+BOOL msgStackSort(void)
{
SDWORD i;
@@ -1885,7 +1885,7 @@
return TRUE;
}
-BOOL msgStackPop()
+BOOL msgStackPop(void)
{
if(msgStackPos < 0 || msgStackPos >= MAX_MSG_STACK)
{
@@ -1896,12 +1896,12 @@
return msgStackSort(); //move all elements 1 pos lower
}
-SDWORD msgStackGetCount()
+SDWORD msgStackGetCount(void)
{
return msgStackPos + 1;
}
-BOOL msgStackFireTop()
+BOOL msgStackFireTop(void)
{
SDWORD _callbackType;
STRING msg[255];
Index: src/multiplay.h
===================================================================
--- src/multiplay.h (revision 345)
+++ src/multiplay.h (working copy)
@@ -312,14 +312,14 @@
/* for multiplayer message stack */
extern UDWORD msgStackPush(SDWORD CBtype, SDWORD plFrom, SDWORD plTo, STRING
*tStr, SDWORD x, SDWORD y);
-extern BOOL isMsgStackEmpty();
+extern BOOL isMsgStackEmpty(void);
extern BOOL msgStackGetFrom(SDWORD *psVal);
extern BOOL msgStackGetTo(SDWORD *psVal);
extern BOOL msgStackGetMsg(STRING *psVal);
-extern BOOL msgStackPop();
-extern SDWORD msgStackGetCount();
+extern BOOL msgStackPop(void);
+extern SDWORD msgStackGetCount(void);
extern void msgStackReset(void);
extern BOOL sendBeaconToPlayerNet(SDWORD locX, SDWORD locY, SDWORD
forPlayer, SDWORD sender, char *pStr);
-extern BOOL msgStackFireTop();
+extern BOOL msgStackFireTop(void);
Index: src/init.c
===================================================================
--- src/init.c (revision 345)
+++ src/init.c (working copy)
@@ -939,7 +939,7 @@
}
-BOOL buildMapList()
+BOOL buildMapList(void)
{
char ** filelist, ** file;
size_t len;
Index: src/init.h
===================================================================
--- src/init.h (revision 345)
+++ src/init.h (working copy)
@@ -47,7 +47,7 @@
void registerSearchPath( const char path[], unsigned int priority );
BOOL rebuildSearchPath( searchPathMode mode, BOOL force );
-BOOL buildMapList();
+BOOL buildMapList(void);
// the block heap for the game data
extern BLOCK_HEAP *psGameHeap;
Index: src/aiexperience.c
===================================================================
--- src/aiexperience.c (revision 345)
+++ src/aiexperience.c (working copy)
@@ -25,7 +25,7 @@
SDWORD oilDefendLocPrior[MAX_PLAYERS][MAX_OIL_DEFEND_LOCATIONS];
-void InitializeAIExperience()
+void InitializeAIExperience(void)
{
SDWORD i,j;
Index: src/multiint.c
===================================================================
--- src/multiint.c (revision 345)
+++ src/multiint.c (working copy)
@@ -1794,7 +1794,7 @@
}
////////////////////////////////////////////////////////////////////////////
-static void chooseSkirmishColours()
+static void chooseSkirmishColours(void)
{
UDWORD col,i,k;
BOOL taken;
Index: src/aiexperience.h
===================================================================
--- src/aiexperience.h (revision 345)
+++ src/aiexperience.h (working copy)
@@ -26,7 +26,7 @@
extern BOOL ExperienceRecallOil(SDWORD nPlayer);
-extern void InitializeAIExperience();
+extern void InitializeAIExperience(void);
extern BOOL OilResourceAt(UDWORD OilX,UDWORD OilY, SDWORD VisibleToPlayer);
extern BOOL ReadAISaveData(SDWORD nPlayer);
Index: src/order.c
===================================================================
--- src/order.c (revision 345)
+++ src/order.c (working copy)
@@ -85,7 +85,7 @@
//////////////////////////////////////////////////////////////////
//call this *AFTER* every mission so it gets reset
-void initRunData()
+void initRunData(void)
{
UBYTE i;
Index: src/order.h
===================================================================
--- src/order.h (revision 345)
+++ src/order.h (working copy)
@@ -120,7 +120,7 @@
#define DSS_FIREDES_MASK 0x800000
//call this *AFTER* every mission so it gets reset
-extern void initRunData();
+extern void initRunData(void);
/* Update a droids order state */
extern void orderUpdateDroid(DROID *psDroid);
Index: src/multimenu.c
===================================================================
--- src/multimenu.c (revision 345)
+++ src/multimenu.c (working copy)
@@ -619,7 +619,7 @@
}
-void closeMultiRequester()
+void closeMultiRequester(void)
{
widgDelete(psRScreen,M_REQUEST);
multiRequestUp = FALSE;
Index: src/edit3d.c
===================================================================
--- src/edit3d.c (revision 345)
+++ src/edit3d.c (working copy)
@@ -287,7 +287,7 @@
}
/*returns true if the build state is not equal to BUILD3D_NONE*/
-BOOL tryingToGetLocation()
+BOOL tryingToGetLocation(void)
{
if (buildState == BUILD3D_NONE)
{
Index: src/intdisplay.c
===================================================================
--- src/intdisplay.c (revision 345)
+++ src/intdisplay.c (working copy)
@@ -3659,7 +3659,7 @@
/*draws blips on radar to represent Proximity Display and damaged structures*/
-void drawRadarBlips()
+void drawRadarBlips(void)
{
PROXIMITY_DISPLAY *psProxDisp;
// STRUCTURE *psBuilding;
Index: src/edit3d.h
===================================================================
--- src/edit3d.h (revision 345)
+++ src/edit3d.h (working copy)
@@ -50,6 +50,6 @@
extern UDWORD temp;
/*returns true if the build state is not equal to BUILD3D_NONE*/
-extern BOOL tryingToGetLocation();
+extern BOOL tryingToGetLocation(void);
#endif
Index: src/intdisplay.h
===================================================================
--- src/intdisplay.h (revision 345)
+++ src/intdisplay.h (working copy)
@@ -308,7 +308,7 @@
extern void intDisplayTransportButton(struct _widget *psWidget, UDWORD xOffset,
UDWORD yOffset, UDWORD
*pColours);
/*draws blips on radar to represent Proximity Display*/
-extern void drawRadarBlips();
+extern void drawRadarBlips(void);
/*Displays the proximity messages blips over the world*/
extern void intDisplayProximityBlips(struct _widget *psWidget, UDWORD xOffset,
Index: src/loadsave.c
===================================================================
--- src/loadsave.c (revision 345)
+++ src/loadsave.c (working copy)
@@ -72,9 +72,9 @@
// ////////////////////////////////////////////////////////////////////////////
void drawBlueBox (UDWORD x,UDWORD y, UDWORD w,
UDWORD h);
-BOOL closeLoadSave ();
+BOOL closeLoadSave (void);
BOOL runLoadSave (BOOL bResetMissionWidgets);
-BOOL displayLoadSave ();
+BOOL displayLoadSave (void);
static BOOL _addLoadSave (BOOL bLoad,CHAR *sSearchPath,CHAR
*sExtension, CHAR *title);
static BOOL _runLoadSave (BOOL bResetMissionWidgets);
static void displayLoadBanner (struct _widget *psWidget, UDWORD xOffset,
UDWORD yOffset, UDWORD *pColours);
Index: src/mission.c
===================================================================
--- src/mission.c (revision 345)
+++ src/mission.c (working copy)
@@ -205,7 +205,7 @@
static void restoreMissionData(void);
static void saveCampaignData(void);
static void aiUpdateMissionStructure(STRUCTURE *psStructure);
-static void missionResetDroids();
+static void missionResetDroids(void);
static void saveMissionLimboData(void);
static void restoreMissionLimboData(void);
static void processMissionLimbo(void);
@@ -1645,7 +1645,7 @@
}
/*This deals with droids at the end of an offworld mission*/
-void processMission()
+void processMission(void)
{
DROID *psNext;
DROID *psDroid;
@@ -2365,7 +2365,7 @@
}
//reset variables in Droids such as order and position
-void missionResetDroids()
+void missionResetDroids(void)
{
UDWORD player;
DROID *psDroid, *psNext;
_______________________________________________
Warzone-dev mailing list
Warzone-dev@gna.org
https://mail.gna.org/listinfo/warzone-dev
