Merge pull request #20 from chrstphrchvz/c23ok

Use prototypes in function declarations/definitions
flightaware · Jan 18, 2024 · 10b0bea · 10b0bea
2 parents 0f6ff65 + 64fea04
commit 10b0bea
Show file tree

Hide file tree

Showing 14 changed files with 89 additions and 112 deletions.
diff --git a/compat/getopt.c b/compat/getopt.c
@@ -58,10 +58,10 @@ char	*optarg;		/* argument associated with option */
  *	Parse argc/argv argument vector.
  */
 int
-getopt(nargc, nargv, ostr)
-	int nargc;
-	char * const *nargv;
-	const char *ostr;
+getopt(
+	int nargc,
+	char * const *nargv,
+	const char *ostr)
 {
 	static char *place = EMSG;		/* option letter processing */
 	char *oli;				/* option letter list index */

diff --git a/compat/random.c b/compat/random.c
@@ -49,7 +49,7 @@
 
 #include <stdio.h>
 
-long random();
+long random(void);
 
 typedef unsigned int u_int;
 
@@ -243,10 +243,10 @@ srandom(x)
  * Returns a pointer to the old state.
  */
 char *
-initstate(seed, arg_state, n)
-	u_int seed;			/* seed for R.N.G. */
-	char *arg_state;		/* pointer to state array */
-	int n;				/* # bytes of state info */
+initstate(
+	u_int seed,			/* seed for R.N.G. */
+	char *arg_state,		/* pointer to state array */
+	int n)				/* # bytes of state info */
 {
 	register char *ostate = (char *)(&state[-1]);
 
@@ -306,8 +306,7 @@ initstate(seed, arg_state, n)
  * Returns a pointer to the old state information.
  */
 char *
-setstate(arg_state)
-	char *arg_state;
+setstate(char *arg_state)
 {
 	register long *new_state = (long *)arg_state;
 	register int type = new_state[0] % MAX_TYPES;
@@ -359,7 +358,7 @@ setstate(arg_state)
  * Returns a 31-bit random number.
  */
 long
-random()
+random(void)
 {
 	long i;
 

diff --git a/compat/rename.c b/compat/rename.c
@@ -6,8 +6,9 @@
  *
  */
 
-int rename(from,to)
-register char *from, *to;
+int rename(
+register char *from,
+register char *to)
 {
     (void) unlink(to);
     if (link(from, to) < 0)

diff --git a/generic/tclXkeylist.c b/generic/tclXkeylist.c
@@ -247,7 +247,7 @@ ValidateKey (Tcl_Interp *interp, char *key, int keyLen)
  *-----------------------------------------------------------------------------
  */
 static keylIntObj_t *
-AllocKeyedListIntRep ()
+AllocKeyedListIntRep (void)
 {
     keylIntObj_t *keylIntPtr;
 
@@ -674,7 +674,7 @@ UpdateStringOfKeyedList (Tcl_Obj *keylPtr)
  *-----------------------------------------------------------------------------
  */
 Tcl_Obj *
-TclX_NewKeyedListObj ()
+TclX_NewKeyedListObj (void)
 {
     Tcl_Obj *keylPtr = Tcl_NewObj ();
     keylIntObj_t *keylIntPtr = AllocKeyedListIntRep ();

diff --git a/generic/tclXprofile.c b/generic/tclXprofile.c
@@ -320,8 +320,7 @@ RecordData (profInfo_t  *infoPtr,
  *-----------------------------------------------------------------------------
  */
 static void
-PopEntry (infoPtr)
-    profInfo_t *infoPtr;
+PopEntry (profInfo_t *infoPtr)
 {
     profEntry_t *entryPtr = infoPtr->stackPtr;
 

diff --git a/generic/tclXsignal.c b/generic/tclXsignal.c
@@ -1572,7 +1572,7 @@ SignalCmdCleanUp (ClientData clientData, Tcl_Interp *interp)
  *-----------------------------------------------------------------------------
  */
 void
-TclX_SetupSigInt ()
+TclX_SetupSigInt (void)
 {
     signalProcPtr_t  actionFunc;
     int restart;

diff --git a/unix/tclXunixCmds.c b/unix/tclXunixCmds.c
@@ -106,8 +106,7 @@ TclX_TimesObjCmd (ClientData   clientData,
  *-----------------------------------------------------------------------------
  */
 void
-TclX_PlatformCmdsInit (interp)
-    Tcl_Interp *interp;
+TclX_PlatformCmdsInit (Tcl_Interp *interp)
 {
     Tcl_CreateObjCommand (interp,
 			  "chroot",

diff --git a/unix/tclXunixOS.c b/unix/tclXunixOS.c
@@ -307,7 +307,7 @@ TclXOSsleep (unsigned seconds)
  *-----------------------------------------------------------------------------
  */
 void
-TclXOSsync ()
+TclXOSsync (void)
 {
     sync ();
 }
@@ -1387,7 +1387,7 @@ TclXOSGetSelectFnum (Tcl_Interp *interp, Tcl_Channel channel, int direction, int
  *-----------------------------------------------------------------------------
  */
 int
-TclXOSHaveFlock ()
+TclXOSHaveFlock (void)
 {
 #ifdef F_SETLKW
     return TRUE;

diff --git a/unix/tclXunixSock.c b/unix/tclXunixSock.c
@@ -358,7 +358,7 @@ TclX_ServerInit (Tcl_Interp *interp)
     Tcl_CreateCommand (interp, "server_accept", TclX_ServerAcceptCmd,
                        (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
     Tcl_CreateCommand (interp, "server_create", TclX_ServerCreateCmd,
-                       (ClientData) NULL, (void (*)()) NULL);
+                       (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
 }
 
 /* vim: set ts=4 sw=4 sts=4 et : */
diff --git a/win/cattcl.c b/win/cattcl.c
@@ -33,9 +33,8 @@
  *-----------------------------------------------------------------------------
  */
 void
-TclX_SplitWinCmdLine (argcPtr, argvPtr)
-    int    *argcPtr;
-    char ***argvPtr;
+TclX_SplitWinCmdLine (int    *argcPtr;
+                      char ***argvPtr;
 {
     char   *args = GetCommandLine ();
     char **argvlist, *p;

diff --git a/win/tclXwinCmds.c b/win/tclXwinCmds.c
@@ -66,8 +66,7 @@ TclX_TimesObjCmd (ClientData  clientData,
  *-----------------------------------------------------------------------------
  */
 void
-TclX_PlatformCmdsInit (interp)
-    Tcl_Interp *interp;
+TclX_PlatformCmdsInit (Tcl_Interp *interp)
 {
     Tcl_CreateObjCommand (interp,
 			  "chroot",

diff --git a/win/tclXwinDup.c b/win/tclXwinDup.c
@@ -74,11 +74,10 @@ ConvertChannelName (Tcl_Interp *interp,
  *-----------------------------------------------------------------------------
  */
 Tcl_Channel
-TclXOSDupChannel (interp, srcChannel, mode, targetChannelId)
-    Tcl_Interp *interp;
-    Tcl_Channel srcChannel;
-    int         mode;
-    char       *targetChannelId;
+TclXOSDupChannel (Tcl_Interp *interp,
+                  Tcl_Channel srcChannel,
+                  int         mode,
+                  char       *targetChannelId)
 {
     Tcl_Channel newChannel = NULL;
     int direction;
@@ -175,9 +174,8 @@ TclXOSDupChannel (interp, srcChannel, mode, targetChannelId)
  *-----------------------------------------------------------------------------
  */
 Tcl_Channel
-TclXOSBindOpenFile (interp, fileNum)
-    Tcl_Interp *interp;
-    int         fileNum;
+TclXOSBindOpenFile (Tcl_Interp *interp,
+                    int         fileNum)
 {
     HANDLE fileHandle;
     int mode, isSocket;

diff --git a/win/tclXwinId.c b/win/tclXwinId.c
@@ -54,10 +54,9 @@ TclX_IdObjCmd (ClientData clientData,
  * id process
  */
 static int
-IdProcess (interp, objc, objv)
-    Tcl_Interp *interp;
-    int         objc;
-    Tcl_Obj    *const objv[];
+IdProcess (Tcl_Interp *interp,
+           int         objc,
+           Tcl_Obj    *const objv[])
 {
     Tcl_Obj *resultPtr = Tcl_GetObjResult (interp);
 
@@ -74,10 +73,9 @@ IdProcess (interp, objc, objv)
  * id host
  */
 static int
-IdHost (interp, objc, objv)
-    Tcl_Interp *interp;
-    int         objc;
-    Tcl_Obj    *const objv[];
+IdHost (Tcl_Interp *interp,
+        int         objc,
+        Tcl_Obj    *const objv[])
 {
     char hostName [TCL_RESULT_SIZE];
 
@@ -96,11 +94,10 @@ IdHost (interp, objc, objv)
 }
 
 static int
-TclX_IdObjCmd (clientData, interp, objc, objv)
-    ClientData  clientData;
-    Tcl_Interp *interp;
-    int         objc;
-    Tcl_Obj    *const objv[];
+TclX_IdObjCmd (ClientData  clientData,
+               Tcl_Interp *interp,
+               int         objc,
+               Tcl_Obj    *const objv[])
 {
     char *optionPtr;
 
@@ -139,8 +136,7 @@ TclX_IdObjCmd (clientData, interp, objc, objv)
  *-----------------------------------------------------------------------------
  */
 void
-TclX_IdInit (interp)
-    Tcl_Interp *interp;
+TclX_IdInit (Tcl_Interp *interp)
 {
     Tcl_CreateObjCommand (interp,
 			  "id",