Skip to content

Commit 2fe04c5

Browse files
committed
Use prototypes in function declarations/definitions
1 parent db8f0de commit 2fe04c5

14 files changed

+89
-112
lines changed

compat/getopt.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ char *optarg; /* argument associated with option */
5858
* Parse argc/argv argument vector.
5959
*/
6060
int
61-
getopt(nargc, nargv, ostr)
62-
int nargc;
63-
char * const *nargv;
64-
const char *ostr;
61+
getopt(
62+
int nargc,
63+
char * const *nargv,
64+
const char *ostr)
6565
{
6666
static char *place = EMSG; /* option letter processing */
6767
char *oli; /* option letter list index */

compat/random.c

+7-8
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
#include <stdio.h>
5151

52-
long random();
52+
long random(void);
5353

5454
typedef unsigned int u_int;
5555

@@ -243,10 +243,10 @@ srandom(x)
243243
* Returns a pointer to the old state.
244244
*/
245245
char *
246-
initstate(seed, arg_state, n)
247-
u_int seed; /* seed for R.N.G. */
248-
char *arg_state; /* pointer to state array */
249-
int n; /* # bytes of state info */
246+
initstate(
247+
u_int seed, /* seed for R.N.G. */
248+
char *arg_state, /* pointer to state array */
249+
int n) /* # bytes of state info */
250250
{
251251
register char *ostate = (char *)(&state[-1]);
252252

@@ -306,8 +306,7 @@ initstate(seed, arg_state, n)
306306
* Returns a pointer to the old state information.
307307
*/
308308
char *
309-
setstate(arg_state)
310-
char *arg_state;
309+
setstate(char *arg_state)
311310
{
312311
register long *new_state = (long *)arg_state;
313312
register int type = new_state[0] % MAX_TYPES;
@@ -359,7 +358,7 @@ setstate(arg_state)
359358
* Returns a 31-bit random number.
360359
*/
361360
long
362-
random()
361+
random(void)
363362
{
364363
long i;
365364

compat/rename.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
*
77
*/
88

9-
int rename(from,to)
10-
register char *from, *to;
9+
int rename(
10+
register char *from,
11+
register char *to)
1112
{
1213
(void) unlink(to);
1314
if (link(from, to) < 0)

generic/tclXkeylist.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ ValidateKey (Tcl_Interp *interp, char *key, int keyLen)
247247
*-----------------------------------------------------------------------------
248248
*/
249249
static keylIntObj_t *
250-
AllocKeyedListIntRep ()
250+
AllocKeyedListIntRep (void)
251251
{
252252
keylIntObj_t *keylIntPtr;
253253

@@ -674,7 +674,7 @@ UpdateStringOfKeyedList (Tcl_Obj *keylPtr)
674674
*-----------------------------------------------------------------------------
675675
*/
676676
Tcl_Obj *
677-
TclX_NewKeyedListObj ()
677+
TclX_NewKeyedListObj (void)
678678
{
679679
Tcl_Obj *keylPtr = Tcl_NewObj ();
680680
keylIntObj_t *keylIntPtr = AllocKeyedListIntRep ();

generic/tclXprofile.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -320,8 +320,7 @@ RecordData (profInfo_t *infoPtr,
320320
*-----------------------------------------------------------------------------
321321
*/
322322
static void
323-
PopEntry (infoPtr)
324-
profInfo_t *infoPtr;
323+
PopEntry (profInfo_t *infoPtr)
325324
{
326325
profEntry_t *entryPtr = infoPtr->stackPtr;
327326

generic/tclXsignal.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1572,7 +1572,7 @@ SignalCmdCleanUp (ClientData clientData, Tcl_Interp *interp)
15721572
*-----------------------------------------------------------------------------
15731573
*/
15741574
void
1575-
TclX_SetupSigInt ()
1575+
TclX_SetupSigInt (void)
15761576
{
15771577
signalProcPtr_t actionFunc;
15781578
int restart;

unix/tclXunixCmds.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@ TclX_TimesObjCmd (ClientData clientData,
106106
*-----------------------------------------------------------------------------
107107
*/
108108
void
109-
TclX_PlatformCmdsInit (interp)
110-
Tcl_Interp *interp;
109+
TclX_PlatformCmdsInit (Tcl_Interp *interp)
111110
{
112111
Tcl_CreateObjCommand (interp,
113112
"chroot",

unix/tclXunixOS.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ TclXOSsleep (unsigned seconds)
319319
*-----------------------------------------------------------------------------
320320
*/
321321
void
322-
TclXOSsync ()
322+
TclXOSsync (void)
323323
{
324324
sync ();
325325
}
@@ -1399,7 +1399,7 @@ TclXOSGetSelectFnum (Tcl_Interp *interp, Tcl_Channel channel, int direction, int
13991399
*-----------------------------------------------------------------------------
14001400
*/
14011401
int
1402-
TclXOSHaveFlock ()
1402+
TclXOSHaveFlock (void)
14031403
{
14041404
#ifdef F_SETLKW
14051405
return TRUE;

unix/tclXunixSock.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ TclX_ServerInit (Tcl_Interp *interp)
358358
Tcl_CreateCommand (interp, "server_accept", TclX_ServerAcceptCmd,
359359
(ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
360360
Tcl_CreateCommand (interp, "server_create", TclX_ServerCreateCmd,
361-
(ClientData) NULL, (void (*)()) NULL);
361+
(ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
362362
}
363363

364364
/* vim: set ts=4 sw=4 sts=4 et : */

win/cattcl.c

+2-3
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@
3333
*-----------------------------------------------------------------------------
3434
*/
3535
void
36-
TclX_SplitWinCmdLine (argcPtr, argvPtr)
37-
int *argcPtr;
38-
char ***argvPtr;
36+
TclX_SplitWinCmdLine (int *argcPtr;
37+
char ***argvPtr;
3938
{
4039
char *args = GetCommandLine ();
4140
char **argvlist, *p;

win/tclXwinCmds.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ TclX_TimesObjCmd (ClientData clientData,
6666
*-----------------------------------------------------------------------------
6767
*/
6868
void
69-
TclX_PlatformCmdsInit (interp)
70-
Tcl_Interp *interp;
69+
TclX_PlatformCmdsInit (Tcl_Interp *interp)
7170
{
7271
Tcl_CreateObjCommand (interp,
7372
"chroot",

win/tclXwinDup.c

+6-8
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,10 @@ ConvertChannelName (Tcl_Interp *interp,
7474
*-----------------------------------------------------------------------------
7575
*/
7676
Tcl_Channel
77-
TclXOSDupChannel (interp, srcChannel, mode, targetChannelId)
78-
Tcl_Interp *interp;
79-
Tcl_Channel srcChannel;
80-
int mode;
81-
char *targetChannelId;
77+
TclXOSDupChannel (Tcl_Interp *interp,
78+
Tcl_Channel srcChannel,
79+
int mode,
80+
char *targetChannelId)
8281
{
8382
Tcl_Channel newChannel = NULL;
8483
int direction;
@@ -175,9 +174,8 @@ TclXOSDupChannel (interp, srcChannel, mode, targetChannelId)
175174
*-----------------------------------------------------------------------------
176175
*/
177176
Tcl_Channel
178-
TclXOSBindOpenFile (interp, fileNum)
179-
Tcl_Interp *interp;
180-
int fileNum;
177+
TclXOSBindOpenFile (Tcl_Interp *interp,
178+
int fileNum)
181179
{
182180
HANDLE fileHandle;
183181
int mode, isSocket;

win/tclXwinId.c

+11-15
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,9 @@ TclX_IdObjCmd (ClientData clientData,
5454
* id process
5555
*/
5656
static int
57-
IdProcess (interp, objc, objv)
58-
Tcl_Interp *interp;
59-
int objc;
60-
Tcl_Obj *CONST objv[];
57+
IdProcess (Tcl_Interp *interp,
58+
int objc,
59+
Tcl_Obj *CONST objv[])
6160
{
6261
Tcl_Obj *resultPtr = Tcl_GetObjResult (interp);
6362

@@ -74,10 +73,9 @@ IdProcess (interp, objc, objv)
7473
* id host
7574
*/
7675
static int
77-
IdHost (interp, objc, objv)
78-
Tcl_Interp *interp;
79-
int objc;
80-
Tcl_Obj *CONST objv[];
76+
IdHost (Tcl_Interp *interp,
77+
int objc,
78+
Tcl_Obj *CONST objv[])
8179
{
8280
char hostName [TCL_RESULT_SIZE];
8381

@@ -96,11 +94,10 @@ IdHost (interp, objc, objv)
9694
}
9795

9896
static int
99-
TclX_IdObjCmd (clientData, interp, objc, objv)
100-
ClientData clientData;
101-
Tcl_Interp *interp;
102-
int objc;
103-
Tcl_Obj *CONST objv[];
97+
TclX_IdObjCmd (ClientData clientData,
98+
Tcl_Interp *interp,
99+
int objc,
100+
Tcl_Obj *CONST objv[])
104101
{
105102
char *optionPtr;
106103

@@ -139,8 +136,7 @@ TclX_IdObjCmd (clientData, interp, objc, objv)
139136
*-----------------------------------------------------------------------------
140137
*/
141138
void
142-
TclX_IdInit (interp)
143-
Tcl_Interp *interp;
139+
TclX_IdInit (Tcl_Interp *interp)
144140
{
145141
Tcl_CreateObjCommand (interp,
146142
"id",

0 commit comments

Comments
 (0)