From 176c45720f3b9e5555fe1084d3e6ea59488c1785 Mon Sep 17 00:00:00 2001 From: Michael Gernoth Date: Sat, 28 Jun 2025 13:58:58 +0200 Subject: [PATCH] Fixes for compilation with gcc 15 Mainly prototype fixes (fix incomplete and convert from K&R to ANSI) --- src/sim/g_map.c | 2 +- src/sim/headers/mac.h | 10 +- src/sim/headers/sim.h | 6 +- src/sim/random.c | 27 ++-- src/sim/s_sim.c | 4 +- src/sim/sim.c | 12 +- src/sim/w_date.c | 10 +- src/sim/w_editor.c | 8 +- src/sim/w_graph.c | 10 +- src/sim/w_inter.c | 166 +++++++++++--------- src/sim/w_map.c | 6 +- src/sim/w_piem.c | 180 +++++++++++----------- src/sim/w_sim.c | 6 +- src/sim/w_sound.c | 4 +- src/sim/w_sprite.c | 8 +- src/sim/w_stubs.c | 3 +- src/sim/w_tk.c | 14 +- src/sim/w_x.c | 2 +- src/tcl/panic.c | 32 +++- src/tcl/regexp.c | 106 +++++-------- src/tcl/tclassem.c | 18 ++- src/tcl/tclbasic.c | 82 +++++----- src/tcl/tclckall.c | 62 +++----- src/tcl/tclcmdah.c | 143 ++++++++++-------- src/tcl/tclcmdil.c | 164 +++++++++++--------- src/tcl/tclcmdmz.c | 130 ++++++++-------- src/tcl/tclenv.c | 49 +++--- src/tcl/tclexpr.c | 95 ++++++------ src/tcl/tclget.c | 33 ++-- src/tcl/tclglob.c | 46 +++--- src/tcl/tclhash.c | 122 ++++++++------- src/tcl/tclhist.c | 103 +++++++------ src/tcl/tclint.h | 4 +- src/tcl/tclparse.c | 112 +++++++------- src/tcl/tclproc.c | 69 +++++---- src/tcl/tcltest.c | 4 +- src/tcl/tclunxaz.c | 233 +++++++++++++++------------- src/tcl/tclunxst.c | 12 +- src/tcl/tclunxut.c | 64 ++++---- src/tcl/tclutil.c | 147 ++++++++++-------- src/tcl/tclvar.c | 328 ++++++++++++++++++++++------------------ src/tclx/src/main.c | 22 ++- src/tclx/src/tclxbsrc.c | 33 ++-- src/tclx/src/tclxcclk.c | 11 +- src/tclx/src/tclxchmd.c | 40 ++--- src/tclx/src/tclxclck.c | 22 +-- src/tclx/src/tclxclp.c | 55 +++---- src/tclx/src/tclxcret.c | 144 +++++++++--------- src/tclx/src/tclxdebg.c | 64 ++++---- src/tclx/src/tclxdup.c | 20 +-- src/tclx/src/tclxfcmd.c | 112 +++++++------- src/tclx/src/tclxfctl.c | 34 ++--- src/tclx/src/tclxfmat.c | 225 ++++++++++++++------------- src/tclx/src/tclxfsca.c | 62 +++----- src/tclx/src/tclxgdat.y | 38 ++--- src/tclx/src/tclxgenl.c | 33 ++-- src/tclx/src/tclxhndl.c | 76 +++------- src/tclx/src/tclxid.c | 35 ++--- src/tclx/src/tclxint.h | 4 +- src/tclx/src/tclxklst.c | 96 +++++------- src/tclx/src/tclxlib.c | 141 ++++++----------- src/tclx/src/tclxlist.c | 44 +++--- src/tclx/src/tclxmath.c | 37 ++--- src/tclx/src/tclxmsgc.c | 76 +++++----- src/tclx/src/tclxproc.c | 33 ++-- src/tclx/src/tclxprof.c | 76 +++------- src/tclx/src/tclxrexp.c | 37 ++--- src/tclx/src/tclxsel.c | 37 ++--- src/tclx/src/tclxsig.c | 104 +++++-------- src/tclx/src/tclxstr.c | 72 ++++----- src/tclx/src/tclxstup.c | 51 ++----- src/tclx/src/tclxtend.h | 4 +- src/tclx/src/tclxunix.c | 103 +++++++------ src/tclx/src/tclxutil.c | 121 ++++++--------- src/tk/main.c | 80 +++++----- src/tk/tk3d.c | 167 ++++++++++---------- src/tk/tkargv.c | 36 ++--- src/tk/tkatom.c | 25 +-- src/tk/tkbind.c | 152 ++++++++++--------- src/tk/tkbitmap.c | 69 +++++---- src/tk/tkbutton.c | 100 ++++++------ src/tk/tkcanvas.c | 293 +++++++++++++++++++---------------- src/tk/tkcmds.c | 129 ++++++++-------- src/tk/tkcolor.c | 38 ++--- src/tk/tkconfig.c | 75 ++++----- src/tk/tkconfig.h | 2 +- src/tk/tkcursor.c | 51 ++++--- src/tk/tkcvarc.c | 167 +++++++++++--------- src/tk/tkcvbmap.c | 118 ++++++++------- src/tk/tkcvline.c | 157 ++++++++++--------- src/tk/tkcvpoly.c | 133 ++++++++-------- src/tk/tkcvtext.c | 183 ++++++++++++---------- src/tk/tkcvwind.c | 136 +++++++++-------- src/tk/tkentry.c | 191 ++++++++++++----------- src/tk/tkerror.c | 31 ++-- src/tk/tkevent.c | 193 ++++++++++++----------- src/tk/tkfont.c | 99 ++++++------ src/tk/tkframe.c | 61 ++++---- src/tk/tkgc.c | 25 ++- src/tk/tkgeo.c | 30 ++-- src/tk/tkget.c | 97 ++++++------ src/tk/tkgrab.c | 78 +++++----- src/tk/tklist.c | 213 ++++++++++++++------------ src/tk/tkmenu.c | 154 ++++++++++--------- src/tk/tkmnbut.c | 99 ++++++------ src/tk/tkmsg.c | 86 ++++++----- src/tk/tkoption.c | 122 ++++++++------- src/tk/tkpack.c | 72 +++++---- src/tk/tkpixmap.c | 87 ++++++----- src/tk/tkplace.c | 77 +++++----- src/tk/tkpresrv.c | 17 ++- src/tk/tkrawtcp.c | 71 +++------ src/tk/tkrectov.c | 140 +++++++++-------- src/tk/tkscale.c | 148 ++++++++++-------- src/tk/tkscrbar.c | 124 ++++++++------- src/tk/tkselect.c | 183 ++++++++++++---------- src/tk/tksend.c | 114 +++++++------- src/tk/tkshare.c | 32 ++-- src/tk/tktcp.c | 35 ++--- src/tk/tktext.c | 141 +++++++++-------- src/tk/tktrig.c | 152 ++++++++++--------- src/tk/tktxbtre.c | 217 ++++++++++++++------------ src/tk/tktxdisp.c | 173 ++++++++++++--------- src/tk/tktxidx.c | 87 ++++++----- src/tk/tktxtag.c | 96 +++++++----- src/tk/tkwindow.c | 265 ++++++++++++++++++-------------- src/tk/tkwm.c | 143 +++++++++--------- 127 files changed, 5555 insertions(+), 5107 deletions(-) diff --git a/src/sim/g_map.c b/src/sim/g_map.c index 5a65e00..1c2701d 100644 --- a/src/sim/g_map.c +++ b/src/sim/g_map.c @@ -83,7 +83,7 @@ short valGrayMap[] = { }; -void (*mapProcs[NMAPS])(); +void (*mapProcs[NMAPS])(SimView *); void drawPopDensity(SimView *view); void drawRateOfGrowth(SimView *view); diff --git a/src/sim/headers/mac.h b/src/sim/headers/mac.h index 3163f8f..d44c315 100644 --- a/src/sim/headers/mac.h +++ b/src/sim/headers/mac.h @@ -73,11 +73,11 @@ typedef unsigned char Byte; typedef Byte * Ptr; typedef char **Handle; -extern Ptr NewPtr(); -extern Handle GetResource(); -extern QUAD ResourceSize(); -extern char *ResourceName(); -extern QUAD ResourceID(); +extern Ptr NewPtr(int size); +extern Handle GetResource(char *name, QUAD id); +extern QUAD ResourceSize(Handle h); +extern char *ResourceName(Handle h); +extern QUAD ResourceID(Handle h); struct Resource { char *buf; diff --git a/src/sim/headers/sim.h b/src/sim/headers/sim.h index 4529a38..f091977 100644 --- a/src/sim/headers/sim.h +++ b/src/sim/headers/sim.h @@ -675,9 +675,9 @@ extern short RandInt(void); extern Sim *MakeNewSim(); extern SimView *MakeNewView(); -extern SimSprite *GetSprite(); -extern SimSprite *MakeSprite(); -extern SimSprite *MakeNewSprite(); +extern SimSprite *GetSprite(int type); +extern SimSprite *MakeSprite(int type, int x, int y); +extern SimSprite *MakeNewSprite(int type, int x, int y); extern struct XDisplay *XDisplays; diff --git a/src/sim/random.c b/src/sim/random.c index e043b88..d39bfa2 100644 --- a/src/sim/random.c +++ b/src/sim/random.c @@ -118,9 +118,9 @@ static int degrees[MAX_TYPES] = { DEG_0, DEG_1, DEG_2, DEG_3, DEG_4 }; static int seps [MAX_TYPES] = { SEP_0, SEP_1, SEP_2, SEP_3, SEP_4 }; QUAD sim_random(); -void sim_srandom(); -char *sim_initstate(); -char *sim_setstate(); +void sim_srandom (unsigned int x); +char *sim_initstate (unsigned int seed, char *arg_state, int n); +char *sim_setstate (char *arg_state); /* * Initially, everything is set up as if from: @@ -191,9 +191,8 @@ static QUAD *end_ptr = &randtbl[DEG_3 + 1]; * introduced by the L.C.R.N.G. Note that the initialization of randtbl[] * for default usage relies on values produced by this routine. */ -void -sim_srandom(x) - unsigned int x; +void +sim_srandom (unsigned int x) { register int i, j; @@ -231,10 +230,11 @@ sim_srandom(x) * Returns a pointer to the old state. */ char * -sim_initstate(seed, arg_state, n) - unsigned int seed; /* seed for R.N.G. */ - char *arg_state; /* pointer to state array */ - int n; /* # bytes of state info */ +sim_initstate ( + unsigned 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]); @@ -294,8 +294,7 @@ sim_initstate(seed, arg_state, n) * Returns a pointer to the old state information. */ char * -sim_setstate(arg_state) - char *arg_state; +sim_setstate (char *arg_state) { register QUAD *new_state = (QUAD *)arg_state; register int type = new_state[0] % MAX_TYPES; @@ -346,8 +345,8 @@ sim_setstate(arg_state) * * Returns a 31-bit random number. */ -QUAD -sim_random() +QUAD +sim_random (void) { QUAD i; diff --git a/src/sim/s_sim.c b/src/sim/s_sim.c index 9d0e4c6..f9fa82f 100644 --- a/src/sim/s_sim.c +++ b/src/sim/s_sim.c @@ -674,12 +674,12 @@ CollectTax(void) { static float RLevels[3] = { 0.7, 0.9, 1.2 }; static float FLevels[3] = { 1.4, 1.2, 0.8 }; - short z; + /* short z; */ CashFlow = 0; if (!TaxFlag) { /* if the Tax Port is clear */ /* XXX: do something with z */ - z = AvCityTax / 48; /* post */ + /* z = AvCityTax / 48; */ /* post */ AvCityTax = 0; PoliceFund = PolicePop * 100; FireFund = FireStPop * 100; diff --git a/src/sim/sim.c b/src/sim/sim.c index 5ae4770..21e4b41 100644 --- a/src/sim/sim.c +++ b/src/sim/sim.c @@ -229,7 +229,7 @@ sim_init(void) int triedToBailOnce = 0; void -SignalExitHandler() +SignalExitHandler(int sig) { if (triedToBailOnce) { exit(-1); @@ -246,10 +246,10 @@ SignalExitHandler() void signal_init() { - signal(SIGHUP, (void (*)())SignalExitHandler); - signal(SIGINT, (void (*)())SignalExitHandler); - signal(SIGQUIT, (void (*)())SignalExitHandler); - signal(SIGTERM, (void (*)())SignalExitHandler); + signal(SIGHUP, (void (*)(int))SignalExitHandler); + signal(SIGINT, (void (*)(int))SignalExitHandler); + signal(SIGQUIT, (void (*)(int))SignalExitHandler); + signal(SIGTERM, (void (*)(int))SignalExitHandler); } @@ -627,7 +627,7 @@ int main(int argc, char *argv[]) { int c, errflg = 0; - extern int isatty(); + extern int isatty(int); printf("Welcome to X11 Multi Player Micropolis version %s by Will Wright, Don Hopkins.\n", MicropolisVersion); diff --git a/src/sim/w_date.c b/src/sim/w_date.c index 342f0f3..cdc398b 100644 --- a/src/sim/w_date.c +++ b/src/sim/w_date.c @@ -111,7 +111,7 @@ Tk_ConfigSpec DateConfigSpecs[] = { }; -XDisplay *FindXDisplay(); +extern XDisplay *FindXDisplay(Tk_Window tkwin); static void @@ -374,14 +374,14 @@ DoDateCmd(CLIENT_ARGS) SimDate *date = (SimDate *) clientData; Tcl_HashEntry *ent; int result = TCL_OK; - int (*cmd)(); + int (*cmd)(SimDate*, Tcl_Interp*, int, char**); if (argc < 2) { return TCL_ERROR; } if ((ent = Tcl_FindHashEntry(&DateCmds, argv[1]))) { - cmd = (int (*)())ent->clientData; + cmd = (int (*)(SimDate*, Tcl_Interp*, int, char**))ent->clientData; Tk_Preserve((ClientData) date); result = cmd(date, interp, argc, argv); Tk_Release((ClientData) date); @@ -430,7 +430,7 @@ DateViewCmd(CLIENT_ARGS) StructureNotifyMask, SimDateEventProc, (ClientData) date); Tcl_CreateCommand(interp, Tk_PathName(date->tkwin), - DoDateCmd, (ClientData) date, (void (*)()) NULL); + DoDateCmd, (ClientData) date, (void (*)(int *)) NULL); /* Tk_MakeWindowExist(date->tkwin); @@ -477,7 +477,7 @@ void date_command_init(void) { Tcl_CreateCommand(tk_mainInterp, "dateview", DateViewCmd, - (ClientData)MainWindow, (void (*)()) NULL); + (ClientData)MainWindow, (void (*)(int *)) NULL); Tcl_InitHashTable(&DateCmds, TCL_STRING_KEYS); diff --git a/src/sim/w_editor.c b/src/sim/w_editor.c index 7b0c658..de7e919 100644 --- a/src/sim/w_editor.c +++ b/src/sim/w_editor.c @@ -764,7 +764,7 @@ editor_command_init(void) extern int TileViewCmd(CLIENT_ARGS); Tcl_CreateCommand(tk_mainInterp, "editorview", TileViewCmd, - (ClientData)MainWindow, (void (*)()) NULL); + (ClientData)MainWindow, (void (*)(int *)) NULL); Tcl_InitHashTable(&EditorCmds, TCL_STRING_KEYS); @@ -813,14 +813,14 @@ DoEditorCmd(CLIENT_ARGS) SimView *view = (SimView *) clientData; Tcl_HashEntry *ent; int result = TCL_OK; - int (*cmd)(); + int (*cmd)(SimView*, Tcl_Interp*, int, char**); if (argc < 2) { return TCL_ERROR; } if ((ent = Tcl_FindHashEntry(&EditorCmds, argv[1]))) { - cmd = (int (*)())ent->clientData; + cmd = (int (*)(SimView*, Tcl_Interp*, int, char**))ent->clientData; Tk_Preserve((ClientData) view); result = cmd(view, interp, argc, argv); Tk_Release((ClientData) view); @@ -968,7 +968,7 @@ HandleAutoGoto(SimView *view) NewMap = 1; DidStopPan(view); } else { - double atan2(), cos(), sin(); + double atan2(double, double), cos(double), sin(double); double direction, vx, vy; double co, si; diff --git a/src/sim/w_graph.c b/src/sim/w_graph.c index b86d959..cd04d12 100644 --- a/src/sim/w_graph.c +++ b/src/sim/w_graph.c @@ -101,7 +101,7 @@ Tk_ConfigSpec GraphConfigSpecs[] = { }; -XDisplay *FindXDisplay(); +extern XDisplay *FindXDisplay(Tk_Window tkwin); static void @@ -332,14 +332,14 @@ DoGraphCmd(CLIENT_ARGS) SimGraph *graph = (SimGraph *) clientData; Tcl_HashEntry *ent; int result = TCL_OK; - int (*cmd)(); + int (*cmd)(SimGraph*, Tcl_Interp*, int, char**); if (argc < 2) { return TCL_ERROR; } if ((ent = Tcl_FindHashEntry(&GraphCmds, argv[1]))) { - cmd = (int (*)())ent->clientData; + cmd = (int (*)(SimGraph*, Tcl_Interp*, int, char**))ent->clientData; Tk_Preserve((ClientData) graph); result = cmd(graph, interp, argc, argv); Tk_Release((ClientData) graph); @@ -383,7 +383,7 @@ GraphViewCmd(CLIENT_ARGS) StructureNotifyMask, SimGraphEventProc, (ClientData) graph); Tcl_CreateCommand(interp, Tk_PathName(graph->tkwin), - DoGraphCmd, (ClientData) graph, (void (*)()) NULL); + DoGraphCmd, (ClientData) graph, (void (*)(int *)) NULL); /* Tk_MakeWindowExist(graph->tkwin); @@ -440,7 +440,7 @@ void graph_command_init(void) { Tcl_CreateCommand(tk_mainInterp, "graphview", GraphViewCmd, - (ClientData)MainWindow, (void (*)()) NULL); + (ClientData)MainWindow, (void (*)(int *)) NULL); Tcl_InitHashTable(&GraphCmds, TCL_STRING_KEYS); diff --git a/src/sim/w_inter.c b/src/sim/w_inter.c index cf7c7c9..06bf44c 100644 --- a/src/sim/w_inter.c +++ b/src/sim/w_inter.c @@ -316,13 +316,14 @@ static void NotifyInterval(register Interval *intervalPtr); *-------------------------------------------------------------- */ -int -Tk_IntervalCmd(clientData, interp, argc, argv) - ClientData clientData; /* Main window associated with +int +Tk_IntervalCmd ( + ClientData clientData, /* Main window associated with * interpreter. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { Tk_Window tkwin = (Tk_Window) clientData; register Interval *intervalPtr; @@ -369,7 +370,7 @@ Tk_IntervalCmd(clientData, interp, argc, argv) |PointerMotionMask|ButtonPressMask|ButtonReleaseMask, IntervalMouseProc, (ClientData) intervalPtr); Tcl_CreateCommand(interp, Tk_PathName(intervalPtr->tkwin), IntervalWidgetCmd, - (ClientData) intervalPtr, (void (*)()) NULL); + (ClientData) intervalPtr, (void (*)(int *)) NULL); if (ConfigureInterval(interp, intervalPtr, argc-2, argv+2, 0) != TCL_OK) { goto error; } @@ -400,13 +401,14 @@ Tk_IntervalCmd(clientData, interp, argc, argv) *-------------------------------------------------------------- */ -static int -IntervalWidgetCmd(clientData, interp, argc, argv) - ClientData clientData; /* Information about interval +static int +IntervalWidgetCmd ( + ClientData clientData, /* Information about interval * widget. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { register Interval *intervalPtr = (Interval *) clientData; int result = TCL_OK; @@ -515,9 +517,10 @@ IntervalWidgetCmd(clientData, interp, argc, argv) *---------------------------------------------------------------------- */ -static void -DestroyInterval(clientData) - ClientData clientData; /* Info about interval widget. */ +static void +DestroyInterval ( + ClientData clientData /* Info about interval widget. */ +) { register Interval *intervalPtr = (Interval *) clientData; @@ -572,14 +575,15 @@ DestroyInterval(clientData) *---------------------------------------------------------------------- */ -static int -ConfigureInterval(interp, intervalPtr, argc, argv, flags) - Tcl_Interp *interp; /* Used for error reporting. */ - register Interval *intervalPtr; /* Information about widget; may or may +static int +ConfigureInterval ( + Tcl_Interp *interp, /* Used for error reporting. */ + register Interval *intervalPtr, /* Information about widget; may or may * not already have values for some fields. */ - int argc; /* Number of valid entries in argv. */ - char **argv; /* Arguments. */ - int flags; /* Flags to pass to Tk_ConfigureWidget. */ + int argc, /* Number of valid entries in argv. */ + char **argv, /* Arguments. */ + int flags /* Flags to pass to Tk_ConfigureWidget. */ +) { XGCValues gcValues; GC newGC; @@ -690,9 +694,10 @@ ConfigureInterval(interp, intervalPtr, argc, argv, flags) *---------------------------------------------------------------------- */ -static void -ComputeIntervalGeometry(intervalPtr) - register Interval *intervalPtr; /* Information about widget. */ +static void +ComputeIntervalGeometry ( + register Interval *intervalPtr /* Information about widget. */ +) { XCharStruct bbox; char valueString[30]; @@ -794,9 +799,10 @@ ComputeIntervalGeometry(intervalPtr) *-------------------------------------------------------------- */ -static void -DisplayVerticalInterval(clientData) - ClientData clientData; /* Information about widget. */ +static void +DisplayVerticalInterval ( + ClientData clientData /* Information about widget. */ +) { register Interval *intervalPtr = (Interval *) clientData; register Tk_Window tkwin = intervalPtr->tkwin; @@ -953,15 +959,16 @@ DisplayVerticalInterval(clientData) *---------------------------------------------------------------------- */ -static void -DisplayVerticalValue(intervalPtr, value, rightEdge) - register Interval *intervalPtr; /* Information about widget in which to +static void +DisplayVerticalValue ( + register Interval *intervalPtr, /* Information about widget in which to * display value. */ - int value; /* Y-coordinate of number to display, + int value, /* Y-coordinate of number to display, * specified in application coords, not * in pixels (we'll compute pixels). */ - int rightEdge; /* X-coordinate of right edge of text, + int rightEdge /* X-coordinate of right edge of text, * specified in pixels. */ +) { register Tk_Window tkwin = intervalPtr->tkwin; int y, dummy, length; @@ -1008,9 +1015,10 @@ DisplayVerticalValue(intervalPtr, value, rightEdge) *-------------------------------------------------------------- */ -static void -DisplayHorizontalInterval(clientData) - ClientData clientData; /* Information about widget. */ +static void +DisplayHorizontalInterval ( + ClientData clientData /* Information about widget. */ +) { register Interval *intervalPtr = (Interval *) clientData; register Tk_Window tkwin = intervalPtr->tkwin; @@ -1165,15 +1173,16 @@ DisplayHorizontalInterval(clientData) *---------------------------------------------------------------------- */ -static void -DisplayHorizontalValue(intervalPtr, value, bottom) - register Interval *intervalPtr; /* Information about widget in which to +static void +DisplayHorizontalValue ( + register Interval *intervalPtr, /* Information about widget in which to * display value. */ - int value; /* Y-coordinate of number to display, + int value, /* Y-coordinate of number to display, * specified in application coords, not * in pixels (we'll compute pixels). */ - int bottom; /* Y-coordinate of bottom edge of text, + int bottom /* Y-coordinate of bottom edge of text, * specified in pixels. */ +) { register Tk_Window tkwin = intervalPtr->tkwin; int x, y, dummy, length; @@ -1220,11 +1229,13 @@ DisplayHorizontalValue(intervalPtr, value, bottom) *---------------------------------------------------------------------- */ -static int -PixelToValue(intervalPtr, x, y) - register Interval *intervalPtr; /* Information about widget. */ - int x, y; /* Coordinates of point within +static int +PixelToValue ( + register Interval *intervalPtr, /* Information about widget. */ + int x, + int y /* Coordinates of point within * window. */ +) { int value, pixelRange; @@ -1288,10 +1299,11 @@ PixelToValue(intervalPtr, x, y) *---------------------------------------------------------------------- */ -static int -ValueToPixel(intervalPtr, value) - register Interval *intervalPtr; /* Information about widget. */ - int value; /* Reading of the widget. */ +static int +ValueToPixel ( + register Interval *intervalPtr, /* Information about widget. */ + int value /* Reading of the widget. */ +) { int y, pixelRange, valueRange; @@ -1328,10 +1340,11 @@ ValueToPixel(intervalPtr, value) *-------------------------------------------------------------- */ -static void -IntervalEventProc(clientData, eventPtr) - ClientData clientData; /* Information about window. */ - XEvent *eventPtr; /* Information about event. */ +static void +IntervalEventProc ( + ClientData clientData, /* Information about window. */ + XEvent *eventPtr /* Information about event. */ +) { Interval *intervalPtr = (Interval *) clientData; @@ -1374,10 +1387,11 @@ IntervalEventProc(clientData, eventPtr) *-------------------------------------------------------------- */ -static void -IntervalMouseProc(clientData, eventPtr) - ClientData clientData; /* Information about window. */ - register XEvent *eventPtr; /* Information about event. */ +static void +IntervalMouseProc ( + ClientData clientData, /* Information about window. */ + register XEvent *eventPtr /* Information about event. */ +) { register Interval *intervalPtr = (Interval *) clientData; @@ -1434,11 +1448,12 @@ IntervalMouseProc(clientData, eventPtr) *-------------------------------------------------------------- */ -static void -StartTrackInterval(intervalPtr, value) - register Interval *intervalPtr; /* Info about widget. */ - int value; /* New value for interval. Gets +static void +StartTrackInterval ( + register Interval *intervalPtr, /* Info about widget. */ + int value /* New value for interval. Gets * adjusted if it's off the interval. */ +) { if ((value < intervalPtr->fromValue) ^ (intervalPtr->toValue < intervalPtr->fromValue)) { @@ -1461,10 +1476,11 @@ StartTrackInterval(intervalPtr, value) } -static void -TrackInterval(intervalPtr, value) - register Interval *intervalPtr; /* Info about widget. */ - int value; +static void +TrackInterval ( + register Interval *intervalPtr, /* Info about widget. */ + int value +) { int min, max, delta, lastmin, lastmax; @@ -1504,9 +1520,12 @@ TrackInterval(intervalPtr, value) static void -SetInterval(intervalPtr, min, max, notify) - register Interval *intervalPtr; /* Info about widget. */ - int min, max, notify; +SetInterval( + register Interval *intervalPtr, /* Info about widget. */ + int min, + int max, + int notify +) { if (min > max) { int temp = min; @@ -1580,11 +1599,12 @@ NotifyInterval(register Interval *intervalPtr) *-------------------------------------------------------------- */ -static void -EventuallyRedrawInterval(intervalPtr, what) - register Interval *intervalPtr; /* Information about widget. */ - int what; /* What to redraw: REDRAW_SLIDER +static void +EventuallyRedrawInterval ( + register Interval *intervalPtr, /* Information about widget. */ + int what /* What to redraw: REDRAW_SLIDER * or REDRAW_ALL. */ +) { if ((what == 0) || (intervalPtr->tkwin == NULL) || !Tk_IsMapped(intervalPtr->tkwin)) { diff --git a/src/sim/w_map.c b/src/sim/w_map.c index 2157088..118babf 100644 --- a/src/sim/w_map.c +++ b/src/sim/w_map.c @@ -298,7 +298,7 @@ map_command_init(void) extern int TileViewCmd(CLIENT_ARGS); Tcl_CreateCommand(tk_mainInterp, "mapview", TileViewCmd, - (ClientData)MainWindow, (void (*)()) NULL); + (ClientData)MainWindow, (void (*)(int *)) NULL); Tcl_InitHashTable(&MapCmds, TCL_STRING_KEYS); @@ -322,14 +322,14 @@ DoMapCmd(CLIENT_ARGS) SimView *view = (SimView *) clientData; Tcl_HashEntry *ent; int result = TCL_OK; - int (*cmd)(); + int (*cmd)(SimView*, Tcl_Interp*, int, char**); if (argc < 2) { return TCL_ERROR; } if ((ent = Tcl_FindHashEntry(&MapCmds, argv[1]))) { - cmd = (int (*)())ent->clientData; + cmd = (int (*)(SimView*, Tcl_Interp*, int, char**))ent->clientData; Tk_Preserve((ClientData) view); result = cmd(view, interp, argc, argv); Tk_Release((ClientData) view); diff --git a/src/sim/w_piem.c b/src/sim/w_piem.c index 17d302f..34a0f93 100644 --- a/src/sim/w_piem.c +++ b/src/sim/w_piem.c @@ -391,13 +391,14 @@ static int CalcPieMenuItem(PieMenu *menu, int x, int y); *-------------------------------------------------------------- */ -int -Tk_PieMenuCmd(clientData, interp, argc, argv) - ClientData clientData; /* Main window associated with +int +Tk_PieMenuCmd ( + ClientData clientData, /* Main window associated with * interpreter. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { Tk_Window tkwin = (Tk_Window) clientData; Tk_Window new; @@ -478,7 +479,7 @@ Tk_PieMenuCmd(clientData, interp, argc, argv) PointerMotionMask, PieMenuEventProc, (ClientData) menuPtr); Tcl_CreateCommand(interp, Tk_PathName(menuPtr->tkwin), PieMenuWidgetCmd, - (ClientData) menuPtr, (void (*)()) NULL); + (ClientData) menuPtr, (void (*)(int *)) NULL); if (ConfigurePieMenu(interp, menuPtr, argc-2, argv+2, 0) != TCL_OK) { goto error; } @@ -509,12 +510,13 @@ Tk_PieMenuCmd(clientData, interp, argc, argv) *-------------------------------------------------------------- */ -static int -PieMenuWidgetCmd(clientData, interp, argc, argv) - ClientData clientData; /* Information about menu widget. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +static int +PieMenuWidgetCmd ( + ClientData clientData, /* Information about menu widget. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { register PieMenu *menuPtr = (PieMenu *) clientData; register PieMenuEntry *mePtr; @@ -955,9 +957,10 @@ PieMenuWidgetCmd(clientData, interp, argc, argv) *---------------------------------------------------------------------- */ -static void -DestroyPieMenu(clientData) - ClientData clientData; /* Info about menu widget. */ +static void +DestroyPieMenu ( + ClientData clientData /* Info about menu widget. */ +) { register PieMenu *menuPtr = (PieMenu *) clientData; int i; @@ -1015,9 +1018,10 @@ DestroyPieMenu(clientData) *---------------------------------------------------------------------- */ -static void -DestroyPieMenuEntry(clientData) - ClientData clientData; /* Pointer to entry to be freed. */ +static void +DestroyPieMenuEntry ( + ClientData clientData /* Pointer to entry to be freed. */ +) { register PieMenuEntry *mePtr = (PieMenuEntry *) clientData; PieMenu *menuPtr = mePtr->piemenuPtr; @@ -1078,14 +1082,15 @@ DestroyPieMenuEntry(clientData) *---------------------------------------------------------------------- */ -static int -ConfigurePieMenu(interp, menuPtr, argc, argv, flags) - Tcl_Interp *interp; /* Used for error reporting. */ - register PieMenu *menuPtr; /* Information about widget; may or may +static int +ConfigurePieMenu ( + Tcl_Interp *interp, /* Used for error reporting. */ + register PieMenu *menuPtr, /* Information about widget; may or may * not already have values for some fields. */ - int argc; /* Number of valid entries in argv. */ - char **argv; /* Arguments. */ - int flags; /* Flags to pass to Tk_ConfigureWidget. */ + int argc, /* Number of valid entries in argv. */ + char **argv, /* Arguments. */ + int flags /* Flags to pass to Tk_ConfigureWidget. */ +) { XGCValues gcValues; GC newGC; @@ -1173,19 +1178,20 @@ ConfigurePieMenu(interp, menuPtr, argc, argv, flags) *---------------------------------------------------------------------- */ -static int -ConfigurePieMenuEntry(interp, menuPtr, mePtr, index, argc, argv, flags) - Tcl_Interp *interp; /* Used for error reporting. */ - PieMenu *menuPtr; /* Information about whole menu. */ - register PieMenuEntry *mePtr; /* Information about menu entry; may +static int +ConfigurePieMenuEntry ( + Tcl_Interp *interp, /* Used for error reporting. */ + PieMenu *menuPtr, /* Information about whole menu. */ + register PieMenuEntry *mePtr, /* Information about menu entry; may * or may not already have values for * some fields. */ - int index; /* Index of mePtr within menuPtr's + int index, /* Index of mePtr within menuPtr's * entries. */ - int argc; /* Number of valid entries in argv. */ - char **argv; /* Arguments. */ - int flags; /* Additional flags to pass to + int argc, /* Number of valid entries in argv. */ + char **argv, /* Arguments. */ + int flags /* Additional flags to pass to * Tk_ConfigureWidget. */ +) { XGCValues gcValues; GC newGC, newActiveGC; @@ -1302,9 +1308,10 @@ ConfigurePieMenuEntry(interp, menuPtr, mePtr, index, argc, argv, flags) *-------------------------------------------------------------- */ -static void -ComputePieMenuGeometry(clientData) - ClientData clientData; /* Structure describing menu. */ +static void +ComputePieMenuGeometry ( + ClientData clientData /* Structure describing menu. */ +) { PieMenu *menuPtr = (PieMenu *) clientData; @@ -1348,9 +1355,10 @@ ComputePieMenuGeometry(clientData) *---------------------------------------------------------------------- */ -static void -DisplayPieMenu(clientData) - ClientData clientData; /* Information about widget. */ +static void +DisplayPieMenu ( + ClientData clientData /* Information about widget. */ +) { register PieMenu *menuPtr = (PieMenu *) clientData; register Tk_Window tkwin = menuPtr->tkwin; @@ -1412,9 +1420,10 @@ DisplayPieMenu(clientData) *---------------------------------------------------------------------- */ -static void -UpdatePieMenu(clientData) - ClientData clientData; /* Information about widget. */ +static void +UpdatePieMenu ( + ClientData clientData /* Information about widget. */ +) { register PieMenu *menuPtr = (PieMenu *) clientData; @@ -1511,14 +1520,15 @@ UpdatePieMenuEntries(PieMenu *menuPtr) *-------------------------------------------------------------- */ -static int -GetPieMenuIndex(interp, menuPtr, string, indexPtr) - Tcl_Interp *interp; /* For error messages. */ - PieMenu *menuPtr; /* Menu for which the index is being +static int +GetPieMenuIndex ( + Tcl_Interp *interp, /* For error messages. */ + PieMenu *menuPtr, /* Menu for which the index is being * specified. */ - char *string; /* Specification of an entry in menu. See + char *string, /* Specification of an entry in menu. See * manual entry for valid .*/ - int *indexPtr; /* Where to store converted relief. */ + int *indexPtr /* Where to store converted relief. */ +) { int i; @@ -1596,10 +1606,11 @@ GetPieMenuIndex(interp, menuPtr, string, indexPtr) *-------------------------------------------------------------- */ -static void -PieMenuEventProc(clientData, eventPtr) - ClientData clientData; /* Information about window. */ - XEvent *eventPtr; /* Information about event. */ +static void +PieMenuEventProc ( + ClientData clientData, /* Information about window. */ + XEvent *eventPtr /* Information about event. */ +) { PieMenu *menuPtr = (PieMenu *) clientData; switch (eventPtr->type) { @@ -1663,11 +1674,12 @@ PieMenuEventProc(clientData, eventPtr) *---------------------------------------------------------------------- */ -static void -EventuallyRedrawPieMenu(menuPtr, index) - register PieMenu *menuPtr; /* Information about menu to redraw. */ - int index; /* Which entry to redraw. If -1, then +static void +EventuallyRedrawPieMenu ( + register PieMenu *menuPtr, /* Information about menu to redraw. */ + int index /* Which entry to redraw. If -1, then * all the entries in the menu are redrawn. */ +) { if (menuPtr->tkwin == NULL) { return; @@ -1698,9 +1710,10 @@ EventuallyRedrawPieMenu(menuPtr, index) } -static void -PopupPieMenu(clientData) - ClientData clientData; /* Information about widget. */ +static void +PopupPieMenu ( + ClientData clientData /* Information about widget. */ +) { register PieMenu *menuPtr = (PieMenu *) clientData; @@ -1715,17 +1728,15 @@ PopupPieMenu(clientData) } -static void -NowPopupPieMenu(menuPtr) - register PieMenu *menuPtr; +static void +NowPopupPieMenu (register PieMenu *menuPtr) { PopupPieMenu((ClientData)menuPtr); } -static void -NeverPopupPieMenu(menuPtr) - register PieMenu *menuPtr; +static void +NeverPopupPieMenu (register PieMenu *menuPtr) { if (menuPtr->flags & POPUP_PENDING) { Tk_DeleteTimerHandler(menuPtr->popup_timer_token); @@ -1735,9 +1746,8 @@ NeverPopupPieMenu(menuPtr) } -static void -EventuallyPopupPieMenu(menuPtr) - register PieMenu *menuPtr; +static void +EventuallyPopupPieMenu (register PieMenu *menuPtr) { NeverPopupPieMenu(menuPtr); @@ -1752,9 +1762,8 @@ EventuallyPopupPieMenu(menuPtr) } -static void -DeferPopupPieMenu(menuPtr) - register PieMenu *menuPtr; +static void +DeferPopupPieMenu (register PieMenu *menuPtr) { if (menuPtr->flags & POPUP_PENDING) { EventuallyPopupPieMenu(menuPtr); @@ -1780,11 +1789,12 @@ DeferPopupPieMenu(menuPtr) *-------------------------------------------------------------- */ -static int -UnpostSubPieMenu(interp, menuPtr) - Tcl_Interp *interp; /* Used for invoking sub-commands and +static int +UnpostSubPieMenu ( + Tcl_Interp *interp, /* Used for invoking sub-commands and * reporting errors. */ - register PieMenu *menuPtr; /* Information about menu as a whole. */ + register PieMenu *menuPtr /* Information about menu as a whole. */ +) { int result; @@ -1819,12 +1829,13 @@ UnpostSubPieMenu(interp, menuPtr) *---------------------------------------------------------------------- */ -static int -ActivatePieMenuEntry(menuPtr, index, preview) - register PieMenu *menuPtr; /* Menu in which to activate. */ - int index; /* Index of entry to activate, or +static int +ActivatePieMenuEntry ( + register PieMenu *menuPtr, /* Menu in which to activate. */ + int index, /* Index of entry to activate, or * -1 to deactivate all entries. */ - int preview; /* 1 to execute previewer */ + int preview /* 1 to execute previewer */ +) { register PieMenuEntry *mePtr; int result = TCL_OK; @@ -2295,9 +2306,8 @@ LayoutPieMenu(PieMenu *menu) } -static void -ShapePieMenu(menuPtr) -PieMenu *menuPtr; +static void +ShapePieMenu (PieMenu *menuPtr) { Display *dpy; Window win, shape; diff --git a/src/sim/w_sim.c b/src/sim/w_sim.c index fcfa60f..83a7203 100644 --- a/src/sim/w_sim.c +++ b/src/sim/w_sim.c @@ -1487,14 +1487,14 @@ SimCmd(CLIENT_ARGS) { Tcl_HashEntry *ent; int result = TCL_OK; - int (*cmd)(); + int (*cmd)(Tcl_Interp*, int, char**); if (argc < 2) { return TCL_ERROR; } if ((ent = Tcl_FindHashEntry(&SimCmds, argv[1]))) { - cmd = (int (*)())ent->clientData; + cmd = (int (*)(Tcl_Interp*, int, char**))ent->clientData; result = cmd(interp, argc, argv); } else { result = TCL_ERROR; @@ -1507,7 +1507,7 @@ void sim_command_init(void) { Tcl_CreateCommand(tk_mainInterp, "sim", SimCmd, - (ClientData)MainWindow, (void (*)()) NULL); + (ClientData)MainWindow, (void (*)(int *)) NULL); Tcl_InitHashTable(&SimCmds, TCL_STRING_KEYS); diff --git a/src/sim/w_sound.c b/src/sim/w_sound.c index a903ae7..91165a8 100644 --- a/src/sim/w_sound.c +++ b/src/sim/w_sound.c @@ -387,7 +387,7 @@ void sound_command_init(void) { Tcl_CreateCommand(tk_mainInterp, "playsound", SoundCmd, - (ClientData)NULL, (void (*)()) NULL); + (ClientData)NULL, (void (*)(int *)) NULL); Tcl_CreateCommand(tk_mainInterp, "stopdozer", DozerCmd, - (ClientData)NULL, (void (*)()) NULL); + (ClientData)NULL, (void (*)(int *)) NULL); } diff --git a/src/sim/w_sprite.c b/src/sim/w_sprite.c index c8837d5..bbd0640 100644 --- a/src/sim/w_sprite.c +++ b/src/sim/w_sprite.c @@ -120,14 +120,14 @@ DoSpriteCmd(CLIENT_ARGS) SimSprite *sprite = (SimSprite *) clientData; Tcl_HashEntry *ent; int result = TCL_OK; - int (*cmd)(); + int (*cmd)(SimSprite*, Tcl_Interp*, int, char**); if (argc < 2) { return TCL_ERROR; } if ((ent = Tcl_FindHashEntry(&SpriteCmds, argv[1]))) { - cmd = (int (*)())ent->clientData; + cmd = (int (*)(SimSprite*, Tcl_Interp*, int, char**))ent->clientData; Tk_Preserve((ClientData) sprite); result = cmd(sprite, interp, argc, argv); Tk_Release((ClientData) sprite); @@ -156,7 +156,7 @@ SpriteCmd(CLIENT_ARGS) sprite->frame = 0; Tcl_CreateCommand(interp, sprite->name, - DoSpriteCmd, (ClientData) sprite, (void (*)()) NULL); + DoSpriteCmd, (ClientData) sprite, (void (*)(int *)) NULL); interp->result = sprite->name; return TCL_OK; @@ -221,7 +221,7 @@ sprite_command_init(void) int i; Tcl_CreateCommand(tk_mainInterp, "sprite", SpriteCmd, - (ClientData)NULL, (void (*)()) NULL); + (ClientData)NULL, (void (*)(int *)) NULL); Tcl_InitHashTable(&SpriteCmds, TCL_STRING_KEYS); diff --git a/src/sim/w_stubs.c b/src/sim/w_stubs.c index 9f4040a..3c8a613 100644 --- a/src/sim/w_stubs.c +++ b/src/sim/w_stubs.c @@ -115,8 +115,7 @@ QUAD TickCount(void) Ptr -NewPtr(size) -int size; +NewPtr(int size) { return ((Ptr)calloc(size, sizeof(Byte))); } diff --git a/src/sim/w_tk.c b/src/sim/w_tk.c index 3ae9037..991a201 100644 --- a/src/sim/w_tk.c +++ b/src/sim/w_tk.c @@ -114,8 +114,8 @@ int DoMapCmd(CLIENT_ARGS); int GraphViewCmd(CLIENT_ARGS); int DoGraphCmd(CLIENT_ARGS); int SpriteCmd(CLIENT_ARGS); -extern int Tk_PieMenuCmd(); -extern int Tk_IntervalCmd(); +extern int Tk_PieMenuCmd(CLIENT_ARGS); +extern int Tk_IntervalCmd(CLIENT_ARGS); int @@ -163,7 +163,7 @@ TileViewCmd(CLIENT_ARGS) PointerMotionMask, TileViewEventProc, (ClientData) view); Tcl_CreateCommand(interp, Tk_PathName(view->tkwin), - DoEditorCmd, (ClientData) view, (void (*)()) NULL); + DoEditorCmd, (ClientData) view, (void (*)(int *)) NULL); } else { Tk_SetClass(view->tkwin, "MapView"); @@ -176,7 +176,7 @@ TileViewCmd(CLIENT_ARGS) PointerMotionMask */ , TileViewEventProc, (ClientData) view); Tcl_CreateCommand(interp, Tk_PathName(view->tkwin), - DoMapCmd, (ClientData) view, (void (*)()) NULL); + DoMapCmd, (ClientData) view, (void (*)(int *)) NULL); } Tk_MakeWindowExist(view->tkwin); @@ -703,7 +703,7 @@ DoEarthQuake(void) if (earthquake_timer_set) { Tk_DeleteTimerHandler(earthquake_timer_token); } - Tk_CreateTimerHandler(earthquake_delay, (void (*)())StopEarthquake, (ClientData) 0); + Tk_CreateTimerHandler(earthquake_delay, (void (*)(int *))StopEarthquake, (ClientData) 0); earthquake_timer_set = 1; } @@ -787,9 +787,9 @@ void tk_main(void) #endif Tcl_CreateCommand(tk_mainInterp, "piemenu", Tk_PieMenuCmd, - (ClientData)MainWindow, (void (*)()) NULL); + (ClientData)MainWindow, (void (*)(int *)) NULL); Tcl_CreateCommand(tk_mainInterp, "interval", Tk_IntervalCmd, - (ClientData)MainWindow, (void (*)()) NULL); + (ClientData)MainWindow, (void (*)(int *)) NULL); sim = MakeNewSim(); diff --git a/src/sim/w_x.c b/src/sim/w_x.c index 336a425..82ff0a2 100644 --- a/src/sim/w_x.c +++ b/src/sim/w_x.c @@ -918,7 +918,7 @@ DoResizeView(SimView *view, int w, int h) view->shminfo->shmaddr = (char *)view->data; view->shminfo->readOnly = False; - { int (*old)(); + { int (*old)(Display *, XErrorEvent *); int result; int attached = 0; GotXError = 0; diff --git a/src/tcl/panic.c b/src/tcl/panic.c index abd515a..eb8cddc 100644 --- a/src/tcl/panic.c +++ b/src/tcl/panic.c @@ -21,6 +21,7 @@ static char rcsid[] = "$Header: /user6/ouster/tcl/RCS/panic.c,v 1.3 91/10/10 11: #include #include +#include /* *---------------------------------------------------------------------- @@ -40,15 +41,40 @@ static char rcsid[] = "$Header: /user6/ouster/tcl/RCS/panic.c,v 1.3 91/10/10 11: /* VARARGS ARGSUSED */ void -panic(format, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) - char *format; /* Format string, suitable for passing to +panicVA( + char *format, /* Format string, suitable for passing to * fprintf. */ + va_list argList /* Variable argument list. */ +) +{ char *arg1, *arg2, *arg3; /* Additional arguments (variable in number) * to pass to fprintf. */ char *arg4, *arg5, *arg6, *arg7, *arg8; -{ + + arg1 = va_arg(argList, char *); + arg2 = va_arg(argList, char *); + arg3 = va_arg(argList, char *); + arg4 = va_arg(argList, char *); + arg5 = va_arg(argList, char *); + arg6 = va_arg(argList, char *); + arg7 = va_arg(argList, char *); + arg8 = va_arg(argList, char *); + (void) fprintf(stderr, format, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); (void) fflush(stderr); abort(); } + +void +panic( + char *format, /* Format string, suitable for passing to + * fprintf. */ + ... +) +{ + va_list argList; + + va_start(argList, format); + panicVA(format, argList); +} diff --git a/src/tcl/regexp.c b/src/tcl/regexp.c index d5b248c..d28800d 100644 --- a/src/tcl/regexp.c +++ b/src/tcl/regexp.c @@ -165,16 +165,16 @@ static long regsize; /* Code size. */ #ifndef STATIC #define STATIC static #endif -STATIC char *reg(); -STATIC char *regbranch(); -STATIC char *regpiece(); -STATIC char *regatom(); -STATIC char *regnode(); -STATIC char *regnext(); -STATIC void regc(); -STATIC void reginsert(); -STATIC void regtail(); -STATIC void regoptail(); +STATIC char *reg(int paren, int *flagp); +STATIC char *regbranch(int *flagp); +STATIC char *regpiece(int *flagp); +STATIC char *regatom(int *flagp); +STATIC char *regnode(int op); +STATIC char *regnext(register char *p); +STATIC void regc(int b); +STATIC void reginsert(int op, char *opnd); +STATIC void regtail(char *p, char *val); +STATIC void regoptail(char *p, char *val); #ifdef STRCSPN STATIC int strcspn(); #endif @@ -195,8 +195,7 @@ STATIC int strcspn(); * of the structure of the compiled regexp. */ regexp * -regcomp(exp) -char *exp; +regcomp (char *exp) { register regexp *r; register char *scan; @@ -282,9 +281,10 @@ char *exp; * follows makes it hard to avoid. */ static char * -reg(paren, flagp) -int paren; /* Parenthesized? */ -int *flagp; +reg ( + int paren, /* Parenthesized? */ + int *flagp +) { register char *ret; register char *br; @@ -354,8 +354,7 @@ int *flagp; * Implements the concatenation operator. */ static char * -regbranch(flagp) -int *flagp; +regbranch (int *flagp) { register char *ret; register char *chain; @@ -393,8 +392,7 @@ int *flagp; * endmarker role is not redundant. */ static char * -regpiece(flagp) -int *flagp; +regpiece (int *flagp) { register char *ret; register char op; @@ -457,8 +455,7 @@ int *flagp; * separate node; the code is simpler that way and it's not worth fixing. */ static char * -regatom(flagp) -int *flagp; +regatom (int *flagp) { register char *ret; int flags; @@ -567,9 +564,8 @@ int *flagp; /* - regnode - emit a node */ -static char * /* Location. */ -regnode(op) -char op; +static char * +regnode (int op) { register char *ret; register char *ptr; @@ -592,9 +588,8 @@ char op; /* - regc - emit (if appropriate) a byte of code */ -static void -regc(b) -char b; +static void +regc (int b) { if (regcode != ®dummy) *regcode++ = b; @@ -607,10 +602,8 @@ char b; * * Means relocating the operand. */ -static void -reginsert(op, opnd) -char op; -char *opnd; +static void +reginsert (int op, char *opnd) { register char *src; register char *dst; @@ -636,10 +629,8 @@ char *opnd; /* - regtail - set the next-pointer at the end of a node chain */ -static void -regtail(p, val) -char *p; -char *val; +static void +regtail (char *p, char *val) { register char *scan; register char *temp; @@ -668,10 +659,8 @@ char *val; /* - regoptail - regtail on operand of first argument; nop if operandless */ -static void -regoptail(p, val) -char *p; -char *val; +static void +regoptail (char *p, char *val) { /* "Operandless" and "op != BRANCH" are synonymous in practice. */ if (p == NULL || p == ®dummy || OP(p) != BRANCH) @@ -694,9 +683,9 @@ static char **regendp; /* Ditto for endp. */ /* * Forwards. */ -STATIC int regtry(); -STATIC int regmatch(); -STATIC int regrepeat(); +STATIC int regtry(regexp *prog, char *string); +STATIC int regmatch(char *prog); +STATIC int regrepeat(char *p); #ifdef DEBUG int regnarrate = 0; @@ -707,10 +696,8 @@ STATIC char *regprop(); /* - regexec - match a regexp against a string */ -int -regexec(prog, string) -register regexp *prog; -register char *string; +int +regexec (register regexp *prog, register char *string) { register char *s; #ifndef IS_LINUX @@ -772,9 +759,7 @@ register char *string; - regtry - try match at specific point */ static int /* 0 failure, 1 success */ -regtry(prog, string) -regexp *prog; -char *string; +regtry(regexp *prog, char *string) { register int i; register char **sp; @@ -809,8 +794,7 @@ char *string; * by recursion. */ static int /* 0 failure, 1 success */ -regmatch(prog) -char *prog; +regmatch(char *prog) { register char *scan; /* Current node. */ char *next; /* Next node. */ @@ -1005,8 +989,7 @@ char *prog; - regrepeat - repeatedly match something simple, report how many */ static int -regrepeat(p) -char *p; +regrepeat(char *p) { register int count = 0; register char *scan; @@ -1051,8 +1034,7 @@ char *p; - regnext - dig the "next" pointer out of a node */ static char * -regnext(p) -register char *p; +regnext (register char *p) { register int offset; @@ -1076,9 +1058,8 @@ STATIC char *regprop(); /* - regdump - dump a regexp onto stdout in vaguely comprehensible form */ -void -regdump(r) -regexp *r; +void +regdump (regexp *r) { register char *s; register char op = EXACTLY; /* Arbitrary non-END op. */ @@ -1121,8 +1102,7 @@ regexp *r; - regprop - printable representation of opcode */ static char * -regprop(op) -char *op; +regprop (char *op) { register char *p; static char buf[50]; @@ -1212,10 +1192,8 @@ char *op; * of characters not from s2 */ -static int -strcspn(s1, s2) -char *s1; -char *s2; +static int +strcspn (char *s1, char *s2) { register char *scan1; register char *scan2; diff --git a/src/tcl/tclassem.c b/src/tcl/tclassem.c index ed70991..d444abf 100644 --- a/src/tcl/tclassem.c +++ b/src/tcl/tclassem.c @@ -62,8 +62,8 @@ typedef struct { *---------------------------------------------------------------------- */ -Tcl_CmdBuf -Tcl_CreateCmdBuf() +Tcl_CmdBuf +Tcl_CreateCmdBuf (void) { register CmdBuf *cbPtr; @@ -92,10 +92,11 @@ Tcl_CreateCmdBuf() *---------------------------------------------------------------------- */ -void -Tcl_DeleteCmdBuf(buffer) - Tcl_CmdBuf buffer; /* Token for command buffer (return value +void +Tcl_DeleteCmdBuf ( + Tcl_CmdBuf buffer /* Token for command buffer (return value * from previous call to Tcl_CreateCmdBuf). */ +) { register CmdBuf *cbPtr = (CmdBuf *) buffer; @@ -131,15 +132,16 @@ Tcl_DeleteCmdBuf(buffer) */ char * -Tcl_AssembleCmd(buffer, string) - Tcl_CmdBuf buffer; /* Token for a command buffer previously +Tcl_AssembleCmd ( + Tcl_CmdBuf buffer, /* Token for a command buffer previously * created by Tcl_CreateCmdBuf. */ - char *string; /* Bytes to be appended to command stream. + char *string /* Bytes to be appended to command stream. * Note: if the string is zero length, * then whatever is buffered will be * considered to be a complete command * regardless of whether parentheses are * matched or not. */ +) { register CmdBuf *cbPtr = (CmdBuf *) buffer; int length, totalLength; diff --git a/src/tcl/tclbasic.c b/src/tcl/tclbasic.c index 90a656d..4cbcfe9 100644 --- a/src/tcl/tclbasic.c +++ b/src/tcl/tclbasic.c @@ -128,7 +128,7 @@ static CmdInfo builtInCmds[] = { */ Tcl_Interp * -Tcl_CreateInterp() +Tcl_CreateInterp (void) { register Interp *iPtr; register Command *cmdPtr; @@ -216,10 +216,11 @@ Tcl_CreateInterp() *---------------------------------------------------------------------- */ -void -Tcl_DeleteInterp(interp) - Tcl_Interp *interp; /* Token for command interpreter (returned +void +Tcl_DeleteInterp ( + Tcl_Interp *interp /* Token for command interpreter (returned * by a previous call to Tcl_CreateInterp). */ +) { Interp *iPtr = (Interp *) interp; Tcl_HashEntry *hPtr; @@ -329,16 +330,17 @@ Tcl_DeleteInterp(interp) */ void -Tcl_CreateCommand(interp, cmdName, proc, clientData, deleteProc) - Tcl_Interp *interp; /* Token for command interpreter (returned +Tcl_CreateCommand( + Tcl_Interp *interp, /* Token for command interpreter (returned * by a previous call to Tcl_CreateInterp). */ - char *cmdName; /* Name of command. */ - Tcl_CmdProc *proc; /* Command procedure to associate with + char *cmdName, /* Name of command. */ + Tcl_CmdProc *proc, /* Command procedure to associate with * cmdName. */ - ClientData clientData; /* Arbitrary one-word value to pass to proc. */ - Tcl_CmdDeleteProc *deleteProc; + ClientData clientData, /* Arbitrary one-word value to pass to proc. */ + Tcl_CmdDeleteProc *deleteProc /* If not NULL, gives a procedure to call when * this command is deleted. */ +) { Interp *iPtr = (Interp *) interp; register Command *cmdPtr; @@ -383,11 +385,12 @@ Tcl_CreateCommand(interp, cmdName, proc, clientData, deleteProc) *---------------------------------------------------------------------- */ -int -Tcl_DeleteCommand(interp, cmdName) - Tcl_Interp *interp; /* Token for command interpreter (returned +int +Tcl_DeleteCommand ( + Tcl_Interp *interp, /* Token for command interpreter (returned * by a previous call to Tcl_CreateInterp). */ - char *cmdName; /* Name of command to remove. */ + char *cmdName /* Name of command to remove. */ +) { Interp *iPtr = (Interp *) interp; Tcl_HashEntry *hPtr; @@ -428,17 +431,18 @@ Tcl_DeleteCommand(interp, cmdName) *----------------------------------------------------------------- */ -int -Tcl_Eval(interp, cmd, flags, termPtr) - Tcl_Interp *interp; /* Token for command interpreter (returned +int +Tcl_Eval ( + Tcl_Interp *interp, /* Token for command interpreter (returned * by a previous call to Tcl_CreateInterp). */ - char *cmd; /* Pointer to TCL command to interpret. */ - int flags; /* OR-ed combination of flags like + char *cmd, /* Pointer to TCL command to interpret. */ + int flags, /* OR-ed combination of flags like * TCL_BRACKET_TERM and TCL_RECORD_BOUNDS. */ - char **termPtr; /* If non-NULL, fill in the address it points + char **termPtr /* If non-NULL, fill in the address it points * to with the address of the char. just after * the last one that was part of cmd. See * the man page for details on this. */ +) { /* * The storage immediately below is used to generate a copy @@ -840,13 +844,14 @@ Tcl_Eval(interp, cmd, flags, termPtr) */ Tcl_Trace -Tcl_CreateTrace(interp, level, proc, clientData) - Tcl_Interp *interp; /* Interpreter in which to create the trace. */ - int level; /* Only call proc for commands at nesting level +Tcl_CreateTrace( + Tcl_Interp *interp, /* Interpreter in which to create the trace. */ + int level, /* Only call proc for commands at nesting level * <= level (1 => top level). */ - Tcl_CmdTraceProc *proc; /* Procedure to call before executing each + Tcl_CmdTraceProc *proc, /* Procedure to call before executing each * command. */ - ClientData clientData; /* Arbitrary one-word value to pass to proc. */ + ClientData clientData /* Arbitrary one-word value to pass to proc. */ +) { register Trace *tracePtr; register Interp *iPtr = (Interp *) interp; @@ -878,11 +883,12 @@ Tcl_CreateTrace(interp, level, proc, clientData) *---------------------------------------------------------------------- */ -void -Tcl_DeleteTrace(interp, trace) - Tcl_Interp *interp; /* Interpreter that contains trace. */ - Tcl_Trace trace; /* Token for trace (returned previously by +void +Tcl_DeleteTrace ( + Tcl_Interp *interp, /* Interpreter that contains trace. */ + Tcl_Trace trace /* Token for trace (returned previously by * Tcl_CreateTrace). */ +) { register Interp *iPtr = (Interp *) interp; register Trace *tracePtr = (Trace *) trace; @@ -922,11 +928,12 @@ Tcl_DeleteTrace(interp, trace) *---------------------------------------------------------------------- */ -void -Tcl_AddErrorInfo(interp, message) - Tcl_Interp *interp; /* Interpreter to which error information +void +Tcl_AddErrorInfo ( + Tcl_Interp *interp, /* Interpreter to which error information * pertains. */ - char *message; /* Message to record. */ + char *message /* Message to record. */ +) { register Interp *iPtr = (Interp *) interp; @@ -1046,10 +1053,11 @@ Tcl_VarEval(Tcl_Interp *interp, ...) *---------------------------------------------------------------------- */ -int -Tcl_GlobalEval(interp, command) - Tcl_Interp *interp; /* Interpreter in which to evaluate command. */ - char *command; /* Command to evaluate. */ +int +Tcl_GlobalEval ( + Tcl_Interp *interp, /* Interpreter in which to evaluate command. */ + char *command /* Command to evaluate. */ +) { register Interp *iPtr = (Interp *) interp; int result; diff --git a/src/tcl/tclckall.c b/src/tcl/tclckall.c index 037d42d..2afb57d 100644 --- a/src/tcl/tclckall.c +++ b/src/tcl/tclckall.c @@ -69,9 +69,8 @@ static int init_malloced_bodies = FALSE; * *---------------------------------------------------------------------- */ -static void -dump_memory_info(outFile) - FILE *outFile; +static void +dump_memory_info (FILE *outFile) { fprintf(outFile,"total mallocs %10d\n", total_mallocs); @@ -95,12 +94,8 @@ dump_memory_info(outFile) * *---------------------------------------------------------------------- */ -static void -ValidateMemory (memHeaderP, file, line, nukeGuards) - struct mem_header *memHeaderP; - char *file; - int line; - int nukeGuards; +static void +ValidateMemory (struct mem_header *memHeaderP, char *file, int line, int nukeGuards) { unsigned char *hiPtr; int idx; @@ -158,10 +153,8 @@ ValidateMemory (memHeaderP, file, line, nukeGuards) * *---------------------------------------------------------------------- */ -void -Tcl_ValidateAllMemory (file, line) - char *file; - int line; +void +Tcl_ValidateAllMemory (char *file, int line) { struct mem_header *memScanP; @@ -181,9 +174,8 @@ Tcl_ValidateAllMemory (file, line) * will have the file error number left in it. *---------------------------------------------------------------------- */ -int -Tcl_DumpActiveMemory (fileName) - char *fileName; +int +Tcl_DumpActiveMemory (char *fileName) { FILE *fileP; struct mem_header *memScanP; @@ -226,10 +218,7 @@ Tcl_DumpActiveMemory (fileName) *---------------------------------------------------------------------- */ char * -Tcl_DbCkalloc(size, file, line) - unsigned int size; - char *file; - int line; +Tcl_DbCkalloc (unsigned int size, char *file, int line) { struct mem_header *result; @@ -315,11 +304,8 @@ Tcl_DbCkalloc(size, file, line) *---------------------------------------------------------------------- */ -int -Tcl_DbCkfree(ptr, file, line) - char * ptr; - char *file; - int line; +int +Tcl_DbCkfree (char *ptr, char *file, int line) { struct mem_header *memp = 0; /* Must be zero for size calc */ @@ -372,12 +358,8 @@ Tcl_DbCkfree(ptr, file, line) *---------------------------------------------------------------------- */ /* ARGSUSED */ -static int -MemoryCmd (clientData, interp, argc, argv) - char *clientData; - Tcl_Interp *interp; - int argc; - char **argv; +static int +MemoryCmd (char *clientData, Tcl_Interp *interp, int argc, char **argv) { char *fileName; @@ -465,9 +447,8 @@ bad_suboption: * *---------------------------------------------------------------------- */ -void -Tcl_InitMemory(interp) - Tcl_Interp *interp; +void +Tcl_InitMemory (Tcl_Interp *interp) { Tcl_CreateCommand (interp, "memory", MemoryCmd, (ClientData)NULL, (void (*)())NULL); @@ -486,8 +467,7 @@ Tcl_CreateCommand (interp, "memory", MemoryCmd, (ClientData)NULL, *---------------------------------------------------------------------- */ VOID * -Tcl_Ckalloc (size) - unsigned int size; +Tcl_Ckalloc (unsigned int size) { char *result; @@ -507,9 +487,8 @@ Tcl_Ckalloc (size) * *---------------------------------------------------------------------- */ -void -Tcl_Ckfree (ptr) - VOID *ptr; +void +Tcl_Ckfree (VOID *ptr) { free (ptr); } @@ -524,9 +503,8 @@ Tcl_Ckfree (ptr) *---------------------------------------------------------------------- */ /* ARGSUSED */ -void -Tcl_InitMemory(interp) - Tcl_Interp *interp; +void +Tcl_InitMemory (Tcl_Interp *interp) { } diff --git a/src/tcl/tclcmdah.c b/src/tcl/tclcmdah.c index d1bf65f..3cbb8fd 100644 --- a/src/tcl/tclcmdah.c +++ b/src/tcl/tclcmdah.c @@ -40,12 +40,13 @@ static char rcsid[] = "$Header: /user6/ouster/tcl/RCS/tclCmdAH.c,v 1.76 92/07/06 */ /* ARGSUSED */ -int -Tcl_BreakCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_BreakCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { if (argc != 1) { Tcl_AppendResult(interp, "wrong # args: should be \"", @@ -73,12 +74,13 @@ Tcl_BreakCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_CaseCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_CaseCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { int i, result; int body; @@ -213,12 +215,13 @@ Tcl_CaseCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_CatchCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_CatchCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { int result; @@ -258,12 +261,13 @@ Tcl_CatchCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_ConcatCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_ConcatCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { if (argc == 1) { Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], @@ -294,12 +298,13 @@ Tcl_ConcatCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_ContinueCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_ContinueCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { if (argc != 1) { Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], @@ -327,12 +332,13 @@ Tcl_ContinueCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_ErrorCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_ErrorCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { Interp *iPtr = (Interp *) interp; @@ -372,12 +378,13 @@ Tcl_ErrorCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_EvalCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_EvalCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { int result; char *cmd; @@ -426,12 +433,13 @@ Tcl_EvalCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_ExprCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_ExprCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { if (argc != 2) { Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], @@ -460,12 +468,13 @@ Tcl_ExprCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_ForCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_ForCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { int result, value; @@ -538,12 +547,13 @@ Tcl_ForCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_ForeachCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_ForeachCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { int listArgc, i, result; char **listArgv; @@ -613,12 +623,13 @@ Tcl_ForeachCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_FormatCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_FormatCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { register char *format; /* Used to read characters from the format * string. */ diff --git a/src/tcl/tclcmdil.c b/src/tcl/tclcmdil.c index d7e9bdc..11d75d4 100644 --- a/src/tcl/tclcmdil.c +++ b/src/tcl/tclcmdil.c @@ -53,12 +53,13 @@ static int SortCompareProc _ANSI_ARGS_((CONST VOID *first, */ /* ARGSUSED */ -int -Tcl_IfCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_IfCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { char *condition, *ifPart, *elsePart, *cmd, *name; char *clause; @@ -142,12 +143,13 @@ Tcl_IfCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_IncrCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_IncrCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { int value; char *oldString, *result; @@ -207,12 +209,13 @@ Tcl_IncrCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_InfoCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_InfoCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { register Interp *iPtr = (Interp *) interp; int length; @@ -567,12 +570,13 @@ Tcl_InfoCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_JoinCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_JoinCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { char *joinString; char **listArgv; @@ -620,12 +624,13 @@ Tcl_JoinCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_LindexCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_LindexCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { char *p, *element; int index, size, parenthesized, result; @@ -682,12 +687,13 @@ Tcl_LindexCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_LinsertCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_LinsertCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { char *p, *element, savedChar; int i, index, count, result, size; @@ -767,12 +773,13 @@ Tcl_LinsertCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_ListCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_ListCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { if (argc < 2) { Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], @@ -802,12 +809,13 @@ Tcl_ListCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_LlengthCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_LlengthCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { int count, result; char *element, *p; @@ -849,12 +857,13 @@ Tcl_LlengthCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_LrangeCmd(notUsed, interp, argc, argv) - ClientData notUsed; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_LrangeCmd ( + ClientData notUsed, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { int first, last, result; char *begin, *end, c, *dummy; @@ -941,12 +950,13 @@ Tcl_LrangeCmd(notUsed, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_LreplaceCmd(notUsed, interp, argc, argv) - ClientData notUsed; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_LreplaceCmd ( + ClientData notUsed, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { char *p1, *p2, *element, savedChar, *dummy; int i, first, last, count, result, size; @@ -1062,12 +1072,13 @@ Tcl_LreplaceCmd(notUsed, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_LsearchCmd(notUsed, interp, argc, argv) - ClientData notUsed; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_LsearchCmd ( + ClientData notUsed, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { int listArgc; char **listArgv; @@ -1111,12 +1122,13 @@ Tcl_LsearchCmd(notUsed, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_LsortCmd(notUsed, interp, argc, argv) - ClientData notUsed; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_LsortCmd ( + ClientData notUsed, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { int listArgc; char **listArgv; @@ -1141,9 +1153,11 @@ Tcl_LsortCmd(notUsed, interp, argc, argv) * the proper ordering between two elements. */ -static int -SortCompareProc(first, second) - CONST VOID *first, *second; /* Elements to be compared. */ +static int +SortCompareProc ( + CONST VOID *first, + CONST VOID *second /* Elements to be compared. */ +) { return strcmp(*((char **) first), *((char **) second)); } diff --git a/src/tcl/tclcmdmz.c b/src/tcl/tclcmdmz.c index 92eae5e..a9ef8ff 100644 --- a/src/tcl/tclcmdmz.c +++ b/src/tcl/tclcmdmz.c @@ -63,12 +63,13 @@ static char * TraceVarProc _ANSI_ARGS_((ClientData clientData, */ /* ARGSUSED */ -int -Tcl_RegexpCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_RegexpCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { int noCase = 0; int indices = 0; @@ -204,12 +205,13 @@ Tcl_RegexpCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_RegsubCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_RegsubCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { int noCase = 0, all = 0; regexp *regexpPtr; @@ -432,12 +434,13 @@ Tcl_RegsubCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_RenameCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_RenameCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { register Command *cmdPtr; Interp *iPtr = (Interp *) interp; @@ -494,12 +497,13 @@ Tcl_RenameCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_ReturnCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_ReturnCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { if (argc > 2) { Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], @@ -530,12 +534,13 @@ Tcl_ReturnCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_ScanCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_ScanCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { int arg1Length; /* Number of bytes in argument to be * scanned. This gives an upper limit @@ -761,12 +766,13 @@ Tcl_ScanCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_SplitCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_SplitCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { char *splitChars; register char *p, *p2; @@ -837,12 +843,13 @@ Tcl_SplitCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_StringCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_StringCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { int length; register char *p, c; @@ -1097,12 +1104,13 @@ Tcl_StringCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_TraceCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_TraceCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { char c; int length; @@ -1271,14 +1279,15 @@ Tcl_TraceCmd(dummy, interp, argc, argv) /* ARGSUSED */ static char * -TraceVarProc(clientData, interp, name1, name2, flags) - ClientData clientData; /* Information about the variable trace. */ - Tcl_Interp *interp; /* Interpreter containing variable. */ - char *name1; /* Name of variable or array. */ - char *name2; /* Name of element within array; NULL means +TraceVarProc ( + ClientData clientData, /* Information about the variable trace. */ + Tcl_Interp *interp, /* Interpreter containing variable. */ + char *name1, /* Name of variable or array. */ + char *name2, /* Name of element within array; NULL means * scalar variable is being referenced. */ - int flags; /* OR-ed bits giving operation and other + int flags /* OR-ed bits giving operation and other * information. */ +) { TraceVarInfo *tvarPtr = (TraceVarInfo *) clientData; char *result; @@ -1374,12 +1383,13 @@ TraceVarProc(clientData, interp, name1, name2, flags) */ /* ARGSUSED */ -int -Tcl_WhileCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_WhileCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { int result, value; diff --git a/src/tcl/tclenv.c b/src/tcl/tclenv.c index e850891..35c9650 100644 --- a/src/tcl/tclenv.c +++ b/src/tcl/tclenv.c @@ -84,10 +84,11 @@ void unsetenv_tcl _ANSI_ARGS_((char *name)); *---------------------------------------------------------------------- */ -void -TclSetupEnv(interp) - Tcl_Interp *interp; /* Interpreter whose "env" array is to be +void +TclSetupEnv ( + Tcl_Interp *interp /* Interpreter whose "env" array is to be * managed. */ +) { EnvInterp *eiPtr; int i; @@ -156,13 +157,14 @@ TclSetupEnv(interp) *---------------------------------------------------------------------- */ -static int -FindVariable(name, lengthPtr) - char *name; /* Name of desired environment variable. */ - int *lengthPtr; /* Used to return length of name (for +static int +FindVariable ( + char *name, /* Name of desired environment variable. */ + int *lengthPtr /* Used to return length of name (for * successful searches) or number of non-NULL * entries in environ (for unsuccessful * searches). */ +) { int i; register char *p1, *p2; @@ -199,11 +201,12 @@ FindVariable(name, lengthPtr) *---------------------------------------------------------------------- */ -void -setenv_tcl(name, value) - char *name; /* Name of variable whose value is to be +void +setenv_tcl ( + char *name, /* Name of variable whose value is to be * set. */ - char *value; /* New value for variable. */ + char *value /* New value for variable. */ +) { int index, length, nameLength; char *p; @@ -277,9 +280,10 @@ setenv_tcl(name, value) *---------------------------------------------------------------------- */ -void -unsetenv_tcl(name) - char *name; /* Name of variable to remove. */ +void +unsetenv_tcl ( + char *name /* Name of variable to remove. */ +) { int index, dummy; char **envPtr; @@ -338,14 +342,15 @@ unsetenv_tcl(name) /* ARGSUSED */ static char * -EnvTraceProc(clientData, interp, name1, name2, flags) - ClientData clientData; /* Not used. */ - Tcl_Interp *interp; /* Interpreter whose "env" variable is +EnvTraceProc ( + ClientData clientData, /* Not used. */ + Tcl_Interp *interp, /* Interpreter whose "env" variable is * being modified. */ - char *name1; /* Better be "env". */ - char *name2; /* Name of variable being modified, or + char *name1, /* Better be "env". */ + char *name2, /* Name of variable being modified, or * NULL if whole array is being deleted. */ - int flags; /* Indicates what's happening. */ + int flags /* Indicates what's happening. */ +) { /* * First see if the whole "env" variable is being deleted. If @@ -411,8 +416,8 @@ EnvTraceProc(clientData, interp, name1, name2, flags) *---------------------------------------------------------------------- */ -static void -EnvInit() +static void +EnvInit (void) { char **newEnviron; int i, length; diff --git a/src/tcl/tclexpr.c b/src/tcl/tclexpr.c index 3be04f3..8ba86a7 100644 --- a/src/tcl/tclexpr.c +++ b/src/tcl/tclexpr.c @@ -193,12 +193,13 @@ static int ExprTopLevel _ANSI_ARGS_((Tcl_Interp *interp, *-------------------------------------------------------------- */ -static int -ExprParseString(interp, string, valuePtr) - Tcl_Interp *interp; /* Where to store error message. */ - char *string; /* String to turn into value. */ - Value *valuePtr; /* Where to store value information. +static int +ExprParseString ( + Tcl_Interp *interp, /* Where to store error message. */ + char *string, /* String to turn into value. */ + Value *valuePtr /* Where to store value information. * Caller must have initialized pv field. */ +) { register char c; @@ -284,15 +285,16 @@ ExprParseString(interp, string, valuePtr) *---------------------------------------------------------------------- */ -static int -ExprLex(interp, infoPtr, valuePtr) - Tcl_Interp *interp; /* Interpreter to use for error +static int +ExprLex ( + Tcl_Interp *interp, /* Interpreter to use for error * reporting. */ - register ExprInfo *infoPtr; /* Describes the state of the parse. */ - register Value *valuePtr; /* Where to store value, if that is + register ExprInfo *infoPtr, /* Describes the state of the parse. */ + register Value *valuePtr /* Where to store value, if that is * what's parsed from string. Caller * must have initialized pv field * correctly. */ +) { register char *p, c; char *var, *term; @@ -560,20 +562,21 @@ ExprLex(interp, infoPtr, valuePtr) *---------------------------------------------------------------------- */ -static int -ExprGetValue(interp, infoPtr, prec, valuePtr) - Tcl_Interp *interp; /* Interpreter to use for error +static int +ExprGetValue ( + Tcl_Interp *interp, /* Interpreter to use for error * reporting. */ - register ExprInfo *infoPtr; /* Describes the state of the parse + register ExprInfo *infoPtr, /* Describes the state of the parse * just before the value (i.e. ExprLex * will be called to get first token * of value). */ - int prec; /* Treat any un-parenthesized operator + int prec, /* Treat any un-parenthesized operator * with precedence <= this as the end * of the expression. */ - Value *valuePtr; /* Where to store the value of the + Value *valuePtr /* Where to store the value of the * expression. Caller must have * initialized pv field. */ +) { Interp *iPtr = (Interp *) interp; Value value2; /* Second operand for current @@ -1111,9 +1114,10 @@ ExprGetValue(interp, infoPtr, prec, valuePtr) *-------------------------------------------------------------- */ -static void -ExprMakeString(valuePtr) - register Value *valuePtr; /* Value to be converted. */ +static void +ExprMakeString ( + register Value *valuePtr /* Value to be converted. */ +) { int shortfall; @@ -1152,13 +1156,14 @@ ExprMakeString(valuePtr) *-------------------------------------------------------------- */ -static int -ExprTopLevel(interp, string, valuePtr) - Tcl_Interp *interp; /* Context in which to evaluate the +static int +ExprTopLevel ( + Tcl_Interp *interp, /* Context in which to evaluate the * expression. */ - char *string; /* Expression to evaluate. */ - Value *valuePtr; /* Where to store result. Should + char *string, /* Expression to evaluate. */ + Value *valuePtr /* Where to store result. Should * not be initialized by caller. */ +) { ExprInfo info; int result; @@ -1204,12 +1209,13 @@ ExprTopLevel(interp, string, valuePtr) *-------------------------------------------------------------- */ -int -Tcl_ExprLong(interp, string, ptr) - Tcl_Interp *interp; /* Context in which to evaluate the +int +Tcl_ExprLong ( + Tcl_Interp *interp, /* Context in which to evaluate the * expression. */ - char *string; /* Expression to evaluate. */ - long *ptr; /* Where to store result. */ + char *string, /* Expression to evaluate. */ + long *ptr /* Where to store result. */ +) { Value value; int result; @@ -1231,12 +1237,13 @@ Tcl_ExprLong(interp, string, ptr) return result; } -int -Tcl_ExprDouble(interp, string, ptr) - Tcl_Interp *interp; /* Context in which to evaluate the +int +Tcl_ExprDouble ( + Tcl_Interp *interp, /* Context in which to evaluate the * expression. */ - char *string; /* Expression to evaluate. */ - double *ptr; /* Where to store result. */ + char *string, /* Expression to evaluate. */ + double *ptr /* Where to store result. */ +) { Value value; int result; @@ -1258,12 +1265,13 @@ Tcl_ExprDouble(interp, string, ptr) return result; } -int -Tcl_ExprBoolean(interp, string, ptr) - Tcl_Interp *interp; /* Context in which to evaluate the +int +Tcl_ExprBoolean ( + Tcl_Interp *interp, /* Context in which to evaluate the * expression. */ - char *string; /* Expression to evaluate. */ - int *ptr; /* Where to store 0/1 result. */ + char *string, /* Expression to evaluate. */ + int *ptr /* Where to store 0/1 result. */ +) { Value value; int result; @@ -1304,11 +1312,12 @@ Tcl_ExprBoolean(interp, string, ptr) *-------------------------------------------------------------- */ -int -Tcl_ExprString(interp, string) - Tcl_Interp *interp; /* Context in which to evaluate the +int +Tcl_ExprString ( + Tcl_Interp *interp, /* Context in which to evaluate the * expression. */ - char *string; /* Expression to evaluate. */ + char *string /* Expression to evaluate. */ +) { Value value; int result; diff --git a/src/tcl/tclget.c b/src/tcl/tclget.c index 175f406..480b072 100644 --- a/src/tcl/tclget.c +++ b/src/tcl/tclget.c @@ -40,12 +40,13 @@ static char rcsid[] = "$Header: /user6/ouster/tcl/RCS/tclGet.c,v 1.11 92/02/29 1 *---------------------------------------------------------------------- */ -int -Tcl_GetInt(interp, string, intPtr) - Tcl_Interp *interp; /* Interpreter to use for error reporting. */ - char *string; /* String containing a (possibly signed) +int +Tcl_GetInt ( + Tcl_Interp *interp, /* Interpreter to use for error reporting. */ + char *string, /* String containing a (possibly signed) * integer in a form acceptable to strtol. */ - int *intPtr; /* Place to store converted result. */ + int *intPtr /* Place to store converted result. */ +) { char *end; int i; @@ -83,12 +84,13 @@ Tcl_GetInt(interp, string, intPtr) *---------------------------------------------------------------------- */ -int -Tcl_GetDouble(interp, string, doublePtr) - Tcl_Interp *interp; /* Interpreter to use for error reporting. */ - char *string; /* String containing a floating-point number +int +Tcl_GetDouble ( + Tcl_Interp *interp, /* Interpreter to use for error reporting. */ + char *string, /* String containing a floating-point number * in a form acceptable to strtod. */ - double *doublePtr; /* Place to store converted result. */ + double *doublePtr /* Place to store converted result. */ +) { char *end; double d; @@ -126,14 +128,15 @@ Tcl_GetDouble(interp, string, doublePtr) *---------------------------------------------------------------------- */ -int -Tcl_GetBoolean(interp, string, boolPtr) - Tcl_Interp *interp; /* Interpreter to use for error reporting. */ - char *string; /* String containing a boolean number +int +Tcl_GetBoolean ( + Tcl_Interp *interp, /* Interpreter to use for error reporting. */ + char *string, /* String containing a boolean number * specified either as 1/0 or true/false or * yes/no. */ - int *boolPtr; /* Place to store converted result, which + int *boolPtr /* Place to store converted result, which * will be 0 or 1. */ +) { char c; char lowerCase[10]; diff --git a/src/tcl/tclglob.c b/src/tcl/tclglob.c index c549290..65299ee 100644 --- a/src/tcl/tclglob.c +++ b/src/tcl/tclglob.c @@ -70,17 +70,18 @@ static int DoGlob _ANSI_ARGS_((Tcl_Interp *interp, char *dir, *---------------------------------------------------------------------- */ -static void -AppendResult(interp, dir, separator, name, nameLength) - Tcl_Interp *interp; /* Interpreter whose result should be +static void +AppendResult ( + Tcl_Interp *interp, /* Interpreter whose result should be * appended to. */ - char *dir; /* Name of directory, without trailing + char *dir, /* Name of directory, without trailing * slash except for root directory. */ - char *separator; /* Separator string so use between dir and + char *separator, /* Separator string so use between dir and * name: either "/" or "" depending on dir. */ - char *name; /* Name of file withing directory (NOT + char *name, /* Name of file withing directory (NOT * necessarily null-terminated!). */ - int nameLength; /* Number of characters in name. */ + int nameLength /* Number of characters in name. */ +) { int dirFlags, nameFlags; char *p, saved; @@ -144,15 +145,16 @@ AppendResult(interp, dir, separator, name, nameLength) *---------------------------------------------------------------------- */ -static int -DoGlob(interp, dir, rem) - Tcl_Interp *interp; /* Interpreter to use for error +static int +DoGlob ( + Tcl_Interp *interp, /* Interpreter to use for error * reporting (e.g. unmatched brace). */ - char *dir; /* Name of a directory at which to + char *dir, /* Name of a directory at which to * start glob expansion. This name * is fixed: it doesn't contain any * globbing chars. */ - char *rem; /* Path to glob-expand. */ + char *rem /* Path to glob-expand. */ +) { /* * When this procedure is entered, the name to be globbed may @@ -402,13 +404,14 @@ DoGlob(interp, dir, rem) */ char * -Tcl_TildeSubst(interp, name) - Tcl_Interp *interp; /* Interpreter in which to store error +Tcl_TildeSubst ( + Tcl_Interp *interp, /* Interpreter in which to store error * message (if necessary). */ - char *name; /* File name, which may begin with "~/" + char *name /* File name, which may begin with "~/" * (to indicate current user's home directory) * or "~/" (to indicate any user's * home directory). */ +) { #define STATIC_BUF_SIZE 50 static char staticBuf[STATIC_BUF_SIZE]; @@ -517,12 +520,13 @@ Tcl_TildeSubst(interp, name) */ /* ARGSUSED */ -int -Tcl_GlobCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_GlobCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { int i, result, noComplain; diff --git a/src/tcl/tclhash.c b/src/tcl/tclhash.c index 3d02764..36a28ff 100644 --- a/src/tcl/tclhash.c +++ b/src/tcl/tclhash.c @@ -20,12 +20,6 @@ static char rcsid[] = "$Header: /user6/ouster/tcl/RCS/tclHash.c,v 1.9 92/01/04 1 #include "tclint.h" -/* - * Imported library procedures for which there are no header files: - */ - -extern void panic(); - /* * When there are this many entries per bucket, on average, rebuild * the hash table to make it larger. @@ -86,13 +80,14 @@ static Tcl_HashEntry * OneWordCreate _ANSI_ARGS_((Tcl_HashTable *tablePtr, *---------------------------------------------------------------------- */ -void -Tcl_InitHashTable(tablePtr, keyType) - register Tcl_HashTable *tablePtr; /* Pointer to table record, which +void +Tcl_InitHashTable ( + register Tcl_HashTable *tablePtr, /* Pointer to table record, which * is supplied by the caller. */ - int keyType; /* Type of keys to use in table: + int keyType /* Type of keys to use in table: * TCL_STRING_KEYS, TCL_ONE_WORD_KEYS, * or an integer >= 2. */ +) { tablePtr->buckets = tablePtr->staticBuckets; tablePtr->staticBuckets[0] = tablePtr->staticBuckets[1] = 0; @@ -134,9 +129,8 @@ Tcl_InitHashTable(tablePtr, keyType) *---------------------------------------------------------------------- */ -void -Tcl_DeleteHashEntry(entryPtr) - Tcl_HashEntry *entryPtr; +void +Tcl_DeleteHashEntry (Tcl_HashEntry *entryPtr) { register Tcl_HashEntry *prevPtr; @@ -174,9 +168,10 @@ Tcl_DeleteHashEntry(entryPtr) *---------------------------------------------------------------------- */ -void -Tcl_DeleteHashTable(tablePtr) - register Tcl_HashTable *tablePtr; /* Table to delete. */ +void +Tcl_DeleteHashTable ( + register Tcl_HashTable *tablePtr /* Table to delete. */ +) { register Tcl_HashEntry *hPtr, *nextPtr; int i; @@ -234,10 +229,11 @@ Tcl_DeleteHashTable(tablePtr) */ Tcl_HashEntry * -Tcl_FirstHashEntry(tablePtr, searchPtr) - Tcl_HashTable *tablePtr; /* Table to search. */ - Tcl_HashSearch *searchPtr; /* Place to store information about +Tcl_FirstHashEntry ( + Tcl_HashTable *tablePtr, /* Table to search. */ + Tcl_HashSearch *searchPtr /* Place to store information about * progress through the table. */ +) { searchPtr->tablePtr = tablePtr; searchPtr->nextIndex = 0; @@ -265,11 +261,12 @@ Tcl_FirstHashEntry(tablePtr, searchPtr) */ Tcl_HashEntry * -Tcl_NextHashEntry(searchPtr) - register Tcl_HashSearch *searchPtr; /* Place to store information about +Tcl_NextHashEntry ( + register Tcl_HashSearch *searchPtr /* Place to store information about * progress through the table. Must * have been initialized by calling * Tcl_FirstHashEntry. */ +) { Tcl_HashEntry *hPtr; @@ -306,8 +303,9 @@ Tcl_NextHashEntry(searchPtr) */ char * -Tcl_HashStats(tablePtr) - Tcl_HashTable *tablePtr; /* Table for which to produce stats. */ +Tcl_HashStats ( + Tcl_HashTable *tablePtr /* Table for which to produce stats. */ +) { #define NUM_COUNTERS 10 int count[NUM_COUNTERS], overflow, i, j; @@ -376,9 +374,10 @@ Tcl_HashStats(tablePtr) *---------------------------------------------------------------------- */ -static int -HashString(string) - register char *string; /* String from which to compute hash value. */ +static int +HashString ( + register char *string /* String from which to compute hash value. */ +) { register int result, c; @@ -429,9 +428,10 @@ HashString(string) */ static Tcl_HashEntry * -StringFind(tablePtr, key) - Tcl_HashTable *tablePtr; /* Table in which to lookup entry. */ - char *key; /* Key to use to find matching entry. */ +StringFind ( + Tcl_HashTable *tablePtr, /* Table in which to lookup entry. */ + char *key /* Key to use to find matching entry. */ +) { register Tcl_HashEntry *hPtr; register char *p1, *p2; @@ -479,12 +479,13 @@ StringFind(tablePtr, key) */ static Tcl_HashEntry * -StringCreate(tablePtr, key, newPtr) - Tcl_HashTable *tablePtr; /* Table in which to lookup entry. */ - char *key; /* Key to use to find or create matching +StringCreate ( + Tcl_HashTable *tablePtr, /* Table in which to lookup entry. */ + char *key, /* Key to use to find or create matching * entry. */ - int *newPtr; /* Store info here telling whether a new + int *newPtr /* Store info here telling whether a new * entry was created. */ +) { register Tcl_HashEntry *hPtr; register char *p1, *p2; @@ -554,9 +555,10 @@ StringCreate(tablePtr, key, newPtr) */ static Tcl_HashEntry * -OneWordFind(tablePtr, key) - Tcl_HashTable *tablePtr; /* Table in which to lookup entry. */ - register char *key; /* Key to use to find matching entry. */ +OneWordFind ( + Tcl_HashTable *tablePtr, /* Table in which to lookup entry. */ + register char *key /* Key to use to find matching entry. */ +) { register Tcl_HashEntry *hPtr; int index; @@ -598,12 +600,13 @@ OneWordFind(tablePtr, key) */ static Tcl_HashEntry * -OneWordCreate(tablePtr, key, newPtr) - Tcl_HashTable *tablePtr; /* Table in which to lookup entry. */ - register char *key; /* Key to use to find or create matching +OneWordCreate ( + Tcl_HashTable *tablePtr, /* Table in which to lookup entry. */ + register char *key, /* Key to use to find or create matching * entry. */ - int *newPtr; /* Store info here telling whether a new + int *newPtr /* Store info here telling whether a new * entry was created. */ +) { register Tcl_HashEntry *hPtr; int index; @@ -666,9 +669,10 @@ OneWordCreate(tablePtr, key, newPtr) */ static Tcl_HashEntry * -ArrayFind(tablePtr, key) - Tcl_HashTable *tablePtr; /* Table in which to lookup entry. */ - char *key; /* Key to use to find matching entry. */ +ArrayFind ( + Tcl_HashTable *tablePtr, /* Table in which to lookup entry. */ + char *key /* Key to use to find matching entry. */ +) { register Tcl_HashEntry *hPtr; int *arrayPtr = (int *) key; @@ -722,12 +726,13 @@ ArrayFind(tablePtr, key) */ static Tcl_HashEntry * -ArrayCreate(tablePtr, key, newPtr) - Tcl_HashTable *tablePtr; /* Table in which to lookup entry. */ - register char *key; /* Key to use to find or create matching +ArrayCreate ( + Tcl_HashTable *tablePtr, /* Table in which to lookup entry. */ + register char *key, /* Key to use to find or create matching * entry. */ - int *newPtr; /* Store info here telling whether a new + int *newPtr /* Store info here telling whether a new * entry was created. */ +) { register Tcl_HashEntry *hPtr; int *arrayPtr = (int *) key; @@ -807,9 +812,10 @@ ArrayCreate(tablePtr, key, newPtr) /* ARGSUSED */ static Tcl_HashEntry * -BogusFind(tablePtr, key) - Tcl_HashTable *tablePtr; /* Table in which to lookup entry. */ - char *key; /* Key to use to find matching entry. */ +BogusFind ( + Tcl_HashTable *tablePtr, /* Table in which to lookup entry. */ + char *key /* Key to use to find matching entry. */ +) { panic("called Tcl_FindHashEntry on deleted table"); return NULL; @@ -835,12 +841,13 @@ BogusFind(tablePtr, key) /* ARGSUSED */ static Tcl_HashEntry * -BogusCreate(tablePtr, key, newPtr) - Tcl_HashTable *tablePtr; /* Table in which to lookup entry. */ - char *key; /* Key to use to find or create matching +BogusCreate ( + Tcl_HashTable *tablePtr, /* Table in which to lookup entry. */ + char *key, /* Key to use to find or create matching * entry. */ - int *newPtr; /* Store info here telling whether a new + int *newPtr /* Store info here telling whether a new * entry was created. */ +) { panic("called Tcl_CreateHashEntry on deleted table"); return NULL; @@ -866,9 +873,10 @@ BogusCreate(tablePtr, key, newPtr) *---------------------------------------------------------------------- */ -static void -RebuildTable(tablePtr) - register Tcl_HashTable *tablePtr; /* Table to enlarge. */ +static void +RebuildTable ( + register Tcl_HashTable *tablePtr /* Table to enlarge. */ +) { int oldSize, count, index; Tcl_HashEntry **oldBuckets; diff --git a/src/tcl/tclhist.c b/src/tcl/tclhist.c index d715564..8a3eb8b 100644 --- a/src/tcl/tclhist.c +++ b/src/tcl/tclhist.c @@ -117,9 +117,10 @@ static int SubsAndEval _ANSI_ARGS_((Interp *iPtr, char *cmd, *---------------------------------------------------------------------- */ -void -Tcl_InitHistory(interp) - Tcl_Interp *interp; /* Interpreter to initialize. */ +void +Tcl_InitHistory ( + Tcl_Interp *interp /* Interpreter to initialize. */ +) { register Interp *iPtr = (Interp *) interp; int i; @@ -138,7 +139,7 @@ Tcl_InitHistory(interp) iPtr->curEvent = 0; iPtr->curEventNum = 0; Tcl_CreateCommand((Tcl_Interp *) iPtr, "history", Tcl_HistoryCmd, - (ClientData) NULL, (void (*)()) NULL); + (ClientData) NULL, (void (*)(int *)) NULL); } /* @@ -163,14 +164,15 @@ Tcl_InitHistory(interp) *---------------------------------------------------------------------- */ -int -Tcl_RecordAndEval(interp, cmd, flags) - Tcl_Interp *interp; /* Token for interpreter in which command +int +Tcl_RecordAndEval ( + Tcl_Interp *interp, /* Token for interpreter in which command * will be executed. */ - char *cmd; /* Command to record. */ - int flags; /* Additional flags to pass to Tcl_Eval. + char *cmd, /* Command to record. */ + int flags /* Additional flags to pass to Tcl_Eval. * TCL_NO_EVAL means only record: don't * execute command. */ +) { register Interp *iPtr = (Interp *) interp; register HistoryEvent *eventPtr; @@ -250,11 +252,12 @@ Tcl_RecordAndEval(interp, cmd, flags) /* ARGSUSED */ int -Tcl_HistoryCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +Tcl_HistoryCmd( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { register Interp *iPtr = (Interp *) interp; register HistoryEvent *eventPtr; @@ -526,10 +529,11 @@ Tcl_HistoryCmd(dummy, interp, argc, argv) *---------------------------------------------------------------------- */ -static void -MakeSpace(hPtr, size) - HistoryEvent *hPtr; - int size; /* # of bytes needed in hPtr. */ +static void +MakeSpace ( + HistoryEvent *hPtr, + int size /* # of bytes needed in hPtr. */ +) { if (hPtr->bytesAvl < size) { ckfree(hPtr->command); @@ -557,10 +561,11 @@ MakeSpace(hPtr, size) *---------------------------------------------------------------------- */ -static void -InsertRev(iPtr, revPtr) - Interp *iPtr; /* Interpreter to use. */ - register HistoryRev *revPtr; /* Revision to add to iPtr's list. */ +static void +InsertRev ( + Interp *iPtr, /* Interpreter to use. */ + register HistoryRev *revPtr /* Revision to add to iPtr's list. */ +) { register HistoryRev *curPtr; register HistoryRev *prevPtr; @@ -625,11 +630,12 @@ InsertRev(iPtr, revPtr) *---------------------------------------------------------------------- */ -static void -RevCommand(iPtr, string) - register Interp *iPtr; /* Interpreter in which to perform the +static void +RevCommand ( + register Interp *iPtr, /* Interpreter in which to perform the * substitution. */ - char *string; /* String to substitute. */ + char *string /* String to substitute. */ +) { register HistoryRev *revPtr; @@ -663,11 +669,12 @@ RevCommand(iPtr, string) *---------------------------------------------------------------------- */ -static void -RevResult(iPtr, string) - register Interp *iPtr; /* Interpreter in which to perform the +static void +RevResult ( + register Interp *iPtr, /* Interpreter in which to perform the * substitution. */ - char *string; /* String to substitute. */ + char *string /* String to substitute. */ +) { register HistoryRev *revPtr; char *evalFirst, *evalLast; @@ -729,10 +736,11 @@ RevResult(iPtr, string) *---------------------------------------------------------------------- */ -static void -DoRevs(iPtr) - register Interp *iPtr; /* Interpreter whose history is to +static void +DoRevs ( + register Interp *iPtr /* Interpreter whose history is to * be modified. */ +) { register HistoryRev *revPtr; register HistoryEvent *eventPtr; @@ -812,9 +820,10 @@ DoRevs(iPtr) */ static HistoryEvent * -GetEvent(iPtr, string) - register Interp *iPtr; /* Interpreter in which to look. */ - char *string; /* Description of event. */ +GetEvent ( + register Interp *iPtr, /* Interpreter in which to look. */ + char *string /* Description of event. */ +) { int eventNum, index; register HistoryEvent *eventPtr; @@ -893,13 +902,14 @@ GetEvent(iPtr, string) *---------------------------------------------------------------------- */ -static int -SubsAndEval(iPtr, cmd, old, new) - register Interp *iPtr; /* Interpreter in which to execute +static int +SubsAndEval ( + register Interp *iPtr, /* Interpreter in which to execute * new command. */ - char *cmd; /* Command in which to substitute. */ - char *old; /* String to search for in command. */ - char *new; /* Replacement string for "old". */ + char *cmd, /* Command in which to substitute. */ + char *old, /* String to search for in command. */ + char *new /* Replacement string for "old". */ +) { char *src, *dst, *newCmd; int count, oldLength, newLength, length, result; @@ -976,13 +986,14 @@ SubsAndEval(iPtr, cmd, old, new) */ static char * -GetWords(iPtr, command, words) - register Interp *iPtr; /* Tcl interpreter in which to place +GetWords ( + register Interp *iPtr, /* Tcl interpreter in which to place * an error message if needed. */ - char *command; /* Command string. */ - char *words; /* Description of which words to extract + char *command, /* Command string. */ + char *words /* Description of which words to extract * from the command. Either num[-num] or * a pattern. */ +) { char *result; char *start, *end, *dst; diff --git a/src/tcl/tclint.h b/src/tcl/tclint.h index 9bb0128..6c255d9 100644 --- a/src/tcl/tclint.h +++ b/src/tcl/tclint.h @@ -70,7 +70,7 @@ * up being too many conflicts with slightly-different prototypes. */ -extern double strtod(); +extern double strtod(const char *, char **); /* *---------------------------------------------------------------- @@ -657,7 +657,7 @@ extern char * tclRegexpError; *---------------------------------------------------------------- */ -extern void panic(); +extern void panic(char *format, ...); extern regexp * TclCompileRegexp _ANSI_ARGS_((Tcl_Interp *interp, char *string)); extern void TclCopyAndCollapse _ANSI_ARGS_((int count, char *src, diff --git a/src/tcl/tclparse.c b/src/tcl/tclparse.c index 7e132b3..0200cd2 100644 --- a/src/tcl/tclparse.c +++ b/src/tcl/tclparse.c @@ -126,12 +126,13 @@ static char * VarNameEnd _ANSI_ARGS_((char *string)); *---------------------------------------------------------------------- */ -char -Tcl_Backslash(src, readPtr) - char *src; /* Points to the backslash character of +char +Tcl_Backslash ( + char *src, /* Points to the backslash character of * a backslash sequence. */ - int *readPtr; /* Fill in with number of characters read + int *readPtr /* Fill in with number of characters read * from src, unless NULL. */ +) { register char *p = src+1; char result; @@ -264,20 +265,21 @@ Tcl_Backslash(src, readPtr) *-------------------------------------------------------------- */ -int -TclParseQuotes(interp, string, termChar, flags, termPtr, pvPtr) - Tcl_Interp *interp; /* Interpreter to use for nested command +int +TclParseQuotes ( + Tcl_Interp *interp, /* Interpreter to use for nested command * evaluations and error messages. */ - char *string; /* Character just after opening double- + char *string, /* Character just after opening double- * quote. */ - int termChar; /* Character that terminates "quoted" string + int termChar, /* Character that terminates "quoted" string * (usually double-quote, but sometimes * right-paren or something else). */ - int flags; /* Flags to pass to nested Tcl_Eval calls. */ - char **termPtr; /* Store address of terminating character + int flags, /* Flags to pass to nested Tcl_Eval calls. */ + char **termPtr, /* Store address of terminating character * here. */ - ParseValue *pvPtr; /* Information about where to place + ParseValue *pvPtr /* Information about where to place * fully-substituted result of parse. */ +) { register char *src, *dst, c; @@ -385,16 +387,17 @@ TclParseQuotes(interp, string, termChar, flags, termPtr, pvPtr) *-------------------------------------------------------------- */ -int -TclParseNestedCmd(interp, string, flags, termPtr, pvPtr) - Tcl_Interp *interp; /* Interpreter to use for nested command +int +TclParseNestedCmd ( + Tcl_Interp *interp, /* Interpreter to use for nested command * evaluations and error messages. */ - char *string; /* Character just after opening bracket. */ - int flags; /* Flags to pass to nested Tcl_Eval. */ - char **termPtr; /* Store address of terminating character + char *string, /* Character just after opening bracket. */ + int flags, /* Flags to pass to nested Tcl_Eval. */ + char **termPtr, /* Store address of terminating character * here. */ - register ParseValue *pvPtr; /* Information about where to place + register ParseValue *pvPtr /* Information about where to place * result of command. */ +) { int result, length, shortfall; Interp *iPtr = (Interp *) interp; @@ -451,15 +454,16 @@ TclParseNestedCmd(interp, string, flags, termPtr, pvPtr) *-------------------------------------------------------------- */ -int -TclParseBraces(interp, string, termPtr, pvPtr) - Tcl_Interp *interp; /* Interpreter to use for nested command +int +TclParseBraces ( + Tcl_Interp *interp, /* Interpreter to use for nested command * evaluations and error messages. */ - char *string; /* Character just after opening bracket. */ - char **termPtr; /* Store address of terminating character + char *string, /* Character just after opening bracket. */ + char **termPtr, /* Store address of terminating character * here. */ - register ParseValue *pvPtr; /* Information about where to place + register ParseValue *pvPtr /* Information about where to place * result of command. */ +) { int level; register char *src, *dst, *end; @@ -577,21 +581,22 @@ TclParseBraces(interp, string, termPtr, pvPtr) *-------------------------------------------------------------- */ -int -TclParseWords(interp, string, flags, maxWords, termPtr, argcPtr, argv, pvPtr) - Tcl_Interp *interp; /* Interpreter to use for nested command +int +TclParseWords ( + Tcl_Interp *interp, /* Interpreter to use for nested command * evaluations and error messages. */ - char *string; /* First character of word. */ - int flags; /* Flags to control parsing (same values as + char *string, /* First character of word. */ + int flags, /* Flags to control parsing (same values as * passed to Tcl_Eval). */ - int maxWords; /* Maximum number of words to parse. */ - char **termPtr; /* Store address of terminating character + int maxWords, /* Maximum number of words to parse. */ + char **termPtr, /* Store address of terminating character * here. */ - int *argcPtr; /* Filled in with actual number of words + int *argcPtr, /* Filled in with actual number of words * parsed. */ - char **argv; /* Store addresses of individual words here. */ - register ParseValue *pvPtr; /* Information about where to place + char **argv, /* Store addresses of individual words here. */ + register ParseValue *pvPtr /* Information about where to place * fully-substituted word. */ +) { register char *src, *dst; register char c; @@ -811,15 +816,16 @@ TclParseWords(interp, string, flags, maxWords, termPtr, argcPtr, argv, pvPtr) *-------------------------------------------------------------- */ -void -TclExpandParseValue(pvPtr, needed) - register ParseValue *pvPtr; /* Information about buffer that +void +TclExpandParseValue ( + register ParseValue *pvPtr, /* Information about buffer that * must be expanded. If the clientData * in the structure is non-zero, it * means that the current buffer is * dynamically allocated. */ - int needed; /* Minimum amount of additional space + int needed /* Minimum amount of additional space * to allocate. */ +) { int newSpace; char *new; @@ -873,11 +879,12 @@ TclExpandParseValue(pvPtr, needed) */ char * -TclWordEnd(start, nested) - char *start; /* Beginning of a word of a Tcl command. */ - int nested; /* Zero means this is a top-level command. +TclWordEnd ( + char *start, /* Beginning of a word of a Tcl command. */ + int nested /* Zero means this is a top-level command. * One means this is a nested command (close * brace is a word terminator). */ +) { register char *p; int count; @@ -975,11 +982,12 @@ TclWordEnd(start, nested) */ static char * -QuoteEnd(string, term) - char *string; /* Pointer to character just after opening +QuoteEnd ( + char *string, /* Pointer to character just after opening * "quote". */ - int term; /* This character will terminate the + int term /* This character will terminate the * quoted string (e.g. '"' or ')'). */ +) { register char *p = string; int count; @@ -1024,8 +1032,9 @@ QuoteEnd(string, term) */ static char * -VarNameEnd(string) - char *string; /* Pointer to dollar-sign character. */ +VarNameEnd ( + char *string /* Pointer to dollar-sign character. */ +) { register char *p = string+1; @@ -1067,13 +1076,14 @@ VarNameEnd(string) */ char * -Tcl_ParseVar(interp, string, termPtr) - Tcl_Interp *interp; /* Context for looking up variable. */ - register char *string; /* String containing variable name. +Tcl_ParseVar ( + Tcl_Interp *interp, /* Context for looking up variable. */ + register char *string, /* String containing variable name. * First character must be "$". */ - char **termPtr; /* If non-NULL, points to word to fill + char **termPtr /* If non-NULL, points to word to fill * in with character just after last * one in the variable specifier. */ +) { char *name1, *name1End, c, *result; diff --git a/src/tcl/tclproc.c b/src/tcl/tclproc.c index eb94c3b..e5e3247 100644 --- a/src/tcl/tclproc.c +++ b/src/tcl/tclproc.c @@ -46,12 +46,13 @@ static void ProcDeleteProc _ANSI_ARGS_((ClientData clientData)); */ /* ARGSUSED */ -int -Tcl_ProcCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_ProcCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { register Interp *iPtr = (Interp *) interp; register Proc *procPtr; @@ -181,12 +182,13 @@ Tcl_ProcCmd(dummy, interp, argc, argv) *---------------------------------------------------------------------- */ -int -TclGetFrame(interp, string, framePtrPtr) - Tcl_Interp *interp; /* Interpreter in which to find frame. */ - char *string; /* String describing frame. */ - CallFrame **framePtrPtr; /* Store pointer to frame here (or NULL +int +TclGetFrame ( + Tcl_Interp *interp, /* Interpreter in which to find frame. */ + char *string, /* String describing frame. */ + CallFrame **framePtrPtr /* Store pointer to frame here (or NULL * if global frame indicated). */ +) { register Interp *iPtr = (Interp *) interp; int level, result; @@ -262,12 +264,13 @@ TclGetFrame(interp, string, framePtrPtr) */ /* ARGSUSED */ -int -Tcl_UplevelCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_UplevelCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { register Interp *iPtr = (Interp *) interp; int result; @@ -348,9 +351,10 @@ Tcl_UplevelCmd(dummy, interp, argc, argv) */ Proc * -TclFindProc(iPtr, procName) - Interp *iPtr; /* Interpreter in which to look. */ - char *procName; /* Name of desired procedure. */ +TclFindProc ( + Interp *iPtr, /* Interpreter in which to look. */ + char *procName /* Name of desired procedure. */ +) { Tcl_HashEntry *hPtr; Command *cmdPtr; @@ -385,8 +389,9 @@ TclFindProc(iPtr, procName) */ Proc * -TclIsProc(cmdPtr) - Command *cmdPtr; /* Command to test. */ +TclIsProc ( + Command *cmdPtr /* Command to test. */ +) { if (cmdPtr->proc == InterpProc) { return (Proc *) cmdPtr->clientData; @@ -411,15 +416,16 @@ TclIsProc(cmdPtr) *---------------------------------------------------------------------- */ -static int -InterpProc(clientData, interp, argc, argv) - ClientData clientData; /* Record describing procedure to be +static int +InterpProc ( + ClientData clientData, /* Record describing procedure to be * interpreted. */ - Tcl_Interp *interp; /* Interpreter in which procedure was + Tcl_Interp *interp, /* Interpreter in which procedure was * invoked. */ - int argc; /* Count of number of arguments to this + int argc, /* Count of number of arguments to this * procedure. */ - char **argv; /* Argument values. */ + char **argv /* Argument values. */ +) { register Proc *procPtr = (Proc *) clientData; register Arg *argPtr; @@ -549,9 +555,10 @@ InterpProc(clientData, interp, argc, argv) *---------------------------------------------------------------------- */ -static void -ProcDeleteProc(clientData) - ClientData clientData; /* Procedure to be deleted. */ +static void +ProcDeleteProc ( + ClientData clientData /* Procedure to be deleted. */ +) { register Proc *procPtr = (Proc *) clientData; register Arg *argPtr; diff --git a/src/tcl/tcltest.c b/src/tcl/tcltest.c index fd61f40..0b46ed0 100644 --- a/src/tcl/tcltest.c +++ b/src/tcl/tcltest.c @@ -85,8 +85,8 @@ cmdEcho(clientData, interp, argc, argv) return TCL_OK; } -int -main() +int +main (void) { char line[1000], *cmd; int result, gotPartial; diff --git a/src/tcl/tclunxaz.c b/src/tcl/tclunxaz.c index afa959c..10cdfbb 100644 --- a/src/tcl/tclunxaz.c +++ b/src/tcl/tclunxaz.c @@ -60,12 +60,13 @@ static int StoreStatData _ANSI_ARGS_((Tcl_Interp *interp, */ /* ARGSUSED */ -int -Tcl_CdCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_CdCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { char *dirName; @@ -114,12 +115,13 @@ Tcl_CdCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_CloseCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_CloseCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { OpenFile *filePtr; int result = TCL_OK; @@ -186,12 +188,13 @@ Tcl_CloseCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_EofCmd(notUsed, interp, argc, argv) - ClientData notUsed; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_EofCmd ( + ClientData notUsed, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { OpenFile *filePtr; @@ -229,12 +232,13 @@ Tcl_EofCmd(notUsed, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_ExecCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_ExecCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { int outputId; /* File id for output pipe. -1 * means command overrode. */ @@ -325,12 +329,13 @@ Tcl_ExecCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_ExitCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_ExitCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { int value; @@ -369,12 +374,13 @@ Tcl_ExitCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_FileCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_FileCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { char *p; int length, statOp; @@ -706,12 +712,13 @@ Tcl_FileCmd(dummy, interp, argc, argv) */ static int -StoreStatData(interp, varName, statPtr) - Tcl_Interp *interp; /* Interpreter for error reports. */ - char *varName; /* Name of associative array variable +StoreStatData( + Tcl_Interp *interp, /* Interpreter for error reports. */ + char *varName, /* Name of associative array variable * in which to store stat results. */ - struct stat *statPtr; /* Pointer to buffer containing + struct stat *statPtr /* Pointer to buffer containing * stat data to store in varName. */ +) { char string[30]; @@ -790,8 +797,7 @@ StoreStatData(interp, varName, statPtr) */ static char * -GetFileType(mode) - int mode; +GetFileType (int mode) { if (S_ISREG(mode)) { return "file"; @@ -829,12 +835,13 @@ GetFileType(mode) */ /* ARGSUSED */ -int -Tcl_FlushCmd(notUsed, interp, argc, argv) - ClientData notUsed; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_FlushCmd ( + ClientData notUsed, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { OpenFile *filePtr; FILE *f; @@ -883,12 +890,13 @@ Tcl_FlushCmd(notUsed, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_GetsCmd(notUsed, interp, argc, argv) - ClientData notUsed; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_GetsCmd ( + ClientData notUsed, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { # define BUF_SIZE 200 char buffer[BUF_SIZE+1]; @@ -983,12 +991,13 @@ Tcl_GetsCmd(notUsed, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_OpenCmd(notUsed, interp, argc, argv) - ClientData notUsed; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_OpenCmd ( + ClientData notUsed, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { Interp *iPtr = (Interp *) interp; int pipeline, fd; @@ -1158,12 +1167,13 @@ Tcl_OpenCmd(notUsed, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_PwdCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_PwdCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { char buffer[MAXPATHLEN+1]; @@ -1216,12 +1226,13 @@ Tcl_PwdCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_PutsCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_PutsCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { OpenFile *filePtr; FILE *f; @@ -1281,12 +1292,13 @@ Tcl_PutsCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_ReadCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_ReadCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { OpenFile *filePtr; int bytesLeft, bytesRead, count; @@ -1381,12 +1393,13 @@ Tcl_ReadCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_SeekCmd(notUsed, interp, argc, argv) - ClientData notUsed; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_SeekCmd ( + ClientData notUsed, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { OpenFile *filePtr; int offset, mode; @@ -1449,12 +1462,13 @@ Tcl_SeekCmd(notUsed, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_SourceCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_SourceCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { if (argc != 2) { Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], @@ -1482,12 +1496,13 @@ Tcl_SourceCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_TellCmd(notUsed, interp, argc, argv) - ClientData notUsed; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_TellCmd ( + ClientData notUsed, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { OpenFile *filePtr; @@ -1521,12 +1536,13 @@ Tcl_TellCmd(notUsed, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_TimeCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_TimeCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { int count, i, result; double timePer; @@ -1603,14 +1619,15 @@ Tcl_TimeCmd(dummy, interp, argc, argv) *---------------------------------------------------------------------- */ -static int -CleanupChildren(interp, numPids, pidPtr, errorId) - Tcl_Interp *interp; /* Used for error messages. */ - int numPids; /* Number of entries in pidPtr array. */ - int *pidPtr; /* Array of process ids of children. */ - int errorId; /* File descriptor index for file containing +static int +CleanupChildren ( + Tcl_Interp *interp, /* Used for error messages. */ + int numPids, /* Number of entries in pidPtr array. */ + int *pidPtr, /* Array of process ids of children. */ + int errorId /* File descriptor index for file containing * stderr output from pipeline. -1 means * there isn't any stderr output. */ +) { int result = TCL_OK; int i, pid, length; diff --git a/src/tcl/tclunxst.c b/src/tcl/tclunxst.c index fcc1d3b..6c65a84 100644 --- a/src/tcl/tclunxst.c +++ b/src/tcl/tclunxst.c @@ -41,7 +41,7 @@ static char rcsid[] = "$Header: /user6/ouster/tcl/RCS/tclUnixStr.c,v 1.12 92/04/ */ char * -Tcl_ErrnoId() +Tcl_ErrnoId (void) { switch (errno) { #ifdef E2BIG @@ -484,8 +484,9 @@ Tcl_ErrnoId() */ char * -Tcl_SignalId(sig) - int sig; /* Number of signal. */ +Tcl_SignalId ( + int sig /* Number of signal. */ +) { switch (sig) { #ifdef SIGABRT @@ -616,8 +617,9 @@ Tcl_SignalId(sig) */ char * -Tcl_SignalMsg(sig) - int sig; /* Number of signal. */ +Tcl_SignalMsg ( + int sig /* Number of signal. */ +) { switch (sig) { #ifdef SIGABRT diff --git a/src/tcl/tclunxut.c b/src/tcl/tclunxut.c index 6bc760b..7fee7c3 100644 --- a/src/tcl/tclunxut.c +++ b/src/tcl/tclunxut.c @@ -81,11 +81,12 @@ static int waitTableUsed = 0; /* Number of entries in waitTable that *---------------------------------------------------------------------- */ -int -Tcl_EvalFile(interp, fileName) - Tcl_Interp *interp; /* Interpreter in which to process file. */ - char *fileName; /* Name of file to process. Tilde-substitution +int +Tcl_EvalFile ( + Tcl_Interp *interp, /* Interpreter in which to process file. */ + char *fileName /* Name of file to process. Tilde-substitution * will be performed on this name. */ +) { int fileId, result; struct stat statBuf; @@ -253,12 +254,13 @@ Tcl_Fork() */ int -Tcl_WaitPids(numPids, pidPtr, statusPtr) - int numPids; /* Number of pids to wait on: gives size +Tcl_WaitPids( + int numPids, /* Number of pids to wait on: gives size * of array pointed to by pidPtr. */ - int *pidPtr; /* Pids to wait on: return when one of + int *pidPtr, /* Pids to wait on: return when one of * these processes exits or suspends. */ - int *statusPtr; /* Wait status is returned here. */ + int *statusPtr /* Wait status is returned here. */ +) { int i, count, pid; register WaitInfo *waitPtr; @@ -363,11 +365,12 @@ Tcl_WaitPids(numPids, pidPtr, statusPtr) */ void -Tcl_DetachPids(numPids, pidPtr) - int numPids; /* Number of pids to detach: gives size +Tcl_DetachPids( + int numPids, /* Number of pids to detach: gives size * of array pointed to by pidPtr. */ - int *pidPtr; /* Array of pids to detach: must have + int *pidPtr /* Array of pids to detach: must have * been created by Tcl_Fork. */ +) { register WaitInfo *waitPtr; int i, count, pid; @@ -431,30 +434,29 @@ Tcl_DetachPids(numPids, pidPtr) */ int -Tcl_CreatePipeline(interp, argc, argv, pidArrayPtr, inPipePtr, - outPipePtr, errFilePtr) - Tcl_Interp *interp; /* Interpreter to use for error reporting. */ - int argc; /* Number of entries in argv. */ - char **argv; /* Array of strings describing commands in +Tcl_CreatePipeline( + Tcl_Interp *interp, /* Interpreter to use for error reporting. */ + int argc, /* Number of entries in argv. */ + char **argv, /* Array of strings describing commands in * pipeline plus I/O redirection with <, * <<, and >. Argv[argc] must be NULL. */ - int **pidArrayPtr; /* Word at *pidArrayPtr gets filled in with + int **pidArrayPtr, /* Word at *pidArrayPtr gets filled in with * address of array of pids for processes * in pipeline (first pid is first process * in pipeline). */ - int *inPipePtr; /* If non-NULL, input to the pipeline comes + int *inPipePtr, /* If non-NULL, input to the pipeline comes * from a pipe (unless overridden by * redirection in the command). The file * id with which to write to this pipe is * stored at *inPipePtr. -1 means command * specified its own input source. */ - int *outPipePtr; /* If non-NULL, output to the pipeline goes + int *outPipePtr, /* If non-NULL, output to the pipeline goes * to a pipe, unless overriden by redirection * in the command. The file id with which to * read frome this pipe is stored at * *outPipePtr. -1 means command specified * its own output sink. */ - int *errFilePtr; /* If non-NULL, all stderr output from the + int *errFilePtr /* If non-NULL, all stderr output from the * pipeline will go to a temporary file * created here, and a descriptor to read * the file will be left at *errFilePtr. @@ -462,6 +464,7 @@ Tcl_CreatePipeline(interp, argc, argv, pidArrayPtr, inPipePtr, * closing this descriptor will be the end * of the file. If this is NULL, then * all stderr output goes to our stderr. */ +) { int *pidPtr = NULL; /* Points to malloc-ed array holding all * the pids of child processes. */ @@ -843,9 +846,10 @@ cleanup: */ char * -Tcl_UnixError(interp) - Tcl_Interp *interp; /* Interpreter whose $errorCode variable +Tcl_UnixError( + Tcl_Interp *interp /* Interpreter whose $errorCode variable * is to be changed. */ +) { char *id, *msg; @@ -875,11 +879,12 @@ Tcl_UnixError(interp) */ void -TclMakeFileTable(iPtr, index) - Interp *iPtr; /* Interpreter whose table of files is +TclMakeFileTable( + Interp *iPtr, /* Interpreter whose table of files is * to be manipulated. */ - int index; /* Make sure table is large enough to + int index /* Make sure table is large enough to * hold at least this index. */ +) { /* * If the table doesn't even exist, then create it and initialize @@ -970,11 +975,12 @@ TclMakeFileTable(iPtr, index) */ int -TclGetOpenFile(interp, string, filePtrPtr) - Tcl_Interp *interp; /* Interpreter in which to find file. */ - char *string; /* String that identifies file. */ - OpenFile **filePtrPtr; /* Address of word in which to store pointer +TclGetOpenFile( + Tcl_Interp *interp, /* Interpreter in which to find file. */ + char *string, /* String that identifies file. */ + OpenFile **filePtrPtr /* Address of word in which to store pointer * to structure about open file. */ +) { int fd = 0; /* Initial value needed only to stop compiler * warnings. */ diff --git a/src/tcl/tclutil.c b/src/tcl/tclutil.c index 13071c2..394b6ff 100644 --- a/src/tcl/tclutil.c +++ b/src/tcl/tclutil.c @@ -92,22 +92,23 @@ static void SetupAppendBuffer _ANSI_ARGS_((Interp *iPtr, *---------------------------------------------------------------------- */ -int -TclFindElement(interp, list, elementPtr, nextPtr, sizePtr, bracePtr) - Tcl_Interp *interp; /* Interpreter to use for error reporting. */ - register char *list; /* String containing Tcl list with zero +int +TclFindElement ( + Tcl_Interp *interp, /* Interpreter to use for error reporting. */ + register char *list, /* String containing Tcl list with zero * or more elements (possibly in braces). */ - char **elementPtr; /* Fill in with location of first significant + char **elementPtr, /* Fill in with location of first significant * character in first element of list. */ - char **nextPtr; /* Fill in with location of character just + char **nextPtr, /* Fill in with location of character just * after all white space following end of * argument (i.e. next argument or end of * list). */ - int *sizePtr; /* If non-zero, fill in with size of + int *sizePtr, /* If non-zero, fill in with size of * element. */ - int *bracePtr; /* If non-zero fill in with non-zero/zero + int *bracePtr /* If non-zero fill in with non-zero/zero * to indicate that arg was/wasn't * in braces. */ +) { register char *p; int openBraces = 0; @@ -292,12 +293,13 @@ TclFindElement(interp, list, elementPtr, nextPtr, sizePtr, bracePtr) *---------------------------------------------------------------------- */ -void -TclCopyAndCollapse(count, src, dst) - int count; /* Total number of characters to copy +void +TclCopyAndCollapse ( + int count, /* Total number of characters to copy * from src. */ - register char *src; /* Copy from here... */ - register char *dst; /* ... to here. */ + register char *src, /* Copy from here... */ + register char *dst /* ... to here. */ +) { register char c; int numRead; @@ -348,14 +350,15 @@ TclCopyAndCollapse(count, src, dst) *---------------------------------------------------------------------- */ -int -Tcl_SplitList(interp, list, argcPtr, argvPtr) - Tcl_Interp *interp; /* Interpreter to use for error reporting. */ - char *list; /* Pointer to string with list structure. */ - int *argcPtr; /* Pointer to location to fill in with +int +Tcl_SplitList ( + Tcl_Interp *interp, /* Interpreter to use for error reporting. */ + char *list, /* Pointer to string with list structure. */ + int *argcPtr, /* Pointer to location to fill in with * the number of elements in the list. */ - char ***argvPtr; /* Pointer to place to store pointer to array + char ***argvPtr /* Pointer to place to store pointer to array * of pointers to list elements. */ +) { char **argv; register char *p; @@ -434,11 +437,12 @@ Tcl_SplitList(interp, list, argcPtr, argvPtr) *---------------------------------------------------------------------- */ -int -Tcl_ScanElement(string, flagPtr) - char *string; /* String to convert to Tcl list element. */ - int *flagPtr; /* Where to store information to guide +int +Tcl_ScanElement ( + char *string, /* String to convert to Tcl list element. */ + int *flagPtr /* Where to store information to guide * Tcl_ConvertElement. */ +) { int flags, nestingLevel; register char *p; @@ -552,11 +556,12 @@ Tcl_ScanElement(string, flagPtr) *---------------------------------------------------------------------- */ -int -Tcl_ConvertElement(src, dst, flags) - register char *src; /* Source information for list element. */ - char *dst; /* Place to put list-ified element. */ - int flags; /* Flags produced by Tcl_ScanElement. */ +int +Tcl_ConvertElement ( + register char *src, /* Source information for list element. */ + char *dst, /* Place to put list-ified element. */ + int flags /* Flags produced by Tcl_ScanElement. */ +) { register char *p = dst; @@ -663,9 +668,10 @@ Tcl_ConvertElement(src, dst, flags) */ char * -Tcl_Merge(argc, argv) - int argc; /* How many strings to merge. */ - char **argv; /* Array of string values. */ +Tcl_Merge ( + int argc, /* How many strings to merge. */ + char **argv /* Array of string values. */ +) { # define LOCAL_SIZE 20 int localFlags[LOCAL_SIZE], *flagPtr; @@ -732,9 +738,10 @@ Tcl_Merge(argc, argv) */ char * -Tcl_Concat(argc, argv) - int argc; /* Number of strings to concatenate. */ - char **argv; /* Array of strings to concatenate. */ +Tcl_Concat ( + int argc, /* Number of strings to concatenate. */ + char **argv /* Array of strings to concatenate. */ +) { int totalSize, i; register char *p; @@ -802,11 +809,12 @@ Tcl_Concat(argc, argv) *---------------------------------------------------------------------- */ -int -Tcl_StringMatch(string, pattern) - register char *string; /* String. */ - register char *pattern; /* Pattern, which may contain +int +Tcl_StringMatch ( + register char *string, /* String. */ + register char *pattern /* Pattern, which may contain * special characters. */ +) { char c2; @@ -933,15 +941,16 @@ Tcl_StringMatch(string, pattern) *---------------------------------------------------------------------- */ -void -Tcl_SetResult(interp, string, freeProc) - Tcl_Interp *interp; /* Interpreter with which to associate the +void +Tcl_SetResult ( + Tcl_Interp *interp, /* Interpreter with which to associate the * return value. */ - char *string; /* Value to be returned. If NULL, + char *string, /* Value to be returned. If NULL, * the result is set to an empty string. */ - Tcl_FreeProc *freeProc; /* Gives information about the string: + Tcl_FreeProc *freeProc /* Gives information about the string: * TCL_STATIC, TCL_VOLATILE, or the address * of a Tcl_FreeProc such as free. */ +) { register Interp *iPtr = (Interp *) interp; int length; @@ -1069,16 +1078,17 @@ Tcl_AppendResult(Tcl_Interp *interp, ...) *---------------------------------------------------------------------- */ -void -Tcl_AppendElement(interp, string, noSep) - Tcl_Interp *interp; /* Interpreter whose result is to be +void +Tcl_AppendElement ( + Tcl_Interp *interp, /* Interpreter whose result is to be * extended. */ - char *string; /* String to convert to list element and + char *string, /* String to convert to list element and * add to result. */ - int noSep; /* If non-zero, then don't output a + int noSep /* If non-zero, then don't output a * space character before this element, * even if the element isn't the first * thing in the output buffer. */ +) { register Interp *iPtr = (Interp *) interp; int size, flags; @@ -1127,11 +1137,12 @@ Tcl_AppendElement(interp, string, noSep) *---------------------------------------------------------------------- */ -static void -SetupAppendBuffer(iPtr, newSpace) - register Interp *iPtr; /* Interpreter whose result is being set up. */ - int newSpace; /* Make sure that at least this many bytes +static void +SetupAppendBuffer ( + register Interp *iPtr, /* Interpreter whose result is being set up. */ + int newSpace /* Make sure that at least this many bytes * of new information may be added. */ +) { int totalSpace; @@ -1197,9 +1208,10 @@ SetupAppendBuffer(iPtr, newSpace) *---------------------------------------------------------------------- */ -void -Tcl_ResetResult(interp) - Tcl_Interp *interp; /* Interpreter for which to clear result. */ +void +Tcl_ResetResult ( + Tcl_Interp *interp /* Interpreter for which to clear result. */ +) { register Interp *iPtr = (Interp *) interp; @@ -1282,11 +1294,12 @@ Tcl_SetErrorCode(Tcl_Interp *interp, ...) *---------------------------------------------------------------------- */ -int -TclGetListIndex(interp, string, indexPtr) - Tcl_Interp *interp; /* Interpreter for error reporting. */ - char *string; /* String containing list index. */ - int *indexPtr; /* Where to store index. */ +int +TclGetListIndex ( + Tcl_Interp *interp, /* Interpreter for error reporting. */ + char *string, /* String containing list index. */ + int *indexPtr /* Where to store index. */ +) { if (isdigit(*string) || (*string == '-')) { if (Tcl_GetInt(interp, string, indexPtr) != TCL_OK) { @@ -1330,10 +1343,11 @@ TclGetListIndex(interp, string, indexPtr) */ regexp * -TclCompileRegexp(interp, string) - Tcl_Interp *interp; /* For use in error reporting. */ - char *string; /* String for which to produce +TclCompileRegexp ( + Tcl_Interp *interp, /* For use in error reporting. */ + char *string /* String for which to produce * compiled regular expression. */ +) { register Interp *iPtr = (Interp *) interp; int i, length; @@ -1414,9 +1428,10 @@ TclCompileRegexp(interp, string) *---------------------------------------------------------------------- */ -void -regerror(string) - char *string; /* Error message. */ +void +regerror ( + char *string /* Error message. */ +) { tclRegexpError = string; } diff --git a/src/tcl/tclvar.c b/src/tcl/tclvar.c index 63849f1..1541a56 100644 --- a/src/tcl/tclvar.c +++ b/src/tcl/tclvar.c @@ -76,12 +76,13 @@ static void VarErrMsg _ANSI_ARGS_((Tcl_Interp *interp, */ char * -Tcl_GetVar(interp, varName, flags) - Tcl_Interp *interp; /* Command interpreter in which varName is +Tcl_GetVar ( + Tcl_Interp *interp, /* Command interpreter in which varName is * to be looked up. */ - char *varName; /* Name of a variable in interp. */ - int flags; /* OR-ed combination of TCL_GLOBAL_ONLY + char *varName, /* Name of a variable in interp. */ + int flags /* OR-ed combination of TCL_GLOBAL_ONLY * or TCL_LEAVE_ERR_MSG bits. */ +) { register char *p; @@ -143,15 +144,16 @@ Tcl_GetVar(interp, varName, flags) */ char * -Tcl_GetVar2(interp, name1, name2, flags) - Tcl_Interp *interp; /* Command interpreter in which variable is +Tcl_GetVar2 ( + Tcl_Interp *interp, /* Command interpreter in which variable is * to be looked up. */ - char *name1; /* Name of array (if name2 is NULL) or + char *name1, /* Name of array (if name2 is NULL) or * name of variable. */ - char *name2; /* If non-null, gives name of element in + char *name2, /* If non-null, gives name of element in * array. */ - int flags; /* OR-ed combination of TCL_GLOBAL_ONLY + int flags /* OR-ed combination of TCL_GLOBAL_ONLY * or TCL_LEAVE_ERR_MSG bits. */ +) { Tcl_HashEntry *hPtr; Var *varPtr; @@ -262,15 +264,16 @@ Tcl_GetVar2(interp, name1, name2, flags) */ char * -Tcl_SetVar(interp, varName, newValue, flags) - Tcl_Interp *interp; /* Command interpreter in which varName is +Tcl_SetVar ( + Tcl_Interp *interp, /* Command interpreter in which varName is * to be looked up. */ - char *varName; /* Name of a variable in interp. */ - char *newValue; /* New value for varName. */ - int flags; /* Various flags that tell how to set value: + char *varName, /* Name of a variable in interp. */ + char *newValue, /* New value for varName. */ + int flags /* Various flags that tell how to set value: * any of TCL_GLOBAL_ONLY, TCL_APPEND_VALUE, * TCL_LIST_ELEMENT, TCL_NO_SPACE, or * TCL_LEAVE_ERR_MSG. */ +) { register char *p; @@ -330,17 +333,18 @@ Tcl_SetVar(interp, varName, newValue, flags) */ char * -Tcl_SetVar2(interp, name1, name2, newValue, flags) - Tcl_Interp *interp; /* Command interpreter in which variable is +Tcl_SetVar2 ( + Tcl_Interp *interp, /* Command interpreter in which variable is * to be looked up. */ - char *name1; /* If name2 is NULL, this is name of scalar + char *name1, /* If name2 is NULL, this is name of scalar * variable. Otherwise it is name of array. */ - char *name2; /* Name of an element within array, or NULL. */ - char *newValue; /* New value for variable. */ - int flags; /* Various flags that tell how to set value: + char *name2, /* Name of an element within array, or NULL. */ + char *newValue, /* New value for variable. */ + int flags /* Various flags that tell how to set value: * any of TCL_GLOBAL_ONLY, TCL_APPEND_VALUE, * TCL_LIST_ELEMENT, and TCL_NO_SPACE, or * TCL_LEAVE_ERR_MSG . */ +) { Tcl_HashEntry *hPtr; register Var *varPtr = NULL; @@ -523,15 +527,16 @@ Tcl_SetVar2(interp, name1, name2, newValue, flags) *---------------------------------------------------------------------- */ -int -Tcl_UnsetVar(interp, varName, flags) - Tcl_Interp *interp; /* Command interpreter in which varName is +int +Tcl_UnsetVar ( + Tcl_Interp *interp, /* Command interpreter in which varName is * to be looked up. */ - char *varName; /* Name of a variable in interp. May be + char *varName, /* Name of a variable in interp. May be * either a scalar name or an array name * or an element in an array. */ - int flags; /* OR-ed combination of any of + int flags /* OR-ed combination of any of * TCL_GLOBAL_ONLY or TCL_LEAVE_ERR_MSG. */ +) { register char *p; int result; @@ -586,14 +591,15 @@ Tcl_UnsetVar(interp, varName, flags) *---------------------------------------------------------------------- */ -int -Tcl_UnsetVar2(interp, name1, name2, flags) - Tcl_Interp *interp; /* Command interpreter in which varName is +int +Tcl_UnsetVar2 ( + Tcl_Interp *interp, /* Command interpreter in which varName is * to be looked up. */ - char *name1; /* Name of variable or array. */ - char *name2; /* Name of element within array or NULL. */ - int flags; /* OR-ed combination of any of + char *name1, /* Name of variable or array. */ + char *name2, /* Name of element within array or NULL. */ + int flags /* OR-ed combination of any of * TCL_GLOBAL_ONLY or TCL_LEAVE_ERR_MSG. */ +) { Tcl_HashEntry *hPtr, dummyEntry; Var *varPtr, dummyVar; @@ -746,18 +752,19 @@ Tcl_UnsetVar2(interp, name1, name2, flags) *---------------------------------------------------------------------- */ -int -Tcl_TraceVar(interp, varName, flags, proc, clientData) - Tcl_Interp *interp; /* Interpreter in which variable is +int +Tcl_TraceVar ( + Tcl_Interp *interp, /* Interpreter in which variable is * to be traced. */ - char *varName; /* Name of variable; may end with "(index)" + char *varName, /* Name of variable; may end with "(index)" * to signify an array reference. */ - int flags; /* OR-ed collection of bits, including any + int flags, /* OR-ed collection of bits, including any * of TCL_TRACE_READS, TCL_TRACE_WRITES, * TCL_TRACE_UNSETS, and TCL_GLOBAL_ONLY. */ - Tcl_VarTraceProc *proc; /* Procedure to call when specified ops are + Tcl_VarTraceProc *proc, /* Procedure to call when specified ops are * invoked upon varName. */ - ClientData clientData; /* Arbitrary argument to pass to proc. */ + ClientData clientData /* Arbitrary argument to pass to proc. */ +) { register char *p; @@ -814,20 +821,21 @@ Tcl_TraceVar(interp, varName, flags, proc, clientData) *---------------------------------------------------------------------- */ -int -Tcl_TraceVar2(interp, name1, name2, flags, proc, clientData) - Tcl_Interp *interp; /* Interpreter in which variable is +int +Tcl_TraceVar2 ( + Tcl_Interp *interp, /* Interpreter in which variable is * to be traced. */ - char *name1; /* Name of scalar variable or array. */ - char *name2; /* Name of element within array; NULL means + char *name1, /* Name of scalar variable or array. */ + char *name2, /* Name of element within array; NULL means * trace applies to scalar variable or array * as-a-whole. */ - int flags; /* OR-ed collection of bits, including any + int flags, /* OR-ed collection of bits, including any * of TCL_TRACE_READS, TCL_TRACE_WRITES, * TCL_TRACE_UNSETS, and TCL_GLOBAL_ONLY. */ - Tcl_VarTraceProc *proc; /* Procedure to call when specified ops are + Tcl_VarTraceProc *proc, /* Procedure to call when specified ops are * invoked upon varName. */ - ClientData clientData; /* Arbitrary argument to pass to proc. */ + ClientData clientData /* Arbitrary argument to pass to proc. */ +) { Tcl_HashEntry *hPtr; Var *varPtr = NULL; /* Initial value only used to stop compiler @@ -925,17 +933,18 @@ Tcl_TraceVar2(interp, name1, name2, flags, proc, clientData) *---------------------------------------------------------------------- */ -void -Tcl_UntraceVar(interp, varName, flags, proc, clientData) - Tcl_Interp *interp; /* Interpreter containing traced variable. */ - char *varName; /* Name of variable; may end with "(index)" +void +Tcl_UntraceVar ( + Tcl_Interp *interp, /* Interpreter containing traced variable. */ + char *varName, /* Name of variable; may end with "(index)" * to signify an array reference. */ - int flags; /* OR-ed collection of bits describing + int flags, /* OR-ed collection of bits describing * current trace, including any of * TCL_TRACE_READS, TCL_TRACE_WRITES, * TCL_TRACE_UNSETS, and TCL_GLOBAL_ONLY. */ - Tcl_VarTraceProc *proc; /* Procedure assocated with trace. */ - ClientData clientData; /* Arbitrary argument to pass to proc. */ + Tcl_VarTraceProc *proc, /* Procedure assocated with trace. */ + ClientData clientData /* Arbitrary argument to pass to proc. */ +) { register char *p; @@ -986,19 +995,20 @@ Tcl_UntraceVar(interp, varName, flags, proc, clientData) *---------------------------------------------------------------------- */ -void -Tcl_UntraceVar2(interp, name1, name2, flags, proc, clientData) - Tcl_Interp *interp; /* Interpreter containing traced variable. */ - char *name1; /* Name of variable or array. */ - char *name2; /* Name of element within array; NULL means +void +Tcl_UntraceVar2 ( + Tcl_Interp *interp, /* Interpreter containing traced variable. */ + char *name1, /* Name of variable or array. */ + char *name2, /* Name of element within array; NULL means * trace applies to scalar variable or array * as-a-whole. */ - int flags; /* OR-ed collection of bits describing + int flags, /* OR-ed collection of bits describing * current trace, including any of * TCL_TRACE_READS, TCL_TRACE_WRITES, * TCL_TRACE_UNSETS, and TCL_GLOBAL_ONLY. */ - Tcl_VarTraceProc *proc; /* Procedure assocated with trace. */ - ClientData clientData; /* Arbitrary argument to pass to proc. */ + Tcl_VarTraceProc *proc, /* Procedure assocated with trace. */ + ClientData clientData /* Arbitrary argument to pass to proc. */ +) { register VarTrace *tracePtr; VarTrace *prevPtr; @@ -1093,18 +1103,19 @@ Tcl_UntraceVar2(interp, name1, name2, flags, proc, clientData) *---------------------------------------------------------------------- */ -ClientData -Tcl_VarTraceInfo(interp, varName, flags, proc, prevClientData) - Tcl_Interp *interp; /* Interpreter containing variable. */ - char *varName; /* Name of variable; may end with "(index)" +ClientData +Tcl_VarTraceInfo ( + Tcl_Interp *interp, /* Interpreter containing variable. */ + char *varName, /* Name of variable; may end with "(index)" * to signify an array reference. */ - int flags; /* 0 or TCL_GLOBAL_ONLY. */ - Tcl_VarTraceProc *proc; /* Procedure assocated with trace. */ - ClientData prevClientData; /* If non-NULL, gives last value returned + int flags, /* 0 or TCL_GLOBAL_ONLY. */ + Tcl_VarTraceProc *proc, /* Procedure assocated with trace. */ + ClientData prevClientData /* If non-NULL, gives last value returned * by this procedure, so this call will * return the next trace after that one. * If NULL, this call will return the * first trace. */ +) { register char *p; @@ -1157,20 +1168,21 @@ Tcl_VarTraceInfo(interp, varName, flags, proc, prevClientData) *---------------------------------------------------------------------- */ -ClientData -Tcl_VarTraceInfo2(interp, name1, name2, flags, proc, prevClientData) - Tcl_Interp *interp; /* Interpreter containing variable. */ - char *name1; /* Name of variable or array. */ - char *name2; /* Name of element within array; NULL means +ClientData +Tcl_VarTraceInfo2 ( + Tcl_Interp *interp, /* Interpreter containing variable. */ + char *name1, /* Name of variable or array. */ + char *name2, /* Name of element within array; NULL means * trace applies to scalar variable or array * as-a-whole. */ - int flags; /* 0 or TCL_GLOBAL_ONLY. */ - Tcl_VarTraceProc *proc; /* Procedure assocated with trace. */ - ClientData prevClientData; /* If non-NULL, gives last value returned + int flags, /* 0 or TCL_GLOBAL_ONLY. */ + Tcl_VarTraceProc *proc, /* Procedure assocated with trace. */ + ClientData prevClientData /* If non-NULL, gives last value returned * by this procedure, so this call will * return the next trace after that one. * If NULL, this call will return the * first trace. */ +) { register VarTrace *tracePtr; Var *varPtr; @@ -1245,12 +1257,13 @@ Tcl_VarTraceInfo2(interp, name1, name2, flags, proc, prevClientData) */ /* ARGSUSED */ -int -Tcl_SetCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - register Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_SetCmd ( + ClientData dummy, /* Not used. */ + register Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { if (argc == 2) { char *value; @@ -1295,12 +1308,13 @@ Tcl_SetCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_UnsetCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - register Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_UnsetCmd ( + ClientData dummy, /* Not used. */ + register Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { int i; @@ -1335,12 +1349,13 @@ Tcl_UnsetCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_AppendCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - register Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_AppendCmd ( + ClientData dummy, /* Not used. */ + register Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { int i; char *result = NULL; /* (Initialization only needed to keep @@ -1381,12 +1396,13 @@ Tcl_AppendCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_LappendCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - register Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_LappendCmd ( + ClientData dummy, /* Not used. */ + register Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { int i; char *result = NULL; /* (Initialization only needed to keep @@ -1427,12 +1443,13 @@ Tcl_LappendCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_ArrayCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - register Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_ArrayCmd ( + ClientData dummy, /* Not used. */ + register Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { int length; char c; @@ -1653,12 +1670,13 @@ Tcl_ArrayCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_GlobalCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_GlobalCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { Var *varPtr, *gVarPtr; register Interp *iPtr = (Interp *) interp; @@ -1722,12 +1740,13 @@ Tcl_GlobalCmd(dummy, interp, argc, argv) */ /* ARGSUSED */ -int -Tcl_UpvarCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tcl_UpvarCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { register Interp *iPtr = (Interp *) interp; int result; @@ -1827,11 +1846,12 @@ Tcl_UpvarCmd(dummy, interp, argc, argv) *---------------------------------------------------------------------- */ -void -TclDeleteVars(iPtr, tablePtr) - Interp *iPtr; /* Interpreter to which variables belong. */ - Tcl_HashTable *tablePtr; /* Hash table containing variables to +void +TclDeleteVars ( + Interp *iPtr, /* Interpreter to which variables belong. */ + Tcl_HashTable *tablePtr /* Hash table containing variables to * delete. */ +) { Tcl_HashSearch search; Tcl_HashEntry *hPtr; @@ -1923,21 +1943,23 @@ TclDeleteVars(iPtr, tablePtr) */ static char * -CallTraces(iPtr, arrayPtr, hPtr, name1, name2, flags) - Interp *iPtr; /* Interpreter containing variable. */ - register Var *arrayPtr; /* Pointer to array variable that +CallTraces ( + Interp *iPtr, /* Interpreter containing variable. */ + register Var *arrayPtr, /* Pointer to array variable that * contains the variable, or NULL if * the variable isn't an element of an * array. */ - Tcl_HashEntry *hPtr; /* Hash table entry corresponding to + Tcl_HashEntry *hPtr, /* Hash table entry corresponding to * variable whose traces are to be * invoked. */ - char *name1, *name2; /* Variable's two-part name. */ - int flags; /* Flags to pass to trace procedures: + char *name1, + char *name2, /* Variable's two-part name. */ + int flags /* Flags to pass to trace procedures: * indicates what's happening to * variable, plus other stuff like * TCL_GLOBAL_ONLY and * TCL_INTERP_DESTROYED. */ +) { Var *varPtr; register VarTrace *tracePtr; @@ -2047,9 +2069,10 @@ CallTraces(iPtr, arrayPtr, hPtr, name1, name2, flags) */ static Var * -NewVar(space) - int space; /* Minimum amount of space to allocate +NewVar ( + int space /* Minimum amount of space to allocate * for variable's value. */ +) { int extra; register Var *varPtr; @@ -2090,15 +2113,16 @@ NewVar(space) */ static ArraySearch * -ParseSearchId(interp, varPtr, varName, string) - Tcl_Interp *interp; /* Interpreter containing variable. */ - Var *varPtr; /* Array variable search is for. */ - char *varName; /* Name of array variable that search is +ParseSearchId ( + Tcl_Interp *interp, /* Interpreter containing variable. */ + Var *varPtr, /* Array variable search is for. */ + char *varName, /* Name of array variable that search is * supposed to be for. */ - char *string; /* String containing id of search. Must have + char *string /* String containing id of search. Must have * form "search-num-var" where "num" is a * decimal number and "var" is a variable * name. */ +) { char *end; int id; @@ -2157,10 +2181,11 @@ ParseSearchId(interp, varPtr, varName, string) *---------------------------------------------------------------------- */ -static void -DeleteSearches(arrayVarPtr) - register Var *arrayVarPtr; /* Variable whose searches are +static void +DeleteSearches ( + register Var *arrayVarPtr /* Variable whose searches are * to be deleted. */ +) { ArraySearch *searchPtr; @@ -2192,16 +2217,17 @@ DeleteSearches(arrayVarPtr) *---------------------------------------------------------------------- */ -static void -DeleteArray(iPtr, arrayName, varPtr, flags) - Interp *iPtr; /* Interpreter containing array. */ - char *arrayName; /* Name of array (used for trace +static void +DeleteArray ( + Interp *iPtr, /* Interpreter containing array. */ + char *arrayName, /* Name of array (used for trace * callbacks). */ - Var *varPtr; /* Pointer to variable structure. */ - int flags; /* Flags to pass to CallTraces: + Var *varPtr, /* Pointer to variable structure. */ + int flags /* Flags to pass to CallTraces: * TCL_TRACE_UNSETS and sometimes * TCL_INTERP_DESTROYED and/or * TCL_GLOBAL_ONLY. */ +) { Tcl_HashSearch search; register Tcl_HashEntry *hPtr; @@ -2248,13 +2274,15 @@ DeleteArray(iPtr, arrayName, varPtr, flags) *---------------------------------------------------------------------- */ -static void -VarErrMsg(interp, name1, name2, operation, reason) - Tcl_Interp *interp; /* Interpreter in which to record message. */ - char *name1, *name2; /* Variable's two-part name. */ - char *operation; /* String describing operation that failed, +static void +VarErrMsg ( + Tcl_Interp *interp, /* Interpreter in which to record message. */ + char *name1, + char *name2, /* Variable's two-part name. */ + char *operation, /* String describing operation that failed, * e.g. "read", "set", or "unset". */ - char *reason; /* String describing why operation failed. */ + char *reason /* String describing why operation failed. */ +) { Tcl_ResetResult(interp); Tcl_AppendResult(interp, "can't ", operation, " \"", name1, (char *) NULL); diff --git a/src/tclx/src/main.c b/src/tclx/src/main.c index 6b26066..8d2b61c 100644 --- a/src/tclx/src/main.c +++ b/src/tclx/src/main.c @@ -21,10 +21,22 @@ #include "tclxtend.h" -int -main(argc, argv) - int argc; - CONST char **argv; +int +TclX_RecordAndEval ( + Tcl_Interp *interp, /* Token for interpreter in which command + * will be executed. */ + char *cmd, /* Command to record. */ + int flags, /* Additional flags to pass to Tcl_Eval. + * TCL_NO_EVAL means only record: don't + * execute command. */ + char **dummy +) +{ + return Tcl_RecordAndEval(interp, cmd, flags); +} + +int +main (int argc, CONST char **argv) { Tcl_Interp *interp; @@ -34,7 +46,7 @@ main(argc, argv) * also brings in history from libtcl.a. */ #ifndef TCL_NOHISTORY - tclShellCmdEvalProc = Tcl_RecordAndEval; + tclShellCmdEvalProc = TclX_RecordAndEval; #endif /* diff --git a/src/tclx/src/tclxbsrc.c b/src/tclx/src/tclxbsrc.c index 8ff8b8e..a1905a7 100644 --- a/src/tclx/src/tclxbsrc.c +++ b/src/tclx/src/tclxbsrc.c @@ -67,10 +67,8 @@ BinSearch _ANSI_ARGS_((binSearchCB_t *searchCBPtr)); * o > 0 if key > line-key. *----------------------------------------------------------------------------- */ -static int -StandardKeyCompare (key, line) - char *key; - char *line; +static int +StandardKeyCompare (char *key, char *line) { int cmpResult, fieldLen; char saveChar; @@ -100,9 +98,8 @@ StandardKeyCompare (key, line) * TCL_OK or TCL_ERROR. *----------------------------------------------------------------------------- */ -static int -TclProcKeyCompare (searchCBPtr) - binSearchCB_t *searchCBPtr; +static int +TclProcKeyCompare (binSearchCB_t *searchCBPtr) { char *cmdArgv [3]; char *command; @@ -159,10 +156,8 @@ TclProcKeyCompare (searchCBPtr) * TCL_OK or TCL_ERROR. *----------------------------------------------------------------------------- */ -static int -ReadAndCompare (fileOffset, searchCBPtr) - long fileOffset; - binSearchCB_t *searchCBPtr; +static int +ReadAndCompare (long fileOffset, binSearchCB_t *searchCBPtr) { int recChar, status; @@ -237,9 +232,8 @@ unixError: * *----------------------------------------------------------------------------- */ -static int -BinSearch (searchCBPtr) - binSearchCB_t *searchCBPtr; +static int +BinSearch (binSearchCB_t *searchCBPtr) { OpenFile *filePtr; long middle, high, low; @@ -304,11 +298,12 @@ unixError: *----------------------------------------------------------------------------- */ int -Tcl_BsearchCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_BsearchCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { int status; binSearchCB_t searchCB; diff --git a/src/tclx/src/tclxcclk.c b/src/tclx/src/tclxcclk.c index 109c466..075f6be 100644 --- a/src/tclx/src/tclxcclk.c +++ b/src/tclx/src/tclxcclk.c @@ -35,11 +35,12 @@ *----------------------------------------------------------------------------- */ int -Tcl_ConvertclockCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_ConvertclockCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { long clockVal; time_t baseClock; diff --git a/src/tclx/src/tclxchmd.c b/src/tclx/src/tclxchmd.c index 94062df..4f6c387 100644 --- a/src/tclx/src/tclxchmd.c +++ b/src/tclx/src/tclxchmd.c @@ -44,11 +44,8 @@ ConvSymMode _ANSI_ARGS_((Tcl_Interp *interp, * *----------------------------------------------------------------------------- */ -static int -ConvSymMode (interp, symMode, modeVal) - Tcl_Interp *interp; - char *symMode; - int modeVal; +static int +ConvSymMode (Tcl_Interp *interp, char *symMode, int modeVal) { int user, group, other; @@ -191,11 +188,12 @@ ConvSymMode (interp, symMode, modeVal) *----------------------------------------------------------------------------- */ int -Tcl_ChmodCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_ChmodCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { int idx, modeVal, fileArgc, absMode; char **fileArgv; @@ -259,11 +257,12 @@ Tcl_ChmodCmd (clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_ChownCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_ChownCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { int idx, ownArgc, fileArgc; char **ownArgv, **fileArgv = NULL; @@ -374,11 +373,12 @@ exitPoint: *----------------------------------------------------------------------------- */ int -Tcl_ChgrpCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_ChgrpCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { int idx, fileArgc, groupId, result = TCL_ERROR; char **fileArgv; diff --git a/src/tclx/src/tclxclck.c b/src/tclx/src/tclxclck.c index aff794d..3717485 100644 --- a/src/tclx/src/tclxclck.c +++ b/src/tclx/src/tclxclck.c @@ -33,11 +33,12 @@ *----------------------------------------------------------------------------- */ int -Tcl_GetclockCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_GetclockCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { if (argc != 1) { Tcl_AppendResult (interp, tclXWrongArgs, argv[0], (char *) NULL); @@ -60,11 +61,12 @@ Tcl_GetclockCmd (clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_FmtclockCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_FmtclockCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { int useGMT = FALSE; long clockVal; diff --git a/src/tclx/src/tclxclp.c b/src/tclx/src/tclxclp.c index 4738a5c..7765032 100644 --- a/src/tclx/src/tclxclp.c +++ b/src/tclx/src/tclxclp.c @@ -26,7 +26,7 @@ * to no history, set this variable to Tcl_RecordAndEval to use history. */ -int (*tclShellCmdEvalProc) () = Tcl_Eval; +int (*tclShellCmdEvalProc) (Tcl_Interp *, char *, int, char**) = Tcl_Eval; /* * Prototypes of internal functions. @@ -66,10 +66,8 @@ SetPromptVar _ANSI_ARGS_((Tcl_Interp *interp, * *----------------------------------------------------------------------------- */ -static int -IsSetVarCmd (interp, command) - Tcl_Interp *interp; - char *command; +static int +IsSetVarCmd (Tcl_Interp *interp, char *command) { char *nextPtr; @@ -100,9 +98,8 @@ IsSetVarCmd (interp, command) * *----------------------------------------------------------------------------- */ -static void -OutFlush (filePtr) - FILE *filePtr; +static void +OutFlush (FILE *filePtr) { int stat; @@ -131,11 +128,8 @@ OutFlush (filePtr) * *----------------------------------------------------------------------------- */ -static void -Tcl_PrintResult (fp, returnval, resultText) - FILE *fp; - int returnval; - char *resultText; +static void +Tcl_PrintResult (FILE *fp, int returnval, char *resultText) { if (returnval == TCL_OK) { @@ -162,11 +156,8 @@ Tcl_PrintResult (fp, returnval, resultText) * *----------------------------------------------------------------------------- */ -static void -OutputPrompt (interp, outFP, topLevel) - Tcl_Interp *interp; - FILE *outFP; - int topLevel; +static void +OutputPrompt (Tcl_Interp *interp, FILE *outFP, int topLevel) { char *hookName; char *promptHook; @@ -222,13 +213,8 @@ OutputPrompt (interp, outFP, topLevel) * o options (I) - Currently unused. *----------------------------------------------------------------------------- */ -void -Tcl_CommandLoop (interp, inFile, outFile, evalProc, options) - Tcl_Interp *interp; - FILE *inFile; - FILE *outFile; - int (*evalProc) (); - unsigned options; +void +Tcl_CommandLoop (Tcl_Interp *interp, FILE *inFile, FILE *outFile, int (*evalProc)(Tcl_Interp *, char *, int, char**), unsigned options) { Tcl_CmdBuf cmdBuf; char inputBuf[256]; @@ -303,12 +289,8 @@ endOfFile: * TCL_OK if the hook variable was set ok, TCL_ERROR if an error occured. *----------------------------------------------------------------------------- */ -static int -SetPromptVar (interp, hookVarName, newHookValue, oldHookValuePtr) - Tcl_Interp *interp; - char *hookVarName; - char *newHookValue; - char **oldHookValuePtr; +static int +SetPromptVar (Tcl_Interp *interp, char *hookVarName, char *newHookValue, char **oldHookValuePtr) { char *hookValue; char *oldHookPtr = NULL; @@ -345,11 +327,12 @@ SetPromptVar (interp, hookVarName, newHookValue, oldHookValuePtr) *----------------------------------------------------------------------------- */ int -Tcl_CommandloopCmd(clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_CommandloopCmd( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { char *oldTopLevelHook = NULL; char *oldDownLevelHook = NULL; diff --git a/src/tclx/src/tclxcret.c b/src/tclx/src/tclxcret.c index 0d6d526..7ca7bdf 100644 --- a/src/tclx/src/tclxcret.c +++ b/src/tclx/src/tclxcret.c @@ -44,7 +44,7 @@ static int (*bringInMathErr)() = matherr; *----------------------------------------------------------------------------- */ Tcl_Interp * -Tcl_CreateExtendedInterp () +Tcl_CreateExtendedInterp (void) { Tcl_Interp *interp; @@ -61,37 +61,37 @@ Tcl_CreateExtendedInterp () * from tclXbsearch.c */ Tcl_CreateCommand (interp, "bsearch", Tcl_BsearchCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); /* * from tclXchmod.c */ Tcl_CreateCommand (interp, "chgrp", Tcl_ChgrpCmd, (ClientData)NULL, - (void (*)())NULL); + (void (*)(int *))NULL); Tcl_CreateCommand (interp, "chmod", Tcl_ChmodCmd, (ClientData)NULL, - (void (*)())NULL); + (void (*)(int *))NULL); Tcl_CreateCommand (interp, "chown", Tcl_ChownCmd, (ClientData)NULL, - (void (*)())NULL); + (void (*)(int *))NULL); /* * from tclXclock.c */ Tcl_CreateCommand (interp, "getclock", Tcl_GetclockCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand (interp, "fmtclock", Tcl_FmtclockCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); /* * from tclXcnvdate.c */ Tcl_CreateCommand (interp, "convertclock", Tcl_ConvertclockCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); /* * from tclXcmdloop.c */ Tcl_CreateCommand (interp, "commandloop", Tcl_CommandloopCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); /* * from tclXdebug.c @@ -102,28 +102,28 @@ Tcl_CreateExtendedInterp () * from tclXdup.c */ Tcl_CreateCommand (interp, "dup", Tcl_DupCmd, - (ClientData) NULL, (void (*)())NULL); + (ClientData) NULL, (void (*)(int *))NULL); /* * from tclXtclXfcntl.c */ Tcl_CreateCommand (interp, "fcntl", Tcl_FcntlCmd, - (ClientData) NULL, (void (*)())NULL); + (ClientData) NULL, (void (*)(int *))NULL); /* * from tclXfilecmds.c */ Tcl_CreateCommand (interp, "pipe", Tcl_PipeCmd, - (ClientData) NULL, (void (*)())NULL); + (ClientData) NULL, (void (*)(int *))NULL); Tcl_CreateCommand (interp, "copyfile", Tcl_CopyfileCmd, - (ClientData) NULL, (void (*)())NULL); + (ClientData) NULL, (void (*)(int *))NULL); Tcl_CreateCommand (interp, "fstat", Tcl_FstatCmd, - (ClientData) NULL, (void (*)())NULL); + (ClientData) NULL, (void (*)(int *))NULL); Tcl_CreateCommand (interp, "lgets", Tcl_LgetsCmd, - (ClientData) NULL, (void (*)())NULL); + (ClientData) NULL, (void (*)(int *))NULL); Tcl_CreateCommand (interp, "flock", Tcl_FlockCmd, - (ClientData) NULL, (void (*)())NULL); + (ClientData) NULL, (void (*)(int *))NULL); Tcl_CreateCommand (interp, "funlock", Tcl_FunlockCmd, - (ClientData) NULL, (void (*)())NULL); + (ClientData) NULL, (void (*)(int *))NULL); /* * from tclXfilescan.c @@ -134,90 +134,90 @@ Tcl_CreateExtendedInterp () * from tclXfmath.c */ Tcl_CreateCommand(interp, "acos", Tcl_AcosCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "asin", Tcl_AsinCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "atan", Tcl_AtanCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "cos", Tcl_CosCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "sin", Tcl_SinCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "tan", Tcl_TanCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "cosh", Tcl_CoshCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "sinh", Tcl_SinhCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "tanh", Tcl_TanhCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "exp", Tcl_ExpCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "log", Tcl_LogCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "log10", Tcl_Log10Cmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "sqrt", Tcl_SqrtCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "fabs", Tcl_FabsCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "floor", Tcl_FloorCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "ceil", Tcl_CeilCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "fmod", Tcl_FmodCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "pow", Tcl_PowCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); /* * from tclXgeneral.c */ Tcl_CreateCommand(interp, "echo", Tcl_EchoCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "infox", Tcl_InfoxCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "loop", Tcl_LoopCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); /* * from tclXid.c */ Tcl_CreateCommand (interp, "id", Tcl_IdCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); /* * from tclXkeylist.c */ Tcl_CreateCommand(interp, "keyldel", Tcl_KeyldelCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "keylget", Tcl_KeylgetCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "keylkeys", Tcl_KeylkeysCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "keylset", Tcl_KeylsetCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); /* * from tclXlist.c */ Tcl_CreateCommand(interp, "lvarcat", Tcl_LvarcatCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "lvarpop", Tcl_LvarpopCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "lvarpush", Tcl_LvarpushCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "lempty", Tcl_LemptyCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); /* * from tclXmath.c */ Tcl_CreateCommand (interp, "max", Tcl_MaxCmd, (ClientData)NULL, - (void (*)())NULL); + (void (*)(int *))NULL); Tcl_CreateCommand (interp, "min", Tcl_MinCmd, (ClientData)NULL, - (void (*)())NULL); + (void (*)(int *))NULL); Tcl_CreateCommand (interp, "random", Tcl_RandomCmd, (ClientData)NULL, - (void (*)())NULL); + (void (*)(int *))NULL); /* * from tclXmsgcat.c @@ -228,11 +228,11 @@ Tcl_CreateExtendedInterp () * from tclXprocess.c */ Tcl_CreateCommand (interp, "execl", Tcl_ExeclCmd, (ClientData)NULL, - (void (*)())NULL); + (void (*)(int *))NULL); Tcl_CreateCommand (interp, "fork", Tcl_ForkCmd, (ClientData)NULL, - (void (*)())NULL); + (void (*)(int *))NULL); Tcl_CreateCommand (interp, "wait", Tcl_WaitCmd, (ClientData)NULL, - (void (*)())NULL); + (void (*)(int *))NULL); /* * from tclXprofile.c @@ -243,7 +243,7 @@ Tcl_CreateExtendedInterp () * from tclXselect.c */ Tcl_CreateCommand (interp, "select", Tcl_SelectCmd, - (ClientData) NULL, (void (*)())NULL); + (ClientData) NULL, (void (*)(int *))NULL); /* * from tclXsignal.c @@ -254,49 +254,49 @@ Tcl_CreateExtendedInterp () * from tclXstring.c */ Tcl_CreateCommand(interp, "cindex", Tcl_CindexCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "clength", Tcl_ClengthCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "crange", Tcl_CrangeCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "csubstr", Tcl_CrangeCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand(interp, "replicate", Tcl_ReplicateCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand (interp, "translit", Tcl_TranslitCmd, (ClientData)NULL, - (void (*)())NULL); + (void (*)(int *))NULL); Tcl_CreateCommand (interp, "ctype", Tcl_CtypeCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); /* * from tclXlib.c */ Tcl_CreateCommand (interp, "demand_load", Tcl_Demand_loadCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); Tcl_CreateCommand (interp, "loadlibindex", Tcl_LoadlibindexCmd, - (ClientData)NULL, (void (*)())NULL); + (ClientData)NULL, (void (*)(int *))NULL); /* * from tclXunixcmds.c */ Tcl_CreateCommand (interp, "system", Tcl_SystemCmd, (ClientData)NULL, - (void (*)())NULL); + (void (*)(int *))NULL); Tcl_CreateCommand (interp, "times", Tcl_TimesCmd, (ClientData)NULL, - (void (*)())NULL); + (void (*)(int *))NULL); Tcl_CreateCommand (interp, "umask", Tcl_UmaskCmd, (ClientData)NULL, - (void (*)())NULL); + (void (*)(int *))NULL); Tcl_CreateCommand (interp, "link", Tcl_LinkCmd, (ClientData)NULL, - (void (*)())NULL); + (void (*)(int *))NULL); Tcl_CreateCommand (interp, "unlink", Tcl_UnlinkCmd, (ClientData)NULL, - (void (*)())NULL); + (void (*)(int *))NULL); Tcl_CreateCommand (interp, "mkdir", Tcl_MkdirCmd, (ClientData)NULL, - (void (*)())NULL); + (void (*)(int *))NULL); Tcl_CreateCommand (interp, "rmdir", Tcl_RmdirCmd, (ClientData)NULL, - (void (*)())NULL); + (void (*)(int *))NULL); Tcl_CreateCommand (interp, "alarm", Tcl_AlarmCmd, (ClientData)NULL, - (void (*)())NULL); + (void (*)(int *))NULL); Tcl_CreateCommand (interp, "sleep", Tcl_SleepCmd, (ClientData)NULL, - (void (*)())NULL); + (void (*)(int *))NULL); return interp; } diff --git a/src/tclx/src/tclxdebg.c b/src/tclx/src/tclxdebg.c index 55e2590..882e6e8 100644 --- a/src/tclx/src/tclxdebg.c +++ b/src/tclx/src/tclxdebg.c @@ -78,11 +78,8 @@ CleanUpDebug _ANSI_ARGS_((ClientData clientData)); * *----------------------------------------------------------------------------- */ -void -PrintStr (filePtr, string, numChars) - FILE *filePtr; - char *string; - int numChars; +void +PrintStr (FILE *filePtr, char *string, int numChars) { int idx; @@ -107,11 +104,8 @@ PrintStr (filePtr, string, numChars) * *----------------------------------------------------------------------------- */ -void -PrintArg (filePtr, argStr, noTruncate) - FILE *filePtr; - char *argStr; - int noTruncate; +void +PrintArg (FILE *filePtr, char *argStr, int noTruncate) { int idx, argLen, printLen; int quote_it; @@ -145,13 +139,8 @@ PrintArg (filePtr, argStr, noTruncate) * *----------------------------------------------------------------------------- */ -void -TraceCode (traceInfoPtr, level, command, argc, argv) - traceInfo_pt traceInfoPtr; - int level; - char *command; - int argc; - char **argv; +void +TraceCode (traceInfo_pt traceInfoPtr, int level, char *command, int argc, char **argv) { int idx, cmdLen, printLen; @@ -192,16 +181,16 @@ TraceCode (traceInfoPtr, level, command, argc, argv) *----------------------------------------------------------------------------- */ void -CmdTraceRoutine (clientData, interp, level, command, cmdProc, cmdClientData, - argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int level; - char *command; - Tcl_CmdProc *cmdProc; - ClientData cmdClientData; - int argc; - char **argv; +CmdTraceRoutine ( + ClientData clientData, + Tcl_Interp *interp, + int level, + char *command, + Tcl_CmdProc *cmdProc, + ClientData cmdClientData, + int argc, + char **argv +) { Interp *iPtr = (Interp *) interp; traceInfo_pt traceInfoPtr = (traceInfo_pt) clientData; @@ -233,11 +222,12 @@ CmdTraceRoutine (clientData, interp, level, command, cmdProc, cmdClientData, *----------------------------------------------------------------------------- */ static int -Tcl_CmdtraceCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_CmdtraceCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { Interp *iPtr = (Interp *) interp; traceInfo_pt infoPtr = (traceInfo_pt) clientData; @@ -364,8 +354,9 @@ invalidOption: *----------------------------------------------------------------------------- */ void -CleanUpDebug (clientData) - ClientData clientData; +CleanUpDebug ( + ClientData clientData +) { traceInfo_pt infoPtr = (traceInfo_pt) clientData; @@ -383,9 +374,8 @@ CleanUpDebug (clientData) * *----------------------------------------------------------------------------- */ -void -Tcl_InitDebug (interp) - Tcl_Interp *interp; +void +Tcl_InitDebug (Tcl_Interp *interp) { traceInfo_pt infoPtr; diff --git a/src/tclx/src/tclxdup.c b/src/tclx/src/tclxdup.c index 1e3d32b..aa68eea 100644 --- a/src/tclx/src/tclxdup.c +++ b/src/tclx/src/tclxdup.c @@ -47,9 +47,7 @@ DoSpecialDup _ANSI_ARGS_((Tcl_Interp *interp, *----------------------------------------------------------------------------- */ static OpenFile * -DoNormalDup (interp, oldFilePtr) - Tcl_Interp *interp; - OpenFile *oldFilePtr; +DoNormalDup (Tcl_Interp *interp, OpenFile *oldFilePtr) { Interp *iPtr = (Interp *) interp; int newFileId; @@ -91,10 +89,7 @@ unixError: *----------------------------------------------------------------------------- */ static OpenFile * -DoSpecialDup (interp, oldFilePtr, newHandleName) - Tcl_Interp *interp; - OpenFile *oldFilePtr; - char *newHandleName; +DoSpecialDup (Tcl_Interp *interp, OpenFile *oldFilePtr, char *newHandleName) { Interp *iPtr = (Interp *) interp; int newFileId; @@ -198,11 +193,12 @@ unixError: *----------------------------------------------------------------------------- */ int -Tcl_DupCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_DupCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { OpenFile *oldFilePtr, *newFilePtr; long seekOffset = -1; diff --git a/src/tclx/src/tclxfcmd.c b/src/tclx/src/tclxfcmd.c index a8d2772..360f76c 100644 --- a/src/tclx/src/tclxfcmd.c +++ b/src/tclx/src/tclxfcmd.c @@ -66,11 +66,12 @@ ParseLockUnlockArgs _ANSI_ARGS_((Tcl_Interp *interp, *----------------------------------------------------------------------------- */ int -Tcl_PipeCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_PipeCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { Interp *iPtr = (Interp *) interp; int fileIds [2]; @@ -125,11 +126,12 @@ errorExit: *----------------------------------------------------------------------------- */ int -Tcl_CopyfileCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_CopyfileCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { OpenFile *fromFilePtr, *toFilePtr; char transferBuffer [2048]; @@ -191,8 +193,9 @@ unixError: *----------------------------------------------------------------------------- */ static char * -GetFileType (statBufPtr) - struct stat *statBufPtr; +GetFileType ( + struct stat *statBufPtr +) { char *typeStr; @@ -234,10 +237,11 @@ GetFileType (statBufPtr) *----------------------------------------------------------------------------- */ static void -ReturnStatList (interp, filePtr, statBufPtr) - Tcl_Interp *interp; - OpenFile *filePtr; - struct stat *statBufPtr; +ReturnStatList ( + Tcl_Interp *interp, + OpenFile *filePtr, + struct stat *statBufPtr +) { char statList [200]; @@ -273,11 +277,12 @@ ReturnStatList (interp, filePtr, statBufPtr) *----------------------------------------------------------------------------- */ static int -ReturnStatArray (interp, filePtr, statBufPtr, arrayName) - Tcl_Interp *interp; - OpenFile *filePtr; - struct stat *statBufPtr; - char *arrayName; +ReturnStatArray ( + Tcl_Interp *interp, + OpenFile *filePtr, + struct stat *statBufPtr, + char *arrayName +) { char numBuf [30]; @@ -361,11 +366,12 @@ ReturnStatArray (interp, filePtr, statBufPtr, arrayName) *----------------------------------------------------------------------------- */ static int -ReturnStatItem (interp, filePtr, statBufPtr, itemName) - Tcl_Interp *interp; - OpenFile *filePtr; - struct stat *statBufPtr; - char *itemName; +ReturnStatItem ( + Tcl_Interp *interp, + OpenFile *filePtr, + struct stat *statBufPtr, + char *itemName +) { if (STREQU (itemName, "dev")) sprintf (interp->result, "%d", statBufPtr->st_dev); @@ -414,11 +420,12 @@ ReturnStatItem (interp, filePtr, statBufPtr, itemName) *----------------------------------------------------------------------------- */ int -Tcl_FstatCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_FstatCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { OpenFile *filePtr; struct stat statBuf; @@ -473,11 +480,12 @@ Tcl_FstatCmd (clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_LgetsCmd (notUsed, interp, argc, argv) - ClientData notUsed; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_LgetsCmd ( + ClientData notUsed, + Tcl_Interp *interp, + int argc, + char **argv +) { dynamicBuf_t dynBuf; char prevChar; @@ -599,14 +607,8 @@ errorExit: * *----------------------------------------------------------------------------- */ -static int -ParseLockUnlockArgs (interp, argc, argv, argIdx, filePtrPtr, lockInfoPtr) - Tcl_Interp *interp; - int argc; - char **argv; - int argIdx; - OpenFile **filePtrPtr; - struct flock *lockInfoPtr; +static int +ParseLockUnlockArgs (Tcl_Interp *interp, int argc, char **argv, int argIdx, OpenFile **filePtrPtr, struct flock *lockInfoPtr) { lockInfoPtr->l_start = 0; @@ -665,11 +667,12 @@ ParseLockUnlockArgs (interp, argc, argv, argIdx, filePtrPtr, lockInfoPtr) *----------------------------------------------------------------------------- */ int -Tcl_FlockCmd (notUsed, interp, argc, argv) - ClientData notUsed; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_FlockCmd ( + ClientData notUsed, + Tcl_Interp *interp, + int argc, + char **argv +) { int argIdx, stat; int readLock = FALSE, writeLock = FALSE, noWaitLock = FALSE; @@ -780,11 +783,12 @@ Tcl_FlockCmd (notUsed, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_FunlockCmd (notUsed, interp, argc, argv) - ClientData notUsed; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_FunlockCmd ( + ClientData notUsed, + Tcl_Interp *interp, + int argc, + char **argv +) { OpenFile *filePtr; struct flock lockInfo; diff --git a/src/tclx/src/tclxfctl.c b/src/tclx/src/tclxfctl.c index 0cbcb15..b26dafe 100644 --- a/src/tclx/src/tclxfctl.c +++ b/src/tclx/src/tclxfctl.c @@ -84,12 +84,8 @@ SetFcntlAttr _ANSI_ARGS_((Tcl_Interp *interp, * Returns TCL_OK if all is well, TCL_ERROR if there is an error. *----------------------------------------------------------------------------- */ -static int -XlateFcntlAttr (interp, attrName, fcntlAttrPtr, otherAttrPtr) - Tcl_Interp *interp; - char *attrName; - int *fcntlAttrPtr; - int *otherAttrPtr; +static int +XlateFcntlAttr (Tcl_Interp *interp, char *attrName, int *fcntlAttrPtr, int *otherAttrPtr) { char attrNameUp [MAX_ATTR_NAME_LEN]; @@ -169,11 +165,8 @@ XlateFcntlAttr (interp, attrName, fcntlAttrPtr, otherAttrPtr) * Returns TCL_OK if all is well, TCL_ERROR if fcntl returns an error. *----------------------------------------------------------------------------- */ -static int -GetFcntlAttr (interp, filePtr, attrName) - Tcl_Interp *interp; - OpenFile *filePtr; - char *attrName; +static int +GetFcntlAttr (Tcl_Interp *interp, OpenFile *filePtr, char *attrName) { int fcntlAttr, otherAttr, current; @@ -246,12 +239,8 @@ unixError: * Returns TCL_OK if all is well, TCL_ERROR if there is an error. *----------------------------------------------------------------------------- */ -static int -SetFcntlAttr (interp, filePtr, attrName, valueStr) - Tcl_Interp *interp; - OpenFile *filePtr; - char *attrName; - char *valueStr; +static int +SetFcntlAttr (Tcl_Interp *interp, OpenFile *filePtr, char *attrName, char *valueStr) { int fcntlAttr, otherAttr, current, setValue; @@ -325,11 +314,12 @@ SetFcntlAttr (interp, filePtr, attrName, valueStr) *----------------------------------------------------------------------------- */ int -Tcl_FcntlCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_FcntlCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { OpenFile *filePtr; diff --git a/src/tclx/src/tclxfmat.c b/src/tclx/src/tclxfmat.c index 2146566..2a02b17 100644 --- a/src/tclx/src/tclxfmat.c +++ b/src/tclx/src/tclxfmat.c @@ -51,7 +51,7 @@ static int Tcl_UnaryFloatFunction _ANSI_ARGS_((Tcl_Interp *interp, int argc, char **argv, - double (*function)())); + double (*function)(double))); #ifdef TCL_IEEE_FP_MATH @@ -75,10 +75,8 @@ Tcl_UnaryFloatFunction _ANSI_ARGS_((Tcl_Interp *interp, * argument to `return'. *----------------------------------------------------------------------------- */ -static int -ReturnIEEEMathError (interp, dbResult) - Tcl_Interp *interp; - double dbResult; +static int +ReturnIEEEMathError (Tcl_Interp *interp, double dbResult) { char *errorMsg; @@ -115,9 +113,8 @@ ReturnIEEEMathError (interp, dbResult) * argument to `return'. *----------------------------------------------------------------------------- */ -static int -ReturnFPMathError (interp) - Tcl_Interp *interp; +static int +ReturnFPMathError (Tcl_Interp *interp) { Tcl_AppendResult (interp, "floating point error", @@ -150,10 +147,8 @@ ReturnFPMathError (interp) * *----------------------------------------------------------------------------- */ -int -Tcl_MathError (functionName, errorType) - char *functionName; - int errorType; +int +Tcl_MathError (char *functionName, int errorType) { if (G_inTclFPMath) { @@ -183,12 +178,8 @@ Tcl_MathError (functionName, errorType) * *----------------------------------------------------------------------------- */ -static int -Tcl_UnaryFloatFunction(interp, argc, argv, function) - Tcl_Interp *interp; - int argc; - char **argv; - double (*function)(); +static int +Tcl_UnaryFloatFunction (Tcl_Interp *interp, int argc, char **argv, double (*function)(double)) { double dbVal, dbResult; @@ -232,11 +223,12 @@ Tcl_UnaryFloatFunction(interp, argc, argv, function) *----------------------------------------------------------------------------- */ int -Tcl_AcosCmd(clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_AcosCmd( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { return Tcl_UnaryFloatFunction(interp, argc, argv, acos); } @@ -254,11 +246,12 @@ Tcl_AcosCmd(clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_AsinCmd(clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_AsinCmd( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { return Tcl_UnaryFloatFunction(interp, argc, argv, asin); } @@ -276,11 +269,12 @@ Tcl_AsinCmd(clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_AtanCmd(clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_AtanCmd( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { return Tcl_UnaryFloatFunction(interp, argc, argv, atan); } @@ -298,11 +292,12 @@ Tcl_AtanCmd(clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_CosCmd(clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_CosCmd( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { return Tcl_UnaryFloatFunction(interp, argc, argv, cos); } @@ -320,11 +315,12 @@ Tcl_CosCmd(clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_SinCmd(clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_SinCmd( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { return Tcl_UnaryFloatFunction(interp, argc, argv, sin); } @@ -342,11 +338,12 @@ Tcl_SinCmd(clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_TanCmd(clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_TanCmd( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { return Tcl_UnaryFloatFunction(interp, argc, argv, tan); } @@ -364,11 +361,12 @@ Tcl_TanCmd(clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_CoshCmd(clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_CoshCmd( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { return Tcl_UnaryFloatFunction(interp, argc, argv, cosh); } @@ -386,11 +384,12 @@ Tcl_CoshCmd(clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_SinhCmd(clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_SinhCmd( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { return Tcl_UnaryFloatFunction(interp, argc, argv, sinh); } @@ -408,11 +407,12 @@ Tcl_SinhCmd(clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_TanhCmd(clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_TanhCmd( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { return Tcl_UnaryFloatFunction(interp, argc, argv, tanh); } @@ -430,11 +430,12 @@ Tcl_TanhCmd(clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_ExpCmd(clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_ExpCmd( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { return Tcl_UnaryFloatFunction(interp, argc, argv, exp); } @@ -452,11 +453,12 @@ Tcl_ExpCmd(clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_LogCmd(clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_LogCmd( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { return Tcl_UnaryFloatFunction(interp, argc, argv, log); } @@ -474,11 +476,12 @@ Tcl_LogCmd(clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_Log10Cmd(clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_Log10Cmd( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { return Tcl_UnaryFloatFunction(interp, argc, argv, log10); } @@ -496,11 +499,12 @@ Tcl_Log10Cmd(clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_SqrtCmd(clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_SqrtCmd( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { return Tcl_UnaryFloatFunction(interp, argc, argv, sqrt); } @@ -518,11 +522,12 @@ Tcl_SqrtCmd(clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_FabsCmd(clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_FabsCmd( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { return Tcl_UnaryFloatFunction(interp, argc, argv, fabs); } @@ -540,11 +545,12 @@ Tcl_FabsCmd(clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_FloorCmd(clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_FloorCmd( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { return Tcl_UnaryFloatFunction(interp, argc, argv, floor); } @@ -562,11 +568,12 @@ Tcl_FloorCmd(clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_CeilCmd(clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_CeilCmd( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { return Tcl_UnaryFloatFunction(interp, argc, argv, ceil); } @@ -584,11 +591,12 @@ Tcl_CeilCmd(clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_FmodCmd(clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_FmodCmd( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { double dbVal, dbDivisor, dbResult; @@ -635,11 +643,12 @@ Tcl_FmodCmd(clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_PowCmd(clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_PowCmd( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { double dbVal, dbExp, dbResult; diff --git a/src/tclx/src/tclxfsca.c b/src/tclx/src/tclxfsca.c index 6e2f171..90bd133 100644 --- a/src/tclx/src/tclxfsca.c +++ b/src/tclx/src/tclxfsca.c @@ -95,10 +95,8 @@ FileScanCleanUp _ANSI_ARGS_((ClientData clientData)); * entry. The entry itself is not released. *----------------------------------------------------------------------------- */ -static int -CleanUpContext (scanGlobPtr, contextPtr) - scanGlob_pt scanGlobPtr; - scanContext_pt contextPtr; +static int +CleanUpContext (scanGlob_pt scanGlobPtr, scanContext_pt contextPtr) { matchDef_pt matchPtr, oldMatchPtr; @@ -128,10 +126,8 @@ CleanUpContext (scanGlobPtr, contextPtr) * *----------------------------------------------------------------------------- */ -static int -CreateScanContext (interp, scanGlobPtr) - Tcl_Interp *interp; - scanGlob_pt scanGlobPtr; +static int +CreateScanContext (Tcl_Interp *interp, scanGlob_pt scanGlobPtr) { scanContext_pt contextPtr; @@ -155,11 +151,8 @@ CreateScanContext (interp, scanGlobPtr) * *----------------------------------------------------------------------------- */ -static int -DeleteScanContext (interp, scanGlobPtr, contextHandle) - Tcl_Interp *interp; - scanGlob_pt scanGlobPtr; - char *contextHandle; +static int +DeleteScanContext (Tcl_Interp *interp, scanGlob_pt scanGlobPtr, char *contextHandle) { scanContext_pt contextPtr; @@ -187,12 +180,8 @@ DeleteScanContext (interp, scanGlobPtr, contextHandle) * *----------------------------------------------------------------------------- */ -static int -Tcl_ScancontextCmd (clientData, interp, argc, argv) - char *clientData; - Tcl_Interp *interp; - int argc; - char **argv; +static int +Tcl_ScancontextCmd (int *clientData, Tcl_Interp *interp, int argc, char **argv) { scanGlob_pt scanGlobPtr = (scanGlob_pt) clientData; @@ -243,12 +232,8 @@ Tcl_ScancontextCmd (clientData, interp, argc, argv) * *----------------------------------------------------------------------------- */ -static int -Tcl_ScanmatchCmd (clientData, interp, argc, argv) - char *clientData; - Tcl_Interp *interp; - int argc; - char **argv; +static int +Tcl_ScanmatchCmd (int *clientData, Tcl_Interp *interp, int argc, char **argv) { scanGlob_pt scanGlobPtr = (scanGlob_pt) clientData; scanContext_pt contextPtr; @@ -344,13 +329,8 @@ argError: * *----------------------------------------------------------------------------- */ -static int -SetMatchVar (interp, fileLine, fileOffset, scanLineNum, fileHandle) - Tcl_Interp *interp; - char *fileLine; - long fileOffset; - long scanLineNum; - char *fileHandle; +static int +SetMatchVar (Tcl_Interp *interp, char *fileLine, long fileOffset, long scanLineNum, char *fileHandle) { char numBuf [20]; @@ -386,12 +366,8 @@ SetMatchVar (interp, fileLine, fileOffset, scanLineNum, fileHandle) * *----------------------------------------------------------------------------- */ -static int -Tcl_ScanfileCmd (clientData, interp, argc, argv) - char *clientData; - Tcl_Interp *interp; - int argc; - char **argv; +static int +Tcl_ScanfileCmd (int *clientData, Tcl_Interp *interp, int argc, char **argv) { scanGlob_pt scanGlobPtr = (scanGlob_pt) clientData; scanContext_pt contextPtr; @@ -528,8 +504,9 @@ scanExit: *----------------------------------------------------------------------------- */ static void -FileScanCleanUp (clientData) - ClientData clientData; +FileScanCleanUp ( + ClientData clientData +) { scanGlob_pt scanGlobPtr = (scanGlob_pt) clientData; scanContext_pt contextPtr; @@ -556,9 +533,8 @@ FileScanCleanUp (clientData) * *----------------------------------------------------------------------------- */ -void -Tcl_InitFilescan (interp) -Tcl_Interp *interp; +void +Tcl_InitFilescan (Tcl_Interp *interp) { scanGlob_pt scanGlobPtr; void_pt fileCbTblPtr; diff --git a/src/tclx/src/tclxgdat.y b/src/tclx/src/tclxgdat.y index 2439a2f..e4608aa 100644 --- a/src/tclx/src/tclxgdat.y +++ b/src/tclx/src/tclxgdat.y @@ -43,15 +43,9 @@ static int month, day, year; static int ourzone; -#if 0 static time_t timeconv(int hh, int mm, int ss, int mer); static time_t daylcorr(time_t future, time_t now); static int lookup(char *id); -#else - static time_t timeconv(); - static time_t daylcorr(); - static int lookup(); -#endif #define AM 1 #define PM 2 @@ -146,15 +140,13 @@ static int mdays[12] = {31, 0, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; #define epoch 1970 -extern struct tm *localtime(); +extern struct tm *localtime(const time_t*); static -time_t dateconv(mm, dd, yy, h, m, s, mer, zone, dayflag) -int mm, dd, yy, h, m, s, mer, zone, dayflag; +time_t dateconv(int mm, int dd, int yy, int h, int m, int s, int mer, int zone, int dayflag) { time_t tod, jdate; register int i; - time_t timeconv(); if (yy < 0) yy = -yy; if (yy < 100) yy += 1900; @@ -174,11 +166,10 @@ int mm, dd, yy, h, m, s, mer, zone, dayflag; } static -time_t dayconv(ord, day, now) int ord, day; time_t now; +time_t dayconv(int ord, int day, time_t now) { register struct tm *loctime; time_t tod; - time_t daylcorr(); tod = now; loctime = localtime(&tod); @@ -188,7 +179,7 @@ time_t dayconv(ord, day, now) int ord, day; time_t now; } static -time_t timeconv(hh, mm, ss, mer) register int hh, mm, ss, mer; +time_t timeconv(register int hh, register int mm, register int ss, register int mer) { if (mm < 0 || mm > 59 || ss < 0 || ss > 59) return (-1); switch (mer) { @@ -203,11 +194,9 @@ time_t timeconv(hh, mm, ss, mer) register int hh, mm, ss, mer; } static -time_t monthadd(sdate, relmonth) time_t sdate, relmonth; +time_t monthadd(time_t sdate, time_t relmonth) { struct tm *ltime; - time_t dateconv(); - time_t daylcorr(); int mm, yy; if (relmonth == 0) return 0; @@ -220,7 +209,7 @@ time_t monthadd(sdate, relmonth) time_t sdate, relmonth; } static -time_t daylcorr(future, now) time_t future, now; +time_t daylcorr(time_t future, time_t now) { int fdayl, nowdayl; @@ -463,7 +452,7 @@ struct table milzone[] = { {0, 0, 0}}; static -int lookup(id) char *id; +int lookup(char *id) { #define gotit (yylval=i->value, i->type) #define getid for(j=idvar, k=id; *j++ = *k++; ) @@ -524,13 +513,13 @@ int lookup(id) char *id; } time_t -Tcl_GetDate (p, now, zone) - char *p; - time_t now; - long zone; +Tcl_GetDate ( + char *p, + time_t now, + long zone +) { #define mcheck(f) if (f>1) err++ - time_t monthadd(); int err; struct tm *lt; time_t sdate, tod; @@ -585,7 +574,6 @@ Tcl_GetDate (p, now, zone) */ void -yyerror(msg) - const char *msg; +yyerror(const char *msg) { } diff --git a/src/tclx/src/tclxgenl.c b/src/tclx/src/tclxgenl.c index b0dd07e..ad47af3 100644 --- a/src/tclx/src/tclxgenl.c +++ b/src/tclx/src/tclxgenl.c @@ -43,11 +43,12 @@ char *tclAppVersion = NULL; /* Version number of the application */ *----------------------------------------------------------------------------- */ int -Tcl_EchoCmd(clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_EchoCmd( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { int idx; @@ -70,11 +71,12 @@ Tcl_EchoCmd(clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_InfoxCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_InfoxCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { if (argc != 2) { Tcl_AppendResult (interp, tclXWrongArgs, argv [0], @@ -119,11 +121,12 @@ Tcl_InfoxCmd (clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_LoopCmd (dummy, interp, argc, argv) - ClientData dummy; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_LoopCmd ( + ClientData dummy, + Tcl_Interp *interp, + int argc, + char **argv +) { int result = TCL_OK; long i, first, limit, incr = 1; diff --git a/src/tclx/src/tclxhndl.c b/src/tclx/src/tclxhndl.c index 81d4cab..3f12956 100644 --- a/src/tclx/src/tclxhndl.c +++ b/src/tclx/src/tclxhndl.c @@ -96,11 +96,8 @@ HandleDecode _ANSI_ARGS_((Tcl_Interp *interp, * o numEntries (I) - The number of new entries. *----------------------------------------------------------------------------- */ -static void -LinkInNewEntries (tblHdrPtr, newIdx, numEntries) - tblHeader_pt tblHdrPtr; - int newIdx; - int numEntries; +static void +LinkInNewEntries (tblHeader_pt tblHdrPtr, int newIdx, int numEntries) { int entIdx, lastIdx; entryHeader_pt entryPtr; @@ -127,10 +124,8 @@ LinkInNewEntries (tblHdrPtr, newIdx, numEntries) * entries specified on table creation. MUST be smaller than this size. *----------------------------------------------------------------------------- */ -static void -ExpandTable (tblHdrPtr, neededIdx) - tblHeader_pt tblHdrPtr; - int neededIdx; +static void +ExpandTable (tblHeader_pt tblHdrPtr, int neededIdx) { ubyte_pt oldBodyP = tblHdrPtr->bodyP; int numNewEntries; @@ -161,10 +156,8 @@ ExpandTable (tblHdrPtr, neededIdx) * The a pointer to the entry. *----------------------------------------------------------------------------- */ -static entryHeader_pt -AllocEntry (tblHdrPtr, entryIdxPtr) - tblHeader_pt tblHdrPtr; - int *entryIdxPtr; +static entryHeader_pt +AllocEntry (tblHeader_pt tblHdrPtr, int *entryIdxPtr) { int entryIdx; entryHeader_pt entryPtr; @@ -195,11 +188,8 @@ AllocEntry (tblHdrPtr, entryIdxPtr) * occured. *----------------------------------------------------------------------------- */ -static int -HandleDecode (interp, tblHdrPtr, handle) - Tcl_Interp *interp; - tblHeader_pt tblHdrPtr; - CONST char *handle; +static int +HandleDecode (Tcl_Interp *interp, tblHeader_pt tblHdrPtr, CONST char *handle) { unsigned entryIdx; @@ -228,11 +218,8 @@ HandleDecode (interp, tblHdrPtr, handle) * A pointer to the table header. *----------------------------------------------------------------------------- */ -void_pt -Tcl_HandleTblInit (handleBase, entrySize, initEntries) - CONST char *handleBase; - int entrySize; - int initEntries; +void_pt +Tcl_HandleTblInit (CONST char *handleBase, int entrySize, int initEntries) { tblHeader_pt tblHdrPtr; int baseLength = strlen ((char *) handleBase); @@ -269,10 +256,8 @@ Tcl_HandleTblInit (handleBase, entrySize, initEntries) * The resulting use count. *----------------------------------------------------------------------------- */ -int -Tcl_HandleTblUseCount (headerPtr, amount) - void_pt headerPtr; - int amount; +int +Tcl_HandleTblUseCount (void_pt headerPtr, int amount) { tblHeader_pt tblHdrPtr = (tblHeader_pt)headerPtr; @@ -289,9 +274,8 @@ Tcl_HandleTblUseCount (headerPtr, amount) * o headerPtr (I) - Pointer to the table header. *----------------------------------------------------------------------------- */ -void -Tcl_HandleTblRelease (headerPtr) - void_pt headerPtr; +void +Tcl_HandleTblRelease (void_pt headerPtr) { tblHeader_pt tblHdrPtr = (tblHeader_pt)headerPtr; @@ -314,10 +298,8 @@ Tcl_HandleTblRelease (headerPtr) * A pointer to the allocated entry (user part). *----------------------------------------------------------------------------- */ -void_pt -Tcl_HandleAlloc (headerPtr, handlePtr) - void_pt headerPtr; - char *handlePtr; +void_pt +Tcl_HandleAlloc (void_pt headerPtr, char *handlePtr) { tblHeader_pt tblHdrPtr = (tblHeader_pt)headerPtr; entryHeader_pt entryPtr; @@ -342,11 +324,8 @@ Tcl_HandleAlloc (headerPtr, handlePtr) * A pointer to the entry, or NULL if an error occured. *----------------------------------------------------------------------------- */ -void_pt -Tcl_HandleXlate (interp, headerPtr, handle) - Tcl_Interp *interp; - void_pt headerPtr; - CONST char *handle; +void_pt +Tcl_HandleXlate (Tcl_Interp *interp, void_pt headerPtr, CONST char *handle) { tblHeader_pt tblHdrPtr = (tblHeader_pt)headerPtr; entryHeader_pt entryPtr; @@ -381,10 +360,8 @@ Tcl_HandleXlate (interp, headerPtr, handle) * A pointer to the next allocated entry, or NULL if there are not more. *----------------------------------------------------------------------------- */ -void_pt -Tcl_HandleWalk (headerPtr, walkKeyPtr) - void_pt headerPtr; - int *walkKeyPtr; +void_pt +Tcl_HandleWalk (void_pt headerPtr, int *walkKeyPtr) { tblHeader_pt tblHdrPtr = (tblHeader_pt)headerPtr; int entryIdx; @@ -418,11 +395,8 @@ Tcl_HandleWalk (headerPtr, walkKeyPtr) * hold the name. *----------------------------------------------------------------------------- */ -void -Tcl_WalkKeyToHandle (headerPtr, walkKey, handlePtr) - void_pt headerPtr; - int walkKey; - char *handlePtr; +void +Tcl_WalkKeyToHandle (void_pt headerPtr, int walkKey, char *handlePtr) { tblHeader_pt tblHdrPtr = (tblHeader_pt)headerPtr; @@ -439,10 +413,8 @@ Tcl_WalkKeyToHandle (headerPtr, walkKey, handlePtr) * o entryPtr (I) - Entry to free. *----------------------------------------------------------------------------- */ -void -Tcl_HandleFree (headerPtr, entryPtr) - void_pt headerPtr; - void_pt entryPtr; +void +Tcl_HandleFree (void_pt headerPtr, void_pt entryPtr) { tblHeader_pt tblHdrPtr = (tblHeader_pt)headerPtr; entryHeader_pt freeentryPtr; diff --git a/src/tclx/src/tclxid.c b/src/tclx/src/tclxid.c index 730c4ef..0aaacb6 100644 --- a/src/tclx/src/tclxid.c +++ b/src/tclx/src/tclxid.c @@ -73,10 +73,8 @@ GroupnameToGroupidResult _ANSI_ARGS_((Tcl_Interp *interp, *----------------------------------------------------------------------------- */ -static int -UseridToUsernameResult (interp, userId) - Tcl_Interp *interp; - int userId; +static int +UseridToUsernameResult (Tcl_Interp *interp, int userId) { struct passwd *pw = getpwuid (userId); if (pw == NULL) { @@ -90,10 +88,8 @@ UseridToUsernameResult (interp, userId) return TCL_OK; } -static int -UsernameToUseridResult (interp, userName) - Tcl_Interp *interp; - char *userName; +static int +UsernameToUseridResult (Tcl_Interp *interp, char *userName) { struct passwd *pw = getpwnam (userName); if (pw == NULL) { @@ -105,10 +101,8 @@ UsernameToUseridResult (interp, userName) return TCL_OK; } -static int -GroupidToGroupnameResult (interp, groupId) - Tcl_Interp *interp; - int groupId; +static int +GroupidToGroupnameResult (Tcl_Interp *interp, int groupId) { struct group *grp = getgrgid (groupId); if (grp == NULL) { @@ -122,10 +116,8 @@ GroupidToGroupnameResult (interp, groupId) return TCL_OK; } -static int -GroupnameToGroupidResult (interp, groupName) - Tcl_Interp *interp; - char *groupName; +static int +GroupnameToGroupidResult (Tcl_Interp *interp, char *groupName) { struct group *grp = getgrnam (groupName); if (grp == NULL) { @@ -138,11 +130,12 @@ GroupnameToGroupidResult (interp, groupName) } int -Tcl_IdCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_IdCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { struct passwd *pw; struct group *grp; diff --git a/src/tclx/src/tclxint.h b/src/tclx/src/tclxint.h index 5cacb48..198c9b9 100644 --- a/src/tclx/src/tclxint.h +++ b/src/tclx/src/tclxint.h @@ -80,8 +80,8 @@ * These should be take from an include file, but it got to be such a mess * to get the include files right that they are here for good measure. */ -struct tm *gmtime (); -struct tm *localtime (); +struct tm *gmtime (const time_t*); +struct tm *localtime (const time_t*); #ifndef MAXINT # define BITSPERBYTE 8 diff --git a/src/tclx/src/tclxklst.c b/src/tclx/src/tclxklst.c index 109cbda..731e59e 100644 --- a/src/tclx/src/tclxklst.c +++ b/src/tclx/src/tclxklst.c @@ -69,13 +69,8 @@ SplitAndFindField _ANSI_ARGS_((Tcl_Interp *interp, * TCL_ERROR - If the list has an invalid format. *----------------------------------------------------------------------------- */ -static int -CompareKeyListField (interp, fieldName, field, valuePtr, valueSizePtr) - Tcl_Interp *interp; - CONST char *fieldName; - CONST char *field; - char **valuePtr; - int *valueSizePtr; +static int +CompareKeyListField (Tcl_Interp *interp, CONST char *fieldName, CONST char *field, char **valuePtr, int *valueSizePtr) { char *elementPtr, *nextPtr; int fieldNameSize, elementSize; @@ -148,16 +143,12 @@ CompareKeyListField (interp, fieldName, field, valuePtr, valueSizePtr) * Standard Tcl result. *----------------------------------------------------------------------------- */ -static int -SplitAndFindField (interp, fieldName, keyedList, fieldInfoPtr) - Tcl_Interp *interp; - CONST char *fieldName; - CONST char *keyedList; - fieldInfo_t *fieldInfoPtr; +static int +SplitAndFindField (Tcl_Interp *interp, CONST char *fieldName, CONST char *keyedList, fieldInfo_t *fieldInfoPtr) { int idx, result; - if (fieldName == '\0') { + if (fieldName == NULL) { interp->result = "null key not allowed"; return TCL_ERROR; } @@ -220,14 +211,8 @@ errorExit: * TCL_ERROR - If an error occured. *----------------------------------------------------------------------------- */ -int -Tcl_GetKeyedListKeys (interp, subFieldName, keyedList, keyesArgcPtr, - keyesArgvPtr) - Tcl_Interp *interp; - CONST char *subFieldName; - CONST char *keyedList; - int *keyesArgcPtr; - char ***keyesArgvPtr; +int +Tcl_GetKeyedListKeys (Tcl_Interp *interp, CONST char *subFieldName, CONST char *keyedList, int *keyesArgcPtr, char ***keyesArgvPtr) { char *scanPtr, *subFieldList; int result, keyCount, totalKeySize, idx; @@ -330,17 +315,13 @@ Tcl_GetKeyedListKeys (interp, subFieldName, keyedList, keyesArgcPtr, * TCL_ERROR - If an error occured. *----------------------------------------------------------------------------- */ -int -Tcl_GetKeyedListField (interp, fieldName, keyedList, fieldValuePtr) - Tcl_Interp *interp; - CONST char *fieldName; - CONST char *keyedList; - char **fieldValuePtr; +int +Tcl_GetKeyedListField (Tcl_Interp *interp, CONST char *fieldName, CONST char *keyedList, char **fieldValuePtr) { char *nameSeparPtr, *scanPtr, *valuePtr; int valueSize, result; - if (fieldName == '\0') { + if (fieldName == NULL) { interp->result = "null key not allowed"; return TCL_ERROR; } @@ -429,11 +410,7 @@ exitPoint: *----------------------------------------------------------------------------- */ char * -Tcl_SetKeyedListField (interp, fieldName, fieldValue, keyedList) - Tcl_Interp *interp; - CONST char *fieldName; - CONST char *fieldValue; - CONST char *keyedList; +Tcl_SetKeyedListField (Tcl_Interp *interp, CONST char *fieldName, CONST char *fieldValue, CONST char *keyedList) { char *nameSeparPtr; char *newField = NULL, *newList; @@ -526,10 +503,7 @@ errorExit: *----------------------------------------------------------------------------- */ char * -Tcl_DeleteKeyedListField (interp, fieldName, keyedList) - Tcl_Interp *interp; - CONST char *fieldName; - CONST char *keyedList; +Tcl_DeleteKeyedListField (Tcl_Interp *interp, CONST char *fieldName, CONST char *keyedList) { char *nameSeparPtr; char *newList; @@ -617,11 +591,12 @@ errorExit: *---------------------------------------------------------------------------- */ int -Tcl_KeyldelCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_KeyldelCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { char *keyedList, *newList; int listArgc, fieldIdx, idx; @@ -661,11 +636,12 @@ Tcl_KeyldelCmd (clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_KeylgetCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_KeylgetCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { char *keyedList; char *fieldValue; @@ -690,7 +666,7 @@ Tcl_KeylgetCmd (clientData, interp, argc, argv) /* * Handle retrieving a value for a specified key. */ - if (argv [2] == '\0') { + if (argv [2] == NULL) { interp->result = "null key not allowed"; return TCL_ERROR; } @@ -759,11 +735,12 @@ Tcl_KeylgetCmd (clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_KeylkeysCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_KeylkeysCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { char *keyedList, **keyesArgv; int result, keyesArgc; @@ -809,11 +786,12 @@ Tcl_KeylkeysCmd (clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_KeylsetCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_KeylsetCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { char *keyedList, *newList, *prevList; char *varPtr; diff --git a/src/tclx/src/tclxlib.c b/src/tclx/src/tclxlib.c index 61d0a83..43c639e 100644 --- a/src/tclx/src/tclxlib.c +++ b/src/tclx/src/tclxlib.c @@ -157,12 +157,8 @@ LoadProc _ANSI_ARGS_((Tcl_Interp *interp, * A standard Tcl result. *----------------------------------------------------------------------------- */ -static int -EvalFilePart (interp, fileName, offset, length) - Tcl_Interp *interp; - char *fileName; - long offset; - unsigned length; +static int +EvalFilePart (Tcl_Interp *interp, char *fileName, long offset, unsigned length) { Interp *iPtr = (Interp *) interp; int fileNum, result; @@ -254,11 +250,7 @@ EvalFilePart (interp, fileName, offset, length) *----------------------------------------------------------------------------- */ static char * -MakeAbsFile (interp, fileName, buffer, bufferSize) - Tcl_Interp *interp; - char *fileName; - char *buffer; - int bufferSize; +MakeAbsFile (Tcl_Interp *interp, char *fileName, char *buffer, int bufferSize) { char curDir [MAXPATHLEN+1]; char *pathName; @@ -317,11 +309,8 @@ MakeAbsFile (interp, fileName, buffer, bufferSize) * TCL_OK or TCL_ERROR. *----------------------------------------------------------------------------- */ -static int -GenerateFileId (interp, filePath, fileId) - Tcl_Interp *interp; - char *filePath; - fileId_t fileId; +static int +GenerateFileId (Tcl_Interp *interp, char *filePath, fileId_t fileId) { struct stat statInfo; @@ -355,11 +344,8 @@ GenerateFileId (interp, filePath, fileId) * TCL_OK or TCL_ERROR. *----------------------------------------------------------------------------- */ -static int -SetTCLENVFileIdEntry (interp, fileId, filePath) - Tcl_Interp *interp; - fileId_t fileId; - char *filePath; +static int +SetTCLENVFileIdEntry (Tcl_Interp *interp, fileId_t fileId, char *filePath) { if (Tcl_SetVar2 (interp, "TCLENV", fileId, filePath, @@ -383,10 +369,8 @@ SetTCLENVFileIdEntry (interp, fileId, filePath) * TRUE is returned if the entry exists, FALSE if it doesn't. *----------------------------------------------------------------------------- */ -static int -CheckTCLENVFileIdEntry (interp, filePath) - Tcl_Interp *interp; - char *filePath; +static int +CheckTCLENVFileIdEntry (Tcl_Interp *interp, char *filePath) { fileId_t fileId; @@ -422,9 +406,7 @@ CheckTCLENVFileIdEntry (interp, filePath) *----------------------------------------------------------------------------- */ static char * -GetTCLENVFileIdEntry (interp, fileId) - Tcl_Interp *interp; - fileId_t fileId; +GetTCLENVFileIdEntry (Tcl_Interp *interp, fileId_t fileId) { char *filePath; @@ -460,13 +442,8 @@ GetTCLENVFileIdEntry (interp, fileId) * and should be skipped. *----------------------------------------------------------------------------- */ -static int -SetTCLENVPkgEntry (interp, packageName, fileId, offset, length) - Tcl_Interp *interp; - char *packageName; - fileId_t fileId; - char *offset; - char *length; +static int +SetTCLENVPkgEntry (Tcl_Interp *interp, char *packageName, fileId_t fileId, char *offset, char *length) { int nameLen; char indexBuffer [64], *indexPtr; @@ -521,13 +498,8 @@ SetTCLENVPkgEntry (interp, packageName, fileId, offset, length) * TCL_OK or TCL_ERROR. *----------------------------------------------------------------------------- */ -static int -GetTCLENVPkgEntry (interp, packageName, fileId, offsetPtr, lengthPtr) - Tcl_Interp *interp; - char *packageName; - fileId_t fileId; - long *offsetPtr; - unsigned *lengthPtr; +static int +GetTCLENVPkgEntry (Tcl_Interp *interp, char *packageName, fileId_t fileId, long *offsetPtr, unsigned *lengthPtr) { int nameLen, pkgDataArgc; char indexBuffer [64], *indexPtr; @@ -609,12 +581,8 @@ GetTCLENVPkgEntry (interp, packageName, fileId, offsetPtr, lengthPtr) * TCL_OK or TCL_ERROR. *----------------------------------------------------------------------------- */ -static int -SetTCLENVProcEntry (interp, procName, type, location) - Tcl_Interp *interp; - char *procName; - char *type; - char *location; +static int +SetTCLENVProcEntry (Tcl_Interp *interp, char *procName, char *type, char *location) { int nameLen; char indexBuffer [64], *indexPtr; @@ -661,12 +629,8 @@ SetTCLENVProcEntry (interp, procName, type, location) * TCL_OK or TCL_ERROR. *----------------------------------------------------------------------------- */ -static int -GetTCLENVProcEntry (interp, procName, typePtr, locationPtr) - Tcl_Interp *interp; - char *procName; - char *typePtr; - char **locationPtr; +static int +GetTCLENVProcEntry (Tcl_Interp *interp, char *procName, char *typePtr, char **locationPtr) { int nameLen, procDataArgc; char indexBuffer [64], *indexPtr; @@ -757,11 +721,8 @@ GetTCLENVProcEntry (interp, procName, typePtr, locationPtr) * TCL_OK or TCL_ERROR. *----------------------------------------------------------------------------- */ -static int -ProcessIndexFile (interp, tlibFilePath, tndxFilePath) - Tcl_Interp *interp; - char *tlibFilePath; - char *tndxFilePath; +static int +ProcessIndexFile (Tcl_Interp *interp, char *tlibFilePath, char *tndxFilePath) { fileId_t fileId; FILE *indexFilePtr; @@ -864,10 +825,8 @@ ProcessIndexFile (interp, tlibFilePath, tndxFilePath) * TCL_OK or TCL_ERROR. *----------------------------------------------------------------------------- */ -static int -BuildPackageIndex (interp, tlibFilePath) - Tcl_Interp *interp; - char *tlibFilePath; +static int +BuildPackageIndex (Tcl_Interp *interp, char *tlibFilePath) { char *cmdPtr, *initCmd; @@ -926,12 +885,8 @@ BuildPackageIndex (interp, tlibFilePath) * TCL_OK or TCL_ERROR. *----------------------------------------------------------------------------- */ -static int -LoadPackageIndex (interp, tlibFilePath, pathLen, dirLen) - Tcl_Interp *interp; - char *tlibFilePath; - int pathLen; - int dirLen; +static int +LoadPackageIndex (Tcl_Interp *interp, char *tlibFilePath, int pathLen, int dirLen) { char *tndxFilePath, tndxPathBuf [64], *msg; struct stat tlibStat; @@ -999,11 +954,8 @@ LoadPackageIndex (interp, tlibFilePath, pathLen, dirLen) * TCL_OK or TCL_ERROR. *----------------------------------------------------------------------------- */ -static int -LoadOusterIndex (interp, indexFilePath, dirLen) - Tcl_Interp *interp; - char *indexFilePath; - int dirLen; +static int +LoadOusterIndex (Tcl_Interp *interp, char *indexFilePath, int dirLen) { FILE *indexFilePtr; fileId_t fileId; @@ -1115,10 +1067,8 @@ LoadOusterIndex (interp, indexFilePath, dirLen) * A standard Tcl result. *----------------------------------------------------------------------------- */ -static int -LoadDirIndexes (interp, dirName) - Tcl_Interp *interp; - char *dirName; +static int +LoadDirIndexes (Tcl_Interp *interp, char *dirName) { DIR *dirPtr; struct dirent *entryPtr; @@ -1203,10 +1153,8 @@ LoadDirIndexes (interp, dirName) * *----------------------------------------------------------------------------- */ -static int -LoadPackageIndexes (interp, path) - Tcl_Interp *interp; - char *path; +static int +LoadPackageIndexes (Tcl_Interp *interp, char *path) { char *dirName, dirNameBuf [64]; int idx, dirLen, pathArgc, status; @@ -1265,11 +1213,8 @@ LoadPackageIndexes (interp, path) * *----------------------------------------------------------------------------- */ -static int -LoadProc (interp, procName, foundPtr) - Tcl_Interp *interp; - char *procName; - int *foundPtr; +static int +LoadProc (Tcl_Interp *interp, char *procName, int *foundPtr) { Interp *iPtr = (Interp *) interp; char type, *location, *filePath, *cmdPtr, cmdBuf [80]; @@ -1357,11 +1302,12 @@ LoadProc (interp, procName, foundPtr) *----------------------------------------------------------------------------- */ int -Tcl_LoadlibindexCmd (dummy, interp, argc, argv) - ClientData dummy; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_LoadlibindexCmd ( + ClientData dummy, + Tcl_Interp *interp, + int argc, + char **argv +) { char *pathName, pathNameBuf [64]; int pathLen, dirLen; @@ -1435,11 +1381,12 @@ Tcl_LoadlibindexCmd (dummy, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_Demand_loadCmd (dummy, interp, argc, argv) - ClientData dummy; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_Demand_loadCmd ( + ClientData dummy, + Tcl_Interp *interp, + int argc, + char **argv +) { int found; char *path, *msg; diff --git a/src/tclx/src/tclxlist.c b/src/tclx/src/tclxlist.c index e169a5a..ea55fe6 100644 --- a/src/tclx/src/tclxlist.c +++ b/src/tclx/src/tclxlist.c @@ -32,11 +32,12 @@ *----------------------------------------------------------------------------- */ int -Tcl_LvarcatCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_LvarcatCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { int listArgc, idx, listIdx; char **listArgv; @@ -102,11 +103,12 @@ Tcl_LvarcatCmd (clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_LvarpopCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_LvarpopCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { int listArgc, listIdx, idx; char **listArgv; @@ -178,11 +180,12 @@ Tcl_LvarpopCmd (clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_LvarpushCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_LvarpushCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { int listArgc, listIdx, idx; char **listArgv; @@ -255,11 +258,12 @@ Tcl_LvarpushCmd (clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_LemptyCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_LemptyCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { char *scanPtr; diff --git a/src/tclx/src/tclxmath.c b/src/tclx/src/tclxmath.c index bf5a52a..90bd986 100644 --- a/src/tclx/src/tclxmath.c +++ b/src/tclx/src/tclxmath.c @@ -41,11 +41,12 @@ really_random _ANSI_ARGS_((int my_range)); *----------------------------------------------------------------------------- */ int -Tcl_MaxCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_MaxCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { double value, maxValue = -MAXDOUBLE; int idx, maxIdx = 1; @@ -82,11 +83,12 @@ Tcl_MaxCmd (clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_MinCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_MinCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { double value, minValue = MAXDOUBLE; int idx, minIdx = 1; @@ -125,9 +127,7 @@ Tcl_MinCmd (clientData, interp, argc, argv) #endif static int - -ReallyRandom (myRange) - int myRange; +ReallyRandom (int myRange) { int maxMultiple, rnum; @@ -158,11 +158,12 @@ ReallyRandom (myRange) *----------------------------------------------------------------------------- */ int -Tcl_RandomCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_RandomCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { unsigned range; diff --git a/src/tclx/src/tclxmsgc.c b/src/tclx/src/tclxmsgc.c index c4b1063..9ac81c2 100644 --- a/src/tclx/src/tclxmsgc.c +++ b/src/tclx/src/tclxmsgc.c @@ -58,9 +58,10 @@ static void_pt msgCatTblPtr = NULL; *----------------------------------------------------------------------------- */ static nl_catd -catopen (name, oflag) - char *name; - int oflag; +catopen ( + char *name, + int oflag +) { return (nl_catd) -1; } @@ -77,10 +78,12 @@ catopen (name, oflag) *----------------------------------------------------------------------------- */ static char * -catgets (catd, set_num, msg_num, defaultStr) - nl_catd catd; - int set_num, msg_num; - char *defaultStr; +catgets ( + nl_catd catd, + int set_num, + int msg_num, + char *defaultStr +) { return defaultStr; } @@ -97,8 +100,7 @@ catgets (catd, set_num, msg_num, defaultStr) *----------------------------------------------------------------------------- */ static int -catclose (catd) - nl_catd catd; +catclose (nl_catd catd) { return -1; } @@ -115,11 +117,8 @@ catclose (catd) * *----------------------------------------------------------------------------- */ -static int -ParseFailOption (interp, optionStr, failPtr) - Tcl_Interp *interp; - CONST char *optionStr; - int *failPtr; +static int +ParseFailOption (Tcl_Interp *interp, CONST char *optionStr, int *failPtr) { if (STREQU ("-fail", ((char *) optionStr))) *failPtr = TRUE; @@ -149,10 +148,8 @@ ParseFailOption (interp, optionStr, failPtr) * *----------------------------------------------------------------------------- */ -static int -CatOpFailed (interp, errorMsg) - Tcl_Interp *interp; - CONST char *errorMsg; +static int +CatOpFailed (Tcl_Interp *interp, CONST char *errorMsg) { #ifdef TCL_HAVE_CATGETS @@ -181,11 +178,12 @@ CatOpFailed (interp, errorMsg) *----------------------------------------------------------------------------- */ static int -Tcl_CatopenCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_CatopenCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { int fail; nl_catd catDesc; @@ -225,11 +223,12 @@ Tcl_CatopenCmd (clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ static int -Tcl_CatgetsCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_CatgetsCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { nl_catd *catDescPtr; int msgSetNum, msgNum; @@ -267,11 +266,12 @@ Tcl_CatgetsCmd (clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ static int -Tcl_CatcloseCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_CatcloseCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { int fail; nl_catd *catDescPtr; @@ -308,8 +308,9 @@ Tcl_CatcloseCmd (clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ static void -MsgCatCleanUp (clientData) - ClientData clientData; +MsgCatCleanUp ( + ClientData clientData +) { nl_catd *catDescPtr; int walkKey; @@ -332,9 +333,8 @@ MsgCatCleanUp (clientData) * *----------------------------------------------------------------------------- */ -void -Tcl_InitMsgCat (interp) - Tcl_Interp *interp; +void +Tcl_InitMsgCat (Tcl_Interp *interp) { if (msgCatTblPtr == NULL) diff --git a/src/tclx/src/tclxproc.c b/src/tclx/src/tclxproc.c index 72183e5..237ed2b 100644 --- a/src/tclx/src/tclxproc.c +++ b/src/tclx/src/tclxproc.c @@ -42,11 +42,12 @@ *----------------------------------------------------------------------------- */ int -Tcl_ExeclCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_ExeclCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { #define STATIC_ARG_SIZE 12 char *staticArgv [STATIC_ARG_SIZE]; @@ -106,11 +107,12 @@ Tcl_ExeclCmd (clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_ForkCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_ForkCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { int pid; @@ -146,11 +148,12 @@ Tcl_ForkCmd (clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_WaitCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_WaitCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { WAIT_STATUS_TYPE status; int pid, returnedPid; diff --git a/src/tclx/src/tclxprof.c b/src/tclx/src/tclxprof.c index 4a4ba9d..335c5e3 100644 --- a/src/tclx/src/tclxprof.c +++ b/src/tclx/src/tclxprof.c @@ -104,7 +104,7 @@ ProfTraceRoutine _ANSI_ARGS_((ClientData clientData, Tcl_Interp *interp, int evalLevel, char *command, - int (*cmdProc)(), + int (*cmdProc)(int *, Tcl_Interp *, int, char **), ClientData cmdClientData, int argc, char **argv)); @@ -145,12 +145,8 @@ CleanUpProfMon _ANSI_ARGS_((ClientData clientData)); * executing at. *----------------------------------------------------------------------------- */ -static void -ProcEntry (infoPtr, procName, procLevel, evalLevel) - profInfo_t *infoPtr; - char *procName; - int procLevel; - int evalLevel; +static void +ProcEntry (profInfo_t *infoPtr, char *procName, int procLevel, int evalLevel) { profStackEntry_t *entryPtr; @@ -186,9 +182,8 @@ ProcEntry (infoPtr, procName, procLevel, evalLevel) * o infoPtr (I/O) - The global profiling info. *----------------------------------------------------------------------------- */ -static void -ProcPopEntry (infoPtr) - profInfo_t *infoPtr; +static void +ProcPopEntry (profInfo_t *infoPtr) { profStackEntry_t *entryPtr = infoPtr->stackPtr; profStackEntry_t *scanPtr; @@ -257,11 +252,8 @@ ProcPopEntry (infoPtr) * o evalLevel (I) - Eval call level to return to (zero to clear stack). *----------------------------------------------------------------------------- */ -static void -StackSync (infoPtr, procLevel, evalLevel) - profInfo_t *infoPtr; - int procLevel; - int evalLevel; +static void +StackSync (profInfo_t *infoPtr, int procLevel, int evalLevel) { saveStackEntry_t *saveEntryPtr; @@ -307,10 +299,8 @@ StackSync (infoPtr, procLevel, evalLevel) * o procLevel (I) - The upleveled procedure call level. *----------------------------------------------------------------------------- */ -static void -DoUplevel (infoPtr, procLevel) - profInfo_t *infoPtr; - int procLevel; +static void +DoUplevel (profInfo_t *infoPtr, int procLevel) { profStackEntry_t *scanPtr, *bottomPtr; saveStackEntry_t *saveEntryPtr; @@ -352,17 +342,8 @@ DoUplevel (infoPtr, procLevel) * *----------------------------------------------------------------------------- */ -static void -ProfTraceRoutine (clientData, interp, evalLevel, command, cmdProc, - cmdClientData, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int evalLevel; - char *command; - int (*cmdProc)(); - ClientData cmdClientData; - int argc; - char **argv; +static void +ProfTraceRoutine (ClientData clientData, Tcl_Interp *interp, int evalLevel, char *command, int (*cmdProc)(int *, Tcl_Interp *, int, char **), ClientData cmdClientData, int argc, char **argv) { Interp *iPtr = (Interp *) interp; struct tms cpuTimes; @@ -440,9 +421,8 @@ ProfTraceRoutine (clientData, interp, evalLevel, command, cmdProc, * o infoPtr (I/O) - The global profiling info. *----------------------------------------------------------------------------- */ -static void -CleanDataTable (infoPtr) - profInfo_t *infoPtr; +static void +CleanDataTable (profInfo_t *infoPtr) { Tcl_HashEntry *hashEntryPtr; Tcl_HashSearch searchCookie; @@ -468,9 +448,8 @@ CleanDataTable (infoPtr) * o infoPtr (I/O) - The global profiling info. *----------------------------------------------------------------------------- */ -static void -DeleteProfTrace (infoPtr) - profInfo_t *infoPtr; +static void +DeleteProfTrace (profInfo_t *infoPtr) { Tcl_DeleteTrace (infoPtr->interp, infoPtr->traceHolder); infoPtr->traceHolder = NULL; @@ -495,11 +474,8 @@ DeleteProfTrace (infoPtr) * Standard Tcl command results *----------------------------------------------------------------------------- */ -static int -DumpTableData (interp, infoPtr, varName) - Tcl_Interp *interp; - profInfo_t *infoPtr; - char *varName; +static int +DumpTableData (Tcl_Interp *interp, profInfo_t *infoPtr, char *varName) { Tcl_HashEntry *hashEntryPtr; Tcl_HashSearch searchCookie; @@ -554,12 +530,8 @@ DumpTableData (interp, infoPtr, varName) * *----------------------------------------------------------------------------- */ -static int -Tcl_ProfileCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +static int +Tcl_ProfileCmd (ClientData clientData, Tcl_Interp *interp, int argc, char **argv) { Interp *iPtr = (Interp *) interp; profInfo_t *infoPtr = (profInfo_t *) clientData; @@ -660,9 +632,8 @@ Tcl_ProfileCmd (clientData, interp, argc, argv) * *----------------------------------------------------------------------------- */ -static void -CleanUpProfMon (clientData) - ClientData clientData; +static void +CleanUpProfMon (ClientData clientData) { profInfo_t *infoPtr = (profInfo_t *) clientData; @@ -682,9 +653,8 @@ CleanUpProfMon (clientData) * *----------------------------------------------------------------------------- */ -void -Tcl_InitProfile (interp) - Tcl_Interp *interp; +void +Tcl_InitProfile (Tcl_Interp *interp) { profInfo_t *infoPtr; diff --git a/src/tclx/src/tclxrexp.c b/src/tclx/src/tclxrexp.c index 3c98005..d517281 100644 --- a/src/tclx/src/tclxrexp.c +++ b/src/tclx/src/tclxrexp.c @@ -175,9 +175,7 @@ struct compiled_search_struct { static char * -BoyerMooreCompile (pat, patlen) - char *pat; - int patlen; +BoyerMooreCompile (char *pat, int patlen) { register unsigned char *p, *t; register unsigned i, p1, j, *delta; @@ -210,11 +208,7 @@ BoyerMooreCompile (pat, patlen) } static char * -BoyerMooreExecute (text, textlen, compPtr, patLenP) - char *text; - unsigned textlen; - char *compPtr; - unsigned *patLenP; +BoyerMooreExecute (char *text, unsigned textlen, char *compPtr, unsigned *patLenP) { register unsigned char *p, *t; struct compiled_search_struct *csp = @@ -263,9 +257,8 @@ BoyerMooreExecute (text, textlen, compPtr, patLenP) * *----------------------------------------------------------------------------- */ -void -Tcl_RegExpClean (regExpPtr) - regexp_pt regExpPtr; +void +Tcl_RegExpClean (regexp_pt regExpPtr) { if (regExpPtr->progPtr != NULL) ckfree ((char *) regExpPtr->progPtr); @@ -285,10 +278,8 @@ Tcl_RegExpClean (regExpPtr) * into the regular expression code. *----------------------------------------------------------------------------- */ -static int -FindNonRegExpSubStr (expression, subStrPtrPtr) - char *expression; - char **subStrPtrPtr; +static int +FindNonRegExpSubStr (char *expression, char **subStrPtrPtr) { register char *subStrPtr = NULL; register char subStrLen = 0; @@ -345,12 +336,8 @@ FindNonRegExpSubStr (expression, subStrPtrPtr) * Standard TCL results. *----------------------------------------------------------------------------- */ -int -Tcl_RegExpCompile (interp, regExpPtr, expression, flags) - Tcl_Interp *interp; - regexp_pt regExpPtr; - char *expression; - int flags; +int +Tcl_RegExpCompile (Tcl_Interp *interp, regexp_pt regExpPtr, char *expression, int flags) { char *expBuf; int anyMeta; @@ -438,12 +425,8 @@ okExitPoint: * *----------------------------------------------------------------------------- */ -int -Tcl_RegExpExecute (interp, regExpPtr, matchStrIn, matchStrLower) - Tcl_Interp *interp; - regexp_pt regExpPtr; - char *matchStrIn; - char *matchStrLower; +int +Tcl_RegExpExecute (Tcl_Interp *interp, regexp_pt regExpPtr, char *matchStrIn, char *matchStrLower) { char *matchStr; int result; diff --git a/src/tclx/src/tclxsel.c b/src/tclx/src/tclxsel.c index 07e8f86..aae1b4f 100644 --- a/src/tclx/src/tclxsel.c +++ b/src/tclx/src/tclxsel.c @@ -25,7 +25,7 @@ typedef struct { #endif extern -double floor (); +double floor (double); #ifdef TCL_USE_BZERO_MACRO # define bzero(to,length) memset(to,'\0',length) @@ -96,14 +96,8 @@ ReturnSelectedFileList _ANSI_ARGS_((fd_set *fileDescSetPtr, * The number of files in the list, or -1 if an error occured. *----------------------------------------------------------------------------- */ -static int -ParseSelectFileList (interp, handleList, fileDescSetPtr, fileDescListPtr, - maxFileIdPtr) - Tcl_Interp *interp; - char *handleList; - fd_set *fileDescSetPtr; - FILE ***fileDescListPtr; - int *maxFileIdPtr; +static int +ParseSelectFileList (Tcl_Interp *interp, char *handleList, fd_set *fileDescSetPtr, FILE ***fileDescListPtr, int *maxFileIdPtr) { int handleCnt, idx; char **handleArgv; @@ -171,11 +165,8 @@ ParseSelectFileList (interp, handleList, fileDescSetPtr, fileDescListPtr, * TRUE if any where found that had pending data, FALSE if none were found. *----------------------------------------------------------------------------- */ -static int -FindPendingData (fileDescCnt, fileDescList, fileDescSetPtr) - int fileDescCnt; - FILE **fileDescList; - fd_set *fileDescSetPtr; +static int +FindPendingData (int fileDescCnt, FILE **fileDescList, fd_set *fileDescSetPtr) { int idx, found = FALSE; @@ -213,12 +204,7 @@ FindPendingData (fileDescCnt, fileDescList, fileDescSetPtr) *----------------------------------------------------------------------------- */ static char * -ReturnSelectedFileList (fileDescSetPtr, fileDescSet2Ptr, fileDescCnt, - fileDescList) - fd_set *fileDescSetPtr; - fd_set *fileDescSet2Ptr; - int fileDescCnt; - FILE **fileDescList; +ReturnSelectedFileList (fd_set *fileDescSetPtr, fd_set *fileDescSet2Ptr, int fileDescCnt, FILE **fileDescList) { int idx, handleCnt, fileNum; char *fileHandleList; @@ -278,11 +264,12 @@ ReturnSelectedFileList (fileDescSetPtr, fileDescSet2Ptr, fileDescCnt, *----------------------------------------------------------------------------- */ int -Tcl_SelectCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_SelectCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { fd_set readFdSet, writeFdSet, exceptFdSet; diff --git a/src/tclx/src/tclxsig.c b/src/tclx/src/tclxsig.c index 3b0ae6a..9d60387 100644 --- a/src/tclx/src/tclxsig.c +++ b/src/tclx/src/tclxsig.c @@ -193,9 +193,8 @@ SignalCmdCleanUp _ANSI_ARGS_((ClientData clientData)); * *----------------------------------------------------------------------------- */ -static int -SigNameToNum (sigName) - char *sigName; +static int +SigNameToNum (char *sigName) { char sigNameUp [SIG_NAME_MAX+1]; /* Upshifted signal name */ char *sigNamePtr; @@ -235,11 +234,12 @@ SigNameToNum (sigName) *----------------------------------------------------------------------------- */ int -Tcl_KillCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_KillCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { int signalNum, idx, procId, procArgc, result = TCL_ERROR; char **procArgv; @@ -296,9 +296,8 @@ exitPoint: * SIG_ERR is returned (check errno); *----------------------------------------------------------------------------- */ -static signalProcPtr_t -GetSignalState (signalNum) - int signalNum; +static signalProcPtr_t +GetSignalState (int signalNum) { #ifdef TCL_POSIX_SIG struct sigaction currentState; @@ -333,10 +332,8 @@ GetSignalState (signalNum) * TRUE if ok, FALSE if an error (check errno). *----------------------------------------------------------------------------- */ -static int -SetSignalAction (signalNum, sigFunc) - int signalNum; - signalProcPtr_t sigFunc; +static int +SetSignalAction (int signalNum, signalProcPtr_t sigFunc) { #ifdef TCL_POSIX_SIG struct sigaction newState; @@ -369,9 +366,8 @@ SetSignalAction (signalNum, sigFunc) * o signalsReceived (O) - The count of each signal that was received. *----------------------------------------------------------------------------- */ -static SIG_PROC_RET_TYPE -TclSignalTrap (signalNum) - int signalNum; +static SIG_PROC_RET_TYPE +TclSignalTrap (int signalNum) { /* * Set flags that are checked by the eval loop. @@ -409,11 +405,8 @@ TclSignalTrap (signalNum) * TCL_OK or TCL_ERROR. *----------------------------------------------------------------------------- */ -static int -EvalTrapCode (interp, signalNum, command) - Tcl_Interp *interp; - int signalNum; - char *command; +static int +EvalTrapCode (Tcl_Interp *interp, int signalNum, char *command) { Interp *iPtr = (Interp *) interp; char *signalName; @@ -477,8 +470,8 @@ EvalTrapCode (interp, signalNum, command) * o signalsReceived (O) - The count of each signal that was received. *----------------------------------------------------------------------------- */ -void -Tcl_ResetSignals () +void +Tcl_ResetSignals (void) { int signalNum; @@ -522,10 +515,8 @@ Tcl_ResetSignals () * a signal occured. *----------------------------------------------------------------------------- */ -int -Tcl_CheckForSignal (interp, cmdResultCode) - Tcl_Interp *interp; - int cmdResultCode; +int +Tcl_CheckForSignal (Tcl_Interp *interp, int cmdResultCode) { char *savedResult; int signalNum, result, sigCnt, retErrorForSignal = -1; @@ -606,11 +597,8 @@ exitPoint: * The number of signals converted, or -1 if an error occures. *----------------------------------------------------------------------------- */ -static int -ParseSignalList (interp, signalListStr, signalList) - Tcl_Interp *interp; - char *signalListStr; - int signalList []; +static int +ParseSignalList (Tcl_Interp *interp, char *signalListStr, int signalList[]) { char **signalListArgv; int signalListSize, signalNum, idx; @@ -682,9 +670,7 @@ exitPoint: *----------------------------------------------------------------------------- */ static char * -SignalBlocked (interp, signalNum) - Tcl_Interp *interp; - int signalNum; +SignalBlocked (Tcl_Interp *interp, int signalNum) { #ifdef TCL_POSIX_SIG int idx; @@ -716,11 +702,8 @@ SignalBlocked (interp, signalNum) * TCL_OK or TCL_ERROR, with error message in interp. *----------------------------------------------------------------------------- */ -static int -GetSignalStates (interp, signalListSize, signalList) - Tcl_Interp *interp; - int signalListSize; - int signalList [MAXSIG]; +static int +GetSignalStates (Tcl_Interp *interp, int signalListSize, int signalList[MAXSIG]) { int idx, signalNum, actuallyDone = -1; char *stateKeyedList [MAXSIG]; @@ -796,13 +779,8 @@ unixSigError: * TCL_OK or TCL_ERROR, with error message in interp. *----------------------------------------------------------------------------- */ -static int -SetSignalStates (interp, signalListSize, signalList, actionFunc, command) - Tcl_Interp *interp; - int signalListSize; - int signalList [MAXSIG]; - signalProcPtr_t actionFunc; - char *command; +static int +SetSignalStates (Tcl_Interp *interp, int signalListSize, int signalList[MAXSIG], signalProcPtr_t actionFunc, char *command) { int idx, signalNum, commandLen; @@ -850,12 +828,8 @@ unixSigError: * TCL_OK or TCL_ERROR, with error message in interp. *----------------------------------------------------------------------------- */ -static int -BlockSignals (interp, action, signalListSize, signalList) - Tcl_Interp *interp; - int action; - int signalListSize; - int signalList [MAXSIG]; +static int +BlockSignals (Tcl_Interp *interp, int action, int signalListSize, int signalList[MAXSIG]) { #ifdef TCL_POSIX_SIG int idx; @@ -892,12 +866,8 @@ BlockSignals (interp, action, signalListSize, signalList) * Signal handling states may be changed. *----------------------------------------------------------------------------- */ -static int -Tcl_SignalCmd (clientData, interp, argc, argv) - char *clientData; - Tcl_Interp *interp; - int argc; - char **argv; +static int +Tcl_SignalCmd (int *clientData, Tcl_Interp *interp, int argc, char **argv) { int signalListSize, signalNum, idx; int signalList [MAXSIG], actionClass; @@ -986,8 +956,9 @@ Tcl_SignalCmd (clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ static void -SignalCmdCleanUp (clientData) - ClientData clientData; +SignalCmdCleanUp ( + ClientData clientData +) { int idx; @@ -1010,9 +981,8 @@ SignalCmdCleanUp (clientData) * *----------------------------------------------------------------------------- */ -void -Tcl_InitSignalHandling (interp) - Tcl_Interp *interp; +void +Tcl_InitSignalHandling (Tcl_Interp *interp) { int idx; @@ -1021,7 +991,7 @@ Tcl_InitSignalHandling (interp) signalTrapCmds [idx] = NULL; } Tcl_CreateCommand (interp, "kill", Tcl_KillCmd, (ClientData)NULL, - (void (*)())NULL); + (void (*)(int *))NULL); Tcl_CreateCommand (interp, "signal", Tcl_SignalCmd, (ClientData)NULL, SignalCmdCleanUp); /* diff --git a/src/tclx/src/tclxstr.c b/src/tclx/src/tclxstr.c index fe994f4..2055da7 100644 --- a/src/tclx/src/tclxstr.c +++ b/src/tclx/src/tclxstr.c @@ -40,11 +40,12 @@ ExpandString _ANSI_ARGS_((unsigned char *s, *----------------------------------------------------------------------------- */ int -Tcl_CindexCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_CindexCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { long index; @@ -78,11 +79,12 @@ Tcl_CindexCmd (clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_ClengthCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_ClengthCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { if (argc != 2) { @@ -109,11 +111,12 @@ Tcl_ClengthCmd (clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_CrangeCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_CrangeCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { long fullLen, first; long subLen; @@ -180,11 +183,12 @@ Tcl_CrangeCmd (clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_ReplicateCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_ReplicateCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { long repCount; register char *srcPtr, *scanPtr, *newPtr; @@ -228,10 +232,8 @@ Tcl_ReplicateCmd (clientData, interp, argc, argv) */ #define MAX_EXPANSION 255 -static unsigned int -ExpandString (s, buf) - unsigned char *s; - unsigned char buf[]; +static unsigned int +ExpandString (unsigned char *s, unsigned char buf[]) { int i, j; @@ -261,11 +263,12 @@ ExpandString (s, buf) *----------------------------------------------------------------------------- */ int -Tcl_TranslitCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_TranslitCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { unsigned char from [MAX_EXPANSION+1]; unsigned char to [MAX_EXPANSION+1]; @@ -337,11 +340,12 @@ Tcl_TranslitCmd (clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_CtypeCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_CtypeCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { register char *class; register char *scanPtr = argv [2]; diff --git a/src/tclx/src/tclxstup.c b/src/tclx/src/tclxstup.c index c107b81..63caa6d 100644 --- a/src/tclx/src/tclxstup.c +++ b/src/tclx/src/tclxstup.c @@ -69,10 +69,8 @@ ProcessInitFile _ANSI_ARGS_((Tcl_Interp *interp)); * o exitCode - The code to pass to exit. *----------------------------------------------------------------------------- */ -void -Tcl_ErrorAbort (interp, exitCode) - Tcl_Interp *interp; - int exitCode; +void +Tcl_ErrorAbort (Tcl_Interp *interp, int exitCode) { char *errorStack; @@ -97,11 +95,8 @@ Tcl_ErrorAbort (interp, exitCode) * o tclParmsPtr - Results of the parsed Tcl shell command line. *----------------------------------------------------------------------------- */ -static void -ParseCmdArgs (argc, argv, tclParmsPtr) - int argc; - char **argv; - tclParms_t *tclParmsPtr; +static void +ParseCmdArgs (int argc, char **argv, tclParms_t *tclParmsPtr) { char *scanPtr, *programName; int programNameLen; @@ -194,10 +189,8 @@ usageError: * TCL_OK if all is ok, TCL_ERROR if a error occured. *----------------------------------------------------------------------------- */ -static int -FindDefaultFile (interp, defaultFile) - Tcl_Interp *interp; - char *defaultFile; +static int +FindDefaultFile (Tcl_Interp *interp, char *defaultFile) { char *defaultFileToUse; struct stat statBuf; @@ -233,10 +226,8 @@ FindDefaultFile (interp, defaultFile) * TCL_OK if all is ok, TCL_ERROR if an error occured. *----------------------------------------------------------------------------- */ -static int -ProcessDefaultFile (interp, defaultFile) - Tcl_Interp *interp; - char *defaultFile; +static int +ProcessDefaultFile (Tcl_Interp *interp, char *defaultFile) { char *defaultFileToUse; @@ -271,9 +262,8 @@ ProcessDefaultFile (interp, defaultFile) * TCL_OK if all is ok, TCL_ERROR if an error occured. *----------------------------------------------------------------------------- */ -static int -ProcessInitFile (interp) - Tcl_Interp *interp; +static int +ProcessInitFile (Tcl_Interp *interp) { char *initFile; @@ -329,16 +319,8 @@ ProcessInitFile (interp) * TCL_OK if all is ok, TCL_ERROR if an error occured. *----------------------------------------------------------------------------- */ -int -Tcl_ShellEnvInit (interp, options, programName, argc, argv, interactive, - defaultFile) - Tcl_Interp *interp; - unsigned options; - CONST char *programName; - int argc; - CONST char **argv; - int interactive; - CONST char *defaultFile; +int +Tcl_ShellEnvInit (Tcl_Interp *interp, unsigned options, CONST char *programName, int argc, CONST char **argv, int interactive, CONST char *defaultFile) { int result = TCL_OK; char *defaultFilePath; @@ -453,13 +435,8 @@ errorExit: * must be set before calling thus routine if special values are desired. *----------------------------------------------------------------------------- */ -void -Tcl_Startup (interp, argc, argv, defaultFile, options) - Tcl_Interp *interp; - int argc; - CONST char **argv; - CONST char *defaultFile; - unsigned options; +void +Tcl_Startup (Tcl_Interp *interp, int argc, CONST char **argv, CONST char *defaultFile, unsigned options) { char *cmdBuf; tclParms_t tclParms; diff --git a/src/tclx/src/tclxtend.h b/src/tclx/src/tclxtend.h index 338e7f9..98438cf 100644 --- a/src/tclx/src/tclxtend.h +++ b/src/tclx/src/tclxtend.h @@ -62,7 +62,7 @@ extern char *tclAppVersion; /* Version number of the application */ * If set to be a pointer to the procedure Tcl_RecordAndEval, will link in * history. Should be set by main. */ -extern int (*tclShellCmdEvalProc) (); +extern int (*tclShellCmdEvalProc) (Tcl_Interp *, char *, int, char **); /* * If non-zero, a signal was received. Normally signals are handled in @@ -84,7 +84,7 @@ EXTERN void Tcl_CommandLoop _ANSI_ARGS_((Tcl_Interp *interp, FILE *inFile, FILE *outFile, - int (*evalProc) (), + int (*evalProc) (Tcl_Interp *, char *, int, char**), unsigned options)); EXTERN Tcl_Interp * diff --git a/src/tclx/src/tclxunix.c b/src/tclx/src/tclxunix.c index 4c40b62..80c7d8c 100644 --- a/src/tclx/src/tclxunix.c +++ b/src/tclx/src/tclxunix.c @@ -24,10 +24,10 @@ #define TCL_USECS_PER_SEC (1000L * 1000L) extern -double floor (); +double floor (double); extern -double ceil (); +double ceil (double); /* *----------------------------------------------------------------------------- @@ -42,11 +42,12 @@ double ceil (); *----------------------------------------------------------------------------- */ int -Tcl_AlarmCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_AlarmCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { #ifdef TCL_NO_ITIMER double seconds; @@ -119,11 +120,12 @@ Tcl_AlarmCmd (clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_SleepCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_SleepCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { unsigned time; @@ -154,11 +156,12 @@ Tcl_SleepCmd (clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_SystemCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_SystemCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { int exitCode; @@ -188,11 +191,12 @@ Tcl_SystemCmd (clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_TimesCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_TimesCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { struct tms tm; @@ -231,11 +235,12 @@ Tcl_TimesCmd (clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_UmaskCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_UmaskCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { int mask; @@ -275,11 +280,12 @@ Tcl_UmaskCmd (clientData, interp, argc, argv) *----------------------------------------------------------------------------- */ int -Tcl_LinkCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_LinkCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { char *tmppath, *srcpath, *destpath; @@ -344,11 +350,12 @@ errorExit: *----------------------------------------------------------------------------- */ int -Tcl_UnlinkCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_UnlinkCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { int idx, fileArgc; char **fileArgv, *fileName; @@ -409,11 +416,12 @@ badArgs: *----------------------------------------------------------------------------- */ int -Tcl_MkdirCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_MkdirCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { int idx, dirArgc, result; char **dirArgv, *scanPtr; @@ -485,11 +493,12 @@ usageError: *----------------------------------------------------------------------------- */ int -Tcl_RmdirCmd (clientData, interp, argc, argv) - ClientData clientData; - Tcl_Interp *interp; - int argc; - char **argv; +Tcl_RmdirCmd ( + ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv +) { int idx, dirArgc; char **dirArgv, *dirName; diff --git a/src/tclx/src/tclxutil.c b/src/tclx/src/tclxutil.c index f716919..4255345 100644 --- a/src/tclx/src/tclxutil.c +++ b/src/tclx/src/tclxutil.c @@ -28,7 +28,7 @@ */ char *tclXWrongArgs = "wrong # args: "; -extern double pow (); +extern double pow (double, double); /* @@ -49,11 +49,8 @@ extern double pow (); * Returns 1 if the string was a valid number, 0 invalid. *----------------------------------------------------------------------------- */ -int -Tcl_StrToLong (string, base, longPtr) - CONST char *string; - int base; - long *longPtr; +int +Tcl_StrToLong (CONST char *string, int base, long *longPtr) { char *end; long num; @@ -87,11 +84,8 @@ Tcl_StrToLong (string, base, longPtr) * Returns 1 if the string was a valid number, 0 invalid. *----------------------------------------------------------------------------- */ -int -Tcl_StrToInt (string, base, intPtr) - CONST char *string; - int base; - int *intPtr; +int +Tcl_StrToInt (CONST char *string, int base, int *intPtr) { char *end; int num; @@ -125,11 +119,8 @@ Tcl_StrToInt (string, base, intPtr) * Returns 1 if the string was a valid number, 0 invalid. *----------------------------------------------------------------------------- */ -int -Tcl_StrToUnsigned (string, base, unsignedPtr) - CONST char *string; - int base; - unsigned *unsignedPtr; +int +Tcl_StrToUnsigned (CONST char *string, int base, unsigned *unsignedPtr) { char *end; unsigned long num; @@ -158,10 +149,8 @@ Tcl_StrToUnsigned (string, base, unsignedPtr) * TRUE if the number is ok, FALSE if it is illegal. *----------------------------------------------------------------------------- */ -int -Tcl_StrToDouble (string, doublePtr) - CONST char *string; - double *doublePtr; +int +Tcl_StrToDouble (CONST char *string, double *doublePtr) { char *end; double num; @@ -198,9 +187,7 @@ Tcl_StrToDouble (string, doublePtr) *----------------------------------------------------------------------------- */ char * -Tcl_DownShift (targetStr, sourceStr) - char *targetStr; - CONST char *sourceStr; +Tcl_DownShift (char *targetStr, CONST char *sourceStr) { register char theChar; @@ -235,9 +222,7 @@ Tcl_DownShift (targetStr, sourceStr) *----------------------------------------------------------------------------- */ char * -Tcl_UpShift (targetStr, sourceStr) - char *targetStr; - CONST char *sourceStr; +Tcl_UpShift (char *targetStr, CONST char *sourceStr) { register char theChar; @@ -264,10 +249,8 @@ Tcl_UpShift (targetStr, sourceStr) * *----------------------------------------------------------------------------- */ -void -Tcl_ExpandDynBuf (dynBufPtr, appendSize) - dynamicBuf_t *dynBufPtr; - int appendSize; +void +Tcl_ExpandDynBuf (dynamicBuf_t *dynBufPtr, int appendSize) { int newSize, minSize; char *oldBufPtr; @@ -294,9 +277,8 @@ Tcl_ExpandDynBuf (dynBufPtr, appendSize) * *----------------------------------------------------------------------------- */ -void -Tcl_DynBufInit (dynBufPtr) - dynamicBuf_t *dynBufPtr; +void +Tcl_DynBufInit (dynamicBuf_t *dynBufPtr) { dynBufPtr->buf [0] = '\0'; dynBufPtr->ptr = dynBufPtr->buf; @@ -314,9 +296,8 @@ Tcl_DynBufInit (dynBufPtr) * *----------------------------------------------------------------------------- */ -void -Tcl_DynBufFree (dynBufPtr) - dynamicBuf_t *dynBufPtr; +void +Tcl_DynBufFree (dynamicBuf_t *dynBufPtr) { if (dynBufPtr->ptr != dynBufPtr->buf) ckfree (dynBufPtr->ptr); @@ -333,10 +314,8 @@ Tcl_DynBufFree (dynBufPtr) * *----------------------------------------------------------------------------- */ -void -Tcl_DynBufReturn (interp, dynBufPtr) - Tcl_Interp *interp; - dynamicBuf_t *dynBufPtr; +void +Tcl_DynBufReturn (Tcl_Interp *interp, dynamicBuf_t *dynBufPtr) { if (dynBufPtr->ptr != dynBufPtr->buf) Tcl_SetResult (interp, dynBufPtr->ptr, TCL_DYNAMIC); @@ -354,10 +333,8 @@ Tcl_DynBufReturn (interp, dynBufPtr) * *----------------------------------------------------------------------------- */ -void -Tcl_DynBufAppend (dynBufPtr, newStr) - dynamicBuf_t *dynBufPtr; - char *newStr; +void +Tcl_DynBufAppend (dynamicBuf_t *dynBufPtr, char *newStr) { int newLen, currentUsed; @@ -385,11 +362,8 @@ Tcl_DynBufAppend (dynBufPtr, newStr) * *----------------------------------------------------------------------------- */ -int -Tcl_DynamicFgets (dynBufPtr, filePtr, append) - dynamicBuf_t *dynBufPtr; - FILE *filePtr; - int append; +int +Tcl_DynamicFgets (dynamicBuf_t *dynBufPtr, FILE *filePtr, int append) { int readVal; @@ -433,12 +407,13 @@ Tcl_DynamicFgets (dynBufPtr, filePtr, append) * *----------------------------------------------------------------------------- */ -int -Tcl_GetLong(interp, string, longPtr) - Tcl_Interp *interp; /* Interpreter to use for error reporting. */ - CONST char *string; /* String containing a (possibly signed) +int +Tcl_GetLong ( + Tcl_Interp *interp, /* Interpreter to use for error reporting. */ + CONST char *string, /* String containing a (possibly signed) * integer in a form acceptable to strtol. */ - long *longPtr; /* Place to store converted result. */ + long *longPtr /* Place to store converted result. */ +) { char *end; long i; @@ -474,12 +449,13 @@ Tcl_GetLong(interp, string, longPtr) * *----------------------------------------------------------------------------- */ -int -Tcl_GetUnsigned(interp, string, unsignedPtr) - Tcl_Interp *interp; /* Interpreter to use for error reporting. */ - CONST char *string; /* String containing a (possibly signed) +int +Tcl_GetUnsigned ( + Tcl_Interp *interp, /* Interpreter to use for error reporting. */ + CONST char *string, /* String containing a (possibly signed) * integer in a form acceptable to strtoul. */ - unsigned *unsignedPtr; /* Place to store converted result. */ + unsigned *unsignedPtr /* Place to store converted result. */ +) { char *end; unsigned long i; @@ -522,10 +498,8 @@ Tcl_GetUnsigned(interp, string, unsignedPtr) * *----------------------------------------------------------------------------- */ -int -Tcl_ConvertFileHandle (interp, handle) - Tcl_Interp *interp; - char *handle; +int +Tcl_ConvertFileHandle (Tcl_Interp *interp, char *handle) { int fileId = -1; @@ -563,12 +537,8 @@ Tcl_ConvertFileHandle (interp, handle) * TCL_OK or TCL_ERROR; *----------------------------------------------------------------------------- */ -int -Tcl_SetupFileEntry (interp, fileNum, readable, writable) - Tcl_Interp *interp; - int fileNum; - int readable; - int writable; +int +Tcl_SetupFileEntry (Tcl_Interp *interp, int fileNum, int readable, int writable) { Interp *iPtr = (Interp *) interp; char *mode; @@ -627,9 +597,7 @@ Tcl_SetupFileEntry (interp, fileNum, readable, writable) *----------------------------------------------------------------------------- */ int -Tcl_System (interp, command) - Tcl_Interp *interp; - char *command; +Tcl_System (Tcl_Interp *interp, char *command) { int processID, waitStatus, processStatus; @@ -686,10 +654,11 @@ Tcl_System (interp, command) *-------------------------------------------------------------- */ -int -Tcl_ReturnDouble(interp, number) - Tcl_Interp *interp; /* ->result gets converted number */ - double number; /* Number to convert */ +int +Tcl_ReturnDouble ( + Tcl_Interp *interp, /* ->result gets converted number */ + double number /* Number to convert */ +) { static int precision = 0; register char *scanPtr; diff --git a/src/tk/main.c b/src/tk/main.c index 86dccfe..395c6fc 100644 --- a/src/tk/main.c +++ b/src/tk/main.c @@ -24,7 +24,7 @@ static char rcsid[] = "$Header: /user6/ouster/wish/RCS/main.c,v 1.68 92/05/07 08 * Declarations for library procedures: */ -extern int isatty(); +extern int isatty(int); /* * Command used to initialize wish: @@ -68,10 +68,11 @@ Tk_ArgvInfo argTable[] = { }; /* ARGSUSED */ -void -StdinProc(clientData, mask) - ClientData clientData; /* Not used. */ - int mask; +void +StdinProc ( + ClientData clientData, /* Not used. */ + int mask +) { char line[200]; static int gotPartial = 0; @@ -112,10 +113,11 @@ StdinProc(clientData, mask) } /* ARGSUSED */ -static void -StructureProc(clientData, eventPtr) - ClientData clientData; /* Information about window. */ - XEvent *eventPtr; /* Information about event. */ +static void +StructureProc ( + ClientData clientData, /* Information about window. */ + XEvent *eventPtr /* Information about event. */ +) { if (eventPtr->type == DestroyNotify) { w = NULL; @@ -130,9 +132,10 @@ StructureProc(clientData, eventPtr) */ /* ARGSUSED */ -static void -DelayedMap(clientData) - ClientData clientData; /* Not used. */ +static void +DelayedMap ( + ClientData clientData /* Not used. */ +) { while (Tk_DoOneEvent(TK_IDLE_EVENTS) != 0) { @@ -145,12 +148,13 @@ DelayedMap(clientData) } /* ARGSUSED */ -int -DotCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +DotCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { int x, y; @@ -168,12 +172,13 @@ DotCmd(dummy, interp, argc, argv) } /* ARGSUSED */ -int -MovetoCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +MovetoCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { if (argc != 3) { Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], @@ -185,12 +190,13 @@ MovetoCmd(dummy, interp, argc, argv) return TCL_OK; } /* ARGSUSED */ -int -LinetoCmd(dummy, interp, argc, argv) - ClientData dummy; /* Not used. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +LinetoCmd ( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { int newX, newY; @@ -209,10 +215,8 @@ LinetoCmd(dummy, interp, argc, argv) return TCL_OK; } -int -main(argc, argv) - int argc; - char **argv; +int +main (int argc, char **argv) { char *args, *p, *msg; char buf[20]; @@ -285,14 +289,14 @@ main(argc, argv) XSetForeground(Tk_Display(w), DefaultGCOfScreen(Tk_Screen(w)), BlackPixelOfScreen(Tk_Screen(w))); Tcl_CreateCommand(interp, "dot", DotCmd, (ClientData) w, - (void (*)()) NULL); + (void (*)(int *)) NULL); Tcl_CreateCommand(interp, "lineto", LinetoCmd, (ClientData) w, - (void (*)()) NULL); + (void (*)(int *)) NULL); Tcl_CreateCommand(interp, "moveto", MovetoCmd, (ClientData) w, - (void (*)()) NULL); + (void (*)(int *)) NULL); #ifdef SQUARE_DEMO Tcl_CreateCommand(interp, "square", Tk_SquareCmd, (ClientData) w, - (void (*)()) NULL); + (void (*)(int *)) NULL); #endif if (geometry != NULL) { Tcl_SetVar(interp, "geometry", geometry, TCL_GLOBAL_ONLY); diff --git a/src/tk/tk3d.c b/src/tk/tk3d.c index 9f6950e..6c06f7f 100644 --- a/src/tk/tk3d.c +++ b/src/tk/tk3d.c @@ -111,16 +111,17 @@ static void ShiftLine _ANSI_ARGS_((XPoint *p1Ptr, XPoint *p2Ptr, *-------------------------------------------------------------- */ -Tk_3DBorder -Tk_Get3DBorder(interp, tkwin, colormap, colorName) - Tcl_Interp *interp; /* Place to store an error message. */ - Tk_Window tkwin; /* Token for window in which +Tk_3DBorder +Tk_Get3DBorder ( + Tcl_Interp *interp, /* Place to store an error message. */ + Tk_Window tkwin, /* Token for window in which * border will be drawn. */ - Colormap colormap; /* Colormap to use for allocating border + Colormap colormap, /* Colormap to use for allocating border * colors. None means use default colormap * for screen. */ - Tk_Uid colorName; /* String giving name of color + Tk_Uid colorName /* String giving name of color * for window background. */ +) { BorderKey key; Tcl_HashEntry *hashPtr; @@ -279,20 +280,23 @@ Tk_Get3DBorder(interp, tkwin, colormap, colorName) *-------------------------------------------------------------- */ -void -Tk_Draw3DRectangle(display, drawable, border, x, y, width, height, - borderWidth, relief) - Display *display; /* X display in which to draw. */ - Drawable drawable; /* X window or pixmap in which to draw. */ - Tk_3DBorder border; /* Token for border to draw. */ - int x, y, width, height; /* Outside area of region in +void +Tk_Draw3DRectangle ( + Display *display, /* X display in which to draw. */ + Drawable drawable, /* X window or pixmap in which to draw. */ + Tk_3DBorder border, /* Token for border to draw. */ + int x, + int y, + int width, + int height, /* Outside area of region in * which border will be drawn. */ - int borderWidth; /* Desired width for border, in + int borderWidth, /* Desired width for border, in * pixels. */ - int relief; /* Should be either TK_RELIEF_RAISED + int relief /* Should be either TK_RELIEF_RAISED * or TK_RELIEF_SUNKEN; indicates * position of interior of window relative * to exterior. */ +) { register Border *borderPtr = (Border *) border; GC top, bottom; @@ -347,8 +351,9 @@ Tk_Draw3DRectangle(display, drawable, border, x, y, width, height, */ char * -Tk_NameOf3DBorder(border) - Tk_3DBorder border; /* Token for border. */ +Tk_NameOf3DBorder ( + Tk_3DBorder border /* Token for border. */ +) { Border *borderPtr = (Border *) border; @@ -372,8 +377,7 @@ Tk_NameOf3DBorder(border) *-------------------------------------------------------------------- */ XColor * -Tk_3DBorderColor(border) - Tk_3DBorder border; +Tk_3DBorderColor (Tk_3DBorder border) { return(((Border *) border)->bgColorPtr); } @@ -397,9 +401,10 @@ Tk_3DBorderColor(border) *-------------------------------------------------------------- */ -void -Tk_Free3DBorder(border) - Tk_3DBorder border; /* Token for border to be released. */ +void +Tk_Free3DBorder ( + Tk_3DBorder border /* Token for border to be released. */ +) { register Border *borderPtr = (Border *) border; @@ -448,10 +453,11 @@ Tk_Free3DBorder(border) *---------------------------------------------------------------------- */ -void -Tk_SetBackgroundFromBorder(tkwin, border) - Tk_Window tkwin; /* Window whose background is to be set. */ - Tk_3DBorder border; /* Token for border. */ +void +Tk_SetBackgroundFromBorder ( + Tk_Window tkwin, /* Window whose background is to be set. */ + Tk_3DBorder border /* Token for border. */ +) { register Border *borderPtr = (Border *) border; @@ -477,11 +483,12 @@ Tk_SetBackgroundFromBorder(tkwin, border) *---------------------------------------------------------------------- */ -int -Tk_GetRelief(interp, name, reliefPtr) - Tcl_Interp *interp; /* For error messages. */ - char *name; /* Name of a relief type. */ - int *reliefPtr; /* Where to store converted relief. */ +int +Tk_GetRelief ( + Tcl_Interp *interp, /* For error messages. */ + char *name, /* Name of a relief type. */ + int *reliefPtr /* Where to store converted relief. */ +) { char c; int length; @@ -521,9 +528,10 @@ Tk_GetRelief(interp, name, reliefPtr) */ char * -Tk_NameOfRelief(relief) - int relief; /* One of TK_RELIEF_FLAT, TK_RELIEF_RAISED, +Tk_NameOfRelief ( + int relief /* One of TK_RELIEF_FLAT, TK_RELIEF_RAISED, * or TK_RELIEF_SUNKEN. */ +) { if (relief == TK_RELIEF_FLAT) { return "flat"; @@ -557,23 +565,23 @@ Tk_NameOfRelief(relief) *-------------------------------------------------------------- */ -void -Tk_Draw3DPolygon(display, drawable, border, pointPtr, numPoints, - borderWidth, leftRelief) - Display *display; /* X display in which to draw polygon. */ - Drawable drawable; /* X window or pixmap in which to draw. */ - Tk_3DBorder border; /* Token for border to draw. */ - XPoint *pointPtr; /* Array of points describing +void +Tk_Draw3DPolygon ( + Display *display, /* X display in which to draw polygon. */ + Drawable drawable, /* X window or pixmap in which to draw. */ + Tk_3DBorder border, /* Token for border to draw. */ + XPoint *pointPtr, /* Array of points describing * polygon. All points must be * absolute (CoordModeOrigin). */ - int numPoints; /* Number of points at *pointPtr. */ - int borderWidth; /* Width of border, measured in + int numPoints, /* Number of points at *pointPtr. */ + int borderWidth, /* Width of border, measured in * pixels to the left of the polygon's * trajectory. May be negative. */ - int leftRelief; /* TK_RELIEF_RAISED or + int leftRelief /* TK_RELIEF_RAISED or * TK_RELIEF_SUNKEN: indicates how * stuff to left of trajectory looks * relative to stuff on right. */ +) { XPoint poly[4], b1, b2, newB1, newB2; XPoint perp, c, shift1, shift2; /* Used for handling parallel lines. */ @@ -743,17 +751,20 @@ Tk_Draw3DPolygon(display, drawable, border, pointPtr, numPoints, *---------------------------------------------------------------------- */ -void -Tk_Fill3DRectangle(display, drawable, border, x, y, width, - height, borderWidth, relief) - Display *display; /* X display in which to draw rectangle. */ - Drawable drawable; /* X window or pixmap in which to draw. */ - Tk_3DBorder border; /* Token for border to draw. */ - int x, y, width, height; /* Outside area of rectangular region. */ - int borderWidth; /* Desired width for border, in +void +Tk_Fill3DRectangle ( + Display *display, /* X display in which to draw rectangle. */ + Drawable drawable, /* X window or pixmap in which to draw. */ + Tk_3DBorder border, /* Token for border to draw. */ + int x, + int y, + int width, + int height, /* Outside area of rectangular region. */ + int borderWidth, /* Desired width for border, in * pixels. Border will be *inside* region. */ - int relief; /* Indicates 3D effect: TK_RELIEF_FLAT, + int relief /* Indicates 3D effect: TK_RELIEF_FLAT, * TK_RELIEF_RAISED, or TK_RELIEF_SUNKEN. */ +) { register Border *borderPtr = (Border *) border; @@ -781,23 +792,23 @@ Tk_Fill3DRectangle(display, drawable, border, x, y, width, *---------------------------------------------------------------------- */ -void -Tk_Fill3DPolygon(display, drawable, border, pointPtr, numPoints, - borderWidth, leftRelief) - Display *display; /* X display in which to draw polygon. */ - Drawable drawable; /* X window or pixmap in which to draw. */ - Tk_3DBorder border; /* Token for border to draw. */ - XPoint *pointPtr; /* Array of points describing +void +Tk_Fill3DPolygon ( + Display *display, /* X display in which to draw polygon. */ + Drawable drawable, /* X window or pixmap in which to draw. */ + Tk_3DBorder border, /* Token for border to draw. */ + XPoint *pointPtr, /* Array of points describing * polygon. All points must be * absolute (CoordModeOrigin). */ - int numPoints; /* Number of points at *pointPtr. */ - int borderWidth; /* Width of border, measured in + int numPoints, /* Number of points at *pointPtr. */ + int borderWidth, /* Width of border, measured in * pixels to the left of the polygon's * trajectory. May be negative. */ - int leftRelief; /* Indicates 3D effect of left side of + int leftRelief /* Indicates 3D effect of left side of * trajectory relative to right: * TK_RELIEF_FLAT, TK_RELIEF_RAISED, * or TK_RELIEF_SUNKEN. */ +) { register Border *borderPtr = (Border *) border; @@ -825,8 +836,8 @@ Tk_Fill3DPolygon(display, drawable, border, pointPtr, numPoints, *------------------------------------------------------------- */ -static void -BorderInit() +static void +BorderInit (void) { initialized = 1; Tcl_InitHashTable(&borderTable, sizeof(BorderKey)/sizeof(int)); @@ -850,16 +861,17 @@ BorderInit() *-------------------------------------------------------------- */ -static void -ShiftLine(p1Ptr, p2Ptr, distance, p3Ptr) - XPoint *p1Ptr; /* First point on line. */ - XPoint *p2Ptr; /* Second point on line. */ - int distance; /* New line is to be this many +static void +ShiftLine ( + XPoint *p1Ptr, /* First point on line. */ + XPoint *p2Ptr, /* Second point on line. */ + int distance, /* New line is to be this many * units to the left of original * line, when looking from p1 to * p2. May be negative. */ - XPoint *p3Ptr; /* Store coords of point on new + XPoint *p3Ptr /* Store coords of point on new * line here. */ +) { int dx, dy, dxNeg, dyNeg; @@ -943,13 +955,14 @@ ShiftLine(p1Ptr, p2Ptr, distance, p3Ptr) *-------------------------------------------------------------- */ -static int -Intersect(a1Ptr, a2Ptr, b1Ptr, b2Ptr, iPtr) - XPoint *a1Ptr; /* First point of first line. */ - XPoint *a2Ptr; /* Second point of first line. */ - XPoint *b1Ptr; /* First point of second line. */ - XPoint *b2Ptr; /* Second point of second line. */ - XPoint *iPtr; /* Filled in with intersection point. */ +static int +Intersect ( + XPoint *a1Ptr, /* First point of first line. */ + XPoint *a2Ptr, /* Second point of first line. */ + XPoint *b1Ptr, /* First point of second line. */ + XPoint *b2Ptr, /* Second point of second line. */ + XPoint *iPtr /* Filled in with intersection point. */ +) { int dxadyb, dxbdya, dxadxb, dyadyb, p, q; diff --git a/src/tk/tkargv.c b/src/tk/tkargv.c index 27725e7..07e1e0f 100644 --- a/src/tk/tkargv.c +++ b/src/tk/tkargv.c @@ -65,18 +65,19 @@ static void PrintUsage _ANSI_ARGS_((Tcl_Interp *interp, *---------------------------------------------------------------------- */ -int -Tk_ParseArgv(interp, tkwin, argcPtr, argv, argTable, flags) - Tcl_Interp *interp; /* Place to store error message. */ - Tk_Window tkwin; /* Window to use for setting Tk options. +int +Tk_ParseArgv ( + Tcl_Interp *interp, /* Place to store error message. */ + Tk_Window tkwin, /* Window to use for setting Tk options. * NULL means ignore Tk option specs. */ - int *argcPtr; /* Number of arguments in argv. Modified + int *argcPtr, /* Number of arguments in argv. Modified * to hold # args left in argv at end. */ - char **argv; /* Array of arguments. Modified to hold + char **argv, /* Array of arguments. Modified to hold * those that couldn't be processed here. */ - Tk_ArgvInfo *argTable; /* Array of option descriptions */ - int flags; /* Or'ed combination of various flag bits, + Tk_ArgvInfo *argTable, /* Array of option descriptions */ + int flags /* Or'ed combination of various flag bits, * such as TK_ARGV_NO_DEFAULTS. */ +) { register Tk_ArgvInfo *infoPtr; /* Pointer to the current entry in the @@ -239,9 +240,9 @@ Tk_ParseArgv(interp, tkwin, argcPtr, argv, argTable, flags) } break; case TK_ARGV_FUNC: { - int (*handlerProc)(); + int (*handlerProc)(char*, char*, char*); - handlerProc = (int (*)())infoPtr->src; + handlerProc = (int (*)(char*, char*, char*))infoPtr->src; if ((*handlerProc)(infoPtr->dst, infoPtr->key, argv[srcIndex])) { @@ -251,9 +252,9 @@ Tk_ParseArgv(interp, tkwin, argcPtr, argv, argTable, flags) break; } case TK_ARGV_GENFUNC: { - int (*handlerProc)(); + int (*handlerProc)(char*, Tcl_Interp*, char*, int, char**); - handlerProc = (int (*)())infoPtr->src; + handlerProc = (int (*)(char*, Tcl_Interp*, char*, int, char**))infoPtr->src; argc = (*handlerProc)(infoPtr->dst, interp, infoPtr->key, argc, argv+srcIndex); @@ -338,15 +339,16 @@ Tk_ParseArgv(interp, tkwin, argcPtr, argv, argTable, flags) *---------------------------------------------------------------------- */ -static void -PrintUsage(interp, argTable, flags) - Tcl_Interp *interp; /* Place information in this interp's +static void +PrintUsage ( + Tcl_Interp *interp, /* Place information in this interp's * result area. */ - Tk_ArgvInfo *argTable; /* Array of command-specific argument + Tk_ArgvInfo *argTable, /* Array of command-specific argument * descriptions. */ - int flags; /* If the TK_ARGV_NO_DEFAULTS bit is set + int flags /* If the TK_ARGV_NO_DEFAULTS bit is set * in this word, then don't generate * information for default options. */ +) { register Tk_ArgvInfo *infoPtr; int width, i, numSpaces; diff --git a/src/tk/tkatom.c b/src/tk/tkatom.c index d62fedd..0340c62 100644 --- a/src/tk/tkatom.c +++ b/src/tk/tkatom.c @@ -49,11 +49,12 @@ static void AtomInit _ANSI_ARGS_((TkDisplay *dispPtr)); *-------------------------------------------------------------- */ -Atom -Tk_InternAtom(tkwin, name) - Tk_Window tkwin; /* Window token; map name to atom +Atom +Tk_InternAtom ( + Tk_Window tkwin, /* Window token; map name to atom * for this window's display. */ - char *name; /* Name to turn into atom. */ + char *name /* Name to turn into atom. */ +) { register TkDisplay *dispPtr; register Tcl_HashEntry *hPtr; @@ -101,11 +102,12 @@ Tk_InternAtom(tkwin, name) */ char * -Tk_GetAtomName(tkwin, atom) - Tk_Window tkwin; /* Window token; map atom to name +Tk_GetAtomName ( + Tk_Window tkwin, /* Window token; map atom to name * relative to this window's * display. */ - Atom atom; /* Atom whose name is wanted. */ + Atom atom /* Atom whose name is wanted. */ +) { register TkDisplay *dispPtr; register Tcl_HashEntry *hPtr; @@ -122,7 +124,7 @@ Tk_GetAtomName(tkwin, atom) int new; handler= Tk_CreateErrorHandler(dispPtr->display, BadAtom, - -1, -1, (int (*)()) NULL, (ClientData) NULL); + -1, -1, (int (*)(int *, XErrorEvent *)) NULL, (ClientData) NULL); name = XGetAtomName(dispPtr->display, atom); if (name == NULL) { name = "?bad atom?"; @@ -155,9 +157,10 @@ Tk_GetAtomName(tkwin, atom) *-------------------------------------------------------------- */ -static void -AtomInit(dispPtr) - register TkDisplay *dispPtr; /* Display to initialize. */ +static void +AtomInit ( + register TkDisplay *dispPtr /* Display to initialize. */ +) { dispPtr->atomInit = 1; Tcl_InitHashTable(&dispPtr->nameTable, TCL_STRING_KEYS); diff --git a/src/tk/tkbind.c b/src/tk/tkbind.c index d32d8c9..9c11224 100644 --- a/src/tk/tkbind.c +++ b/src/tk/tkbind.c @@ -403,11 +403,12 @@ static PatSeq * MatchPatterns _ANSI_ARGS_((TkDisplay *dispPtr, *-------------------------------------------------------------- */ -Tk_BindingTable -Tk_CreateBindingTable(interp) - Tcl_Interp *interp; /* Interpreter to associate with the binding +Tk_BindingTable +Tk_CreateBindingTable ( + Tcl_Interp *interp /* Interpreter to associate with the binding * table: commands are executed in this * interpreter. */ +) { register BindingTable *bindPtr; int i; @@ -479,10 +480,11 @@ Tk_CreateBindingTable(interp) *-------------------------------------------------------------- */ -void -Tk_DeleteBindingTable(bindingTable) - Tk_BindingTable bindingTable; /* Token for the binding table to +void +Tk_DeleteBindingTable ( + Tk_BindingTable bindingTable /* Token for the binding table to * destroy. */ +) { BindingTable *bindPtr = (BindingTable *) bindingTable; PatSeq *psPtr, *nextPtr; @@ -539,19 +541,20 @@ Tk_DeleteBindingTable(bindingTable) *-------------------------------------------------------------- */ -unsigned long -Tk_CreateBinding(interp, bindingTable, object, eventString, command, append) - Tcl_Interp *interp; /* Used for error reporting. */ - Tk_BindingTable bindingTable; /* Table in which to create binding. */ - ClientData object; /* Token for object with which binding +unsigned long +Tk_CreateBinding ( + Tcl_Interp *interp, /* Used for error reporting. */ + Tk_BindingTable bindingTable, /* Table in which to create binding. */ + ClientData object, /* Token for object with which binding * is associated. */ - char *eventString; /* String describing event sequence + char *eventString, /* String describing event sequence * that triggers binding. */ - char *command; /* Contains Tcl command to execute + char *command, /* Contains Tcl command to execute * when binding triggers. */ - int append; /* 0 means replace any existing + int append /* 0 means replace any existing * binding for eventString; 1 means * append to that binding. */ +) { BindingTable *bindPtr = (BindingTable *) bindingTable; register PatSeq *psPtr; @@ -608,14 +611,15 @@ Tk_CreateBinding(interp, bindingTable, object, eventString, command, append) *-------------------------------------------------------------- */ -int -Tk_DeleteBinding(interp, bindingTable, object, eventString) - Tcl_Interp *interp; /* Used for error reporting. */ - Tk_BindingTable bindingTable; /* Table in which to delete binding. */ - ClientData object; /* Token for object with which binding +int +Tk_DeleteBinding ( + Tcl_Interp *interp, /* Used for error reporting. */ + Tk_BindingTable bindingTable, /* Table in which to delete binding. */ + ClientData object, /* Token for object with which binding * is associated. */ - char *eventString; /* String describing event sequence + char *eventString /* String describing event sequence * that triggers binding. */ +) { BindingTable *bindPtr = (BindingTable *) bindingTable; register PatSeq *psPtr, *prevPtr; @@ -697,14 +701,15 @@ Tk_DeleteBinding(interp, bindingTable, object, eventString) */ char * -Tk_GetBinding(interp, bindingTable, object, eventString) - Tcl_Interp *interp; /* Interpreter for error reporting. */ - Tk_BindingTable bindingTable; /* Table in which to look for +Tk_GetBinding ( + Tcl_Interp *interp, /* Interpreter for error reporting. */ + Tk_BindingTable bindingTable, /* Table in which to look for * binding. */ - ClientData object; /* Token for object with which binding + ClientData object, /* Token for object with which binding * is associated. */ - char *eventString; /* String describing event sequence + char *eventString /* String describing event sequence * that triggers binding. */ +) { BindingTable *bindPtr = (BindingTable *) bindingTable; register PatSeq *psPtr; @@ -737,12 +742,13 @@ Tk_GetBinding(interp, bindingTable, object, eventString) *-------------------------------------------------------------- */ -void -Tk_GetAllBindings(interp, bindingTable, object) - Tcl_Interp *interp; /* Interpreter for error reporting. */ - Tk_BindingTable bindingTable; /* Table in which to look for +void +Tk_GetAllBindings ( + Tcl_Interp *interp, /* Interpreter for error reporting. */ + Tk_BindingTable bindingTable, /* Table in which to look for * bindings. */ - ClientData object; /* Token for object. */ + ClientData object /* Token for object. */ +) { BindingTable *bindPtr = (BindingTable *) bindingTable; @@ -892,11 +898,12 @@ Tk_GetAllBindings(interp, bindingTable, object) *-------------------------------------------------------------- */ -void -Tk_DeleteAllBindings(bindingTable, object) - Tk_BindingTable bindingTable; /* Table in which to delete +void +Tk_DeleteAllBindings ( + Tk_BindingTable bindingTable, /* Table in which to delete * bindings. */ - ClientData object; /* Token for object. */ + ClientData object /* Token for object. */ +) { BindingTable *bindPtr = (BindingTable *) bindingTable; register PatSeq *psPtr, *prevPtr; @@ -963,17 +970,18 @@ Tk_DeleteAllBindings(bindingTable, object) *-------------------------------------------------------------- */ -void -Tk_BindEvent(bindingTable, eventPtr, tkwin, numObjects, objectPtr) - Tk_BindingTable bindingTable; /* Table in which to look for +void +Tk_BindEvent ( + Tk_BindingTable bindingTable, /* Table in which to look for * bindings. */ - XEvent *eventPtr; /* What actually happened. */ - Tk_Window tkwin; /* Window on display where event + XEvent *eventPtr, /* What actually happened. */ + Tk_Window tkwin, /* Window on display where event * occurred (needed in order to * locate display information). */ - int numObjects; /* Number of objects at *objectPtr. */ - ClientData *objectPtr; /* Array of one or more objects + int numObjects, /* Number of objects at *objectPtr. */ + ClientData *objectPtr /* Array of one or more objects * to check for a matching binding. */ +) { BindingTable *bindPtr = (BindingTable *) bindingTable; TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr; @@ -1121,21 +1129,22 @@ Tk_BindEvent(bindingTable, eventPtr, tkwin, numObjects, objectPtr) */ static PatSeq * -FindSequence(interp, bindPtr, object, eventString, create, maskPtr) - Tcl_Interp *interp; /* Interpreter to use for error +FindSequence ( + Tcl_Interp *interp, /* Interpreter to use for error * reporting. */ - BindingTable *bindPtr; /* Table to use for lookup. */ - ClientData object; /* Token for object(s) with which binding + BindingTable *bindPtr, /* Table to use for lookup. */ + ClientData object, /* Token for object(s) with which binding * is associated. */ - char *eventString; /* String description of pattern to + char *eventString, /* String description of pattern to * match on. See user documentation * for details. */ - int create; /* 0 means don't create the entry if + int create, /* 0 means don't create the entry if * it doesn't already exist. Non-zero * means create. */ - unsigned long *maskPtr; /* *maskPtr is filled in with the event + unsigned long *maskPtr /* *maskPtr is filled in with the event * types on which this pattern sequence * depends. */ +) { Pattern pats[EVENT_BUFFER_SIZE]; @@ -1436,11 +1445,12 @@ FindSequence(interp, bindPtr, object, eventString, create, maskPtr) */ static char * -GetField(p, copy, size) - register char *p; /* Pointer to part of pattern. */ - register char *copy; /* Place to copy field. */ - int size; /* Maximum number of characters to +GetField ( + register char *p, /* Pointer to part of pattern. */ + register char *copy, /* Place to copy field. */ + int size /* Maximum number of characters to * copy. */ +) { while ((*p != '\0') && !isspace(*p) && (*p != '>') && (*p != '-') && (size > 1)) { @@ -1473,11 +1483,12 @@ GetField(p, copy, size) *---------------------------------------------------------------------- */ -static KeySym -GetKeySym(dispPtr, eventPtr) - register TkDisplay *dispPtr; /* Display in which to +static KeySym +GetKeySym ( + register TkDisplay *dispPtr, /* Display in which to * map keycode. */ - register XEvent *eventPtr; /* Description of X event. */ + register XEvent *eventPtr /* Description of X event. */ +) { KeySym *symPtr; KeySym sym; @@ -1576,11 +1587,12 @@ GetKeySym(dispPtr, eventPtr) */ static PatSeq * -MatchPatterns(dispPtr, bindPtr, psPtr) - TkDisplay *dispPtr; - BindingTable *bindPtr; /* Information about binding table, such +MatchPatterns ( + TkDisplay *dispPtr, + BindingTable *bindPtr, /* Information about binding table, such * as ring of recent events. */ - register PatSeq *psPtr; /* List of pattern sequences. */ + register PatSeq *psPtr /* List of pattern sequences. */ +) { register PatSeq *bestPtr = NULL; @@ -1805,18 +1817,19 @@ MatchPatterns(dispPtr, bindPtr, psPtr) */ static char * -ExpandPercents(before, eventPtr, keySym, after, afterSize) - register char *before; /* Command containing percent +ExpandPercents ( + register char *before, /* Command containing percent * expressions to be replaced. */ - register XEvent *eventPtr; /* X event containing information + register XEvent *eventPtr, /* X event containing information * to be used in % replacements. */ - KeySym keySym; /* KeySym: only relevant for + KeySym keySym, /* KeySym: only relevant for * KeyPress and KeyRelease events). */ - char *after; /* Place to generate new expanded + char *after, /* Place to generate new expanded * command. Must contain at least * "afterSize" bytes of space. */ - int afterSize; /* Number of bytes of space available at + int afterSize /* Number of bytes of space available at * after. */ +) { register char *buffer; /* Pointer to buffer currently being used * as destination. */ @@ -2178,10 +2191,11 @@ ExpandPercents(before, eventPtr, keySym, after, afterSize) *---------------------------------------------------------------------- */ -void -TkBindError(interp) - Tcl_Interp *interp; /* Interpreter in which an error has +void +TkBindError ( + Tcl_Interp *interp /* Interpreter in which an error has * occurred. */ +) { char *argv[2]; char *command; diff --git a/src/tk/tkbitmap.c b/src/tk/tkbitmap.c index c7693e8..77fefcc 100644 --- a/src/tk/tkbitmap.c +++ b/src/tk/tkbitmap.c @@ -131,12 +131,13 @@ static void BitmapInit _ANSI_ARGS_((void)); *---------------------------------------------------------------------- */ -Pixmap -Tk_GetBitmap(interp, tkwin, string) - Tcl_Interp *interp; /* Interpreter to use for error reporting. */ - Tk_Window tkwin; /* Window in which bitmap will be used. */ - Tk_Uid string; /* Description of bitmap. See manual entry +Pixmap +Tk_GetBitmap ( + Tcl_Interp *interp, /* Interpreter to use for error reporting. */ + Tk_Window tkwin, /* Window in which bitmap will be used. */ + Tk_Uid string /* Description of bitmap. See manual entry * for details on legal syntax. */ +) { NameKey key; Tcl_HashEntry *nameHashPtr, *idHashPtr, *predefHashPtr; @@ -243,14 +244,15 @@ Tk_GetBitmap(interp, tkwin, string) *---------------------------------------------------------------------- */ -int -Tk_DefineBitmap(interp, name, source, width, height) - Tcl_Interp *interp; /* Interpreter to use for error reporting. */ - Tk_Uid name; /* Name to use for bitmap. Must not already +int +Tk_DefineBitmap ( + Tcl_Interp *interp, /* Interpreter to use for error reporting. */ + Tk_Uid name, /* Name to use for bitmap. Must not already * be defined as a bitmap. */ - char *source; /* Address of bits for bitmap. */ - unsigned int width; /* Width of bitmap. */ - unsigned int height; /* Height of bitmap. */ + char *source, /* Address of bits for bitmap. */ + unsigned int width, /* Width of bitmap. */ + unsigned int height /* Height of bitmap. */ +) { int new; Tcl_HashEntry *predefHashPtr; @@ -291,9 +293,10 @@ Tk_DefineBitmap(interp, name, source, width, height) *-------------------------------------------------------------- */ -Tk_Uid -Tk_NameOfBitmap(bitmap) - Pixmap bitmap; /* Bitmap whose name is wanted. */ +Tk_Uid +Tk_NameOfBitmap ( + Pixmap bitmap /* Bitmap whose name is wanted. */ +) { Tcl_HashEntry *idHashPtr; TkBitmap *bitmapPtr; @@ -330,11 +333,12 @@ Tk_NameOfBitmap(bitmap) *-------------------------------------------------------------- */ -void -Tk_SizeOfBitmap(bitmap, widthPtr, heightPtr) - Pixmap bitmap; /* Bitmap whose size is wanted. */ - unsigned int *widthPtr; /* Store bitmap width here. */ - unsigned int *heightPtr; /* Store bitmap height here. */ +void +Tk_SizeOfBitmap ( + Pixmap bitmap, /* Bitmap whose size is wanted. */ + unsigned int *widthPtr, /* Store bitmap width here. */ + unsigned int *heightPtr /* Store bitmap height here. */ +) { Tcl_HashEntry *idHashPtr; TkBitmap *bitmapPtr; @@ -371,9 +375,10 @@ Tk_SizeOfBitmap(bitmap, widthPtr, heightPtr) *---------------------------------------------------------------------- */ -void -Tk_FreeBitmap(bitmap) - Pixmap bitmap; /* Bitmap to be released. */ +void +Tk_FreeBitmap ( + Pixmap bitmap /* Bitmap to be released. */ +) { Tcl_HashEntry *idHashPtr; register TkBitmap *bitmapPtr; @@ -422,12 +427,14 @@ Tk_FreeBitmap(bitmap) */ /* ARGSUSED */ -Pixmap -Tk_GetBitmapFromData(interp, tkwin, source, width, height) - Tcl_Interp *interp; /* Interpreter to use for error reporting. */ - Tk_Window tkwin; /* Window in which bitmap will be used. */ - char *source; /* Bitmap data for bitmap shape. */ - unsigned int width, height; /* Dimensions of bitmap. */ +Pixmap +Tk_GetBitmapFromData ( + Tcl_Interp *interp, /* Interpreter to use for error reporting. */ + Tk_Window tkwin, /* Window in which bitmap will be used. */ + char *source, /* Bitmap data for bitmap shape. */ + unsigned int width, + unsigned int height /* Dimensions of bitmap. */ +) { DataKey key; Tcl_HashEntry *dataHashPtr; @@ -476,8 +483,8 @@ Tk_GetBitmapFromData(interp, tkwin, source, width, height) *---------------------------------------------------------------------- */ -static void -BitmapInit() +static void +BitmapInit (void) { Tcl_Interp *dummy; diff --git a/src/tk/tkbutton.c b/src/tk/tkbutton.c index 1d5ab0f..c32c0d4 100644 --- a/src/tk/tkbutton.c +++ b/src/tk/tkbutton.c @@ -349,13 +349,14 @@ static int InvokeButton _ANSI_ARGS_((Button *butPtr)); *-------------------------------------------------------------- */ -int -Tk_ButtonCmd(clientData, interp, argc, argv) - ClientData clientData; /* Main window associated with +int +Tk_ButtonCmd ( + ClientData clientData, /* Main window associated with * interpreter. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { register Button *butPtr; int type; @@ -435,7 +436,7 @@ Tk_ButtonCmd(clientData, interp, argc, argv) Tk_CreateEventHandler(butPtr->tkwin, ExposureMask|StructureNotifyMask, ButtonEventProc, (ClientData) butPtr); Tcl_CreateCommand(interp, Tk_PathName(butPtr->tkwin), ButtonWidgetCmd, - (ClientData) butPtr, (void (*)()) NULL); + (ClientData) butPtr, (void (*)(int *)) NULL); if (ConfigureButton(interp, butPtr, argc-2, argv+2, configFlags[type]) != TCL_OK) { Tk_DestroyWindow(butPtr->tkwin); @@ -464,12 +465,13 @@ Tk_ButtonCmd(clientData, interp, argc, argv) *-------------------------------------------------------------- */ -static int -ButtonWidgetCmd(clientData, interp, argc, argv) - ClientData clientData; /* Information about button widget. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +static int +ButtonWidgetCmd ( + ClientData clientData, /* Information about button widget. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { register Button *butPtr = (Button *) clientData; int result = TCL_OK; @@ -642,9 +644,10 @@ ButtonWidgetCmd(clientData, interp, argc, argv) *---------------------------------------------------------------------- */ -static void -DestroyButton(clientData) - ClientData clientData; /* Info about entry widget. */ +static void +DestroyButton ( + ClientData clientData /* Info about entry widget. */ +) { register Button *butPtr = (Button *) clientData; @@ -749,13 +752,14 @@ DestroyButton(clientData) */ static int -ConfigureButton(interp, butPtr, argc, argv, flags) - Tcl_Interp *interp; /* Used for error reporting. */ - register Button *butPtr; /* Information about widget; may or may +ConfigureButton( + Tcl_Interp *interp, /* Used for error reporting. */ + register Button *butPtr, /* Information about widget; may or may * not already have values for some fields. */ - int argc; /* Number of valid entries in argv. */ - char **argv; /* Arguments. */ - int flags; /* Flags to pass to Tk_ConfigureWidget. */ + int argc, /* Number of valid entries in argv. */ + char **argv, /* Arguments. */ + int flags /* Flags to pass to Tk_ConfigureWidget. */ +) { XGCValues gcValues; GC newGC; @@ -975,9 +979,10 @@ ConfigureButton(interp, butPtr, argc, argv, flags) *---------------------------------------------------------------------- */ -static void -DisplayButton(clientData) - ClientData clientData; /* Information about widget. */ +static void +DisplayButton ( + ClientData clientData /* Information about widget. */ +) { register Button *butPtr = (Button *) clientData; GC gc; @@ -1219,10 +1224,11 @@ DisplayButton(clientData) *-------------------------------------------------------------- */ -static void -ButtonEventProc(clientData, eventPtr) - ClientData clientData; /* Information about window. */ - XEvent *eventPtr; /* Information about event. */ +static void +ButtonEventProc ( + ClientData clientData, /* Information about window. */ + XEvent *eventPtr /* Information about event. */ +) { Button *butPtr = (Button *) clientData; if ((eventPtr->type == Expose) && (eventPtr->xexpose.count == 0)) { @@ -1276,8 +1282,9 @@ ButtonEventProc(clientData, eventPtr) */ static void -ComputeButtonGeometry(butPtr) - register Button *butPtr; /* Button whose geometry may have changed. */ +ComputeButtonGeometry( + register Button *butPtr /* Button whose geometry may have changed. */ +) { XCharStruct bbox; int dummy; @@ -1366,8 +1373,9 @@ ComputeButtonGeometry(butPtr) */ static int -InvokeButton(butPtr) - register Button *butPtr; /* Information about button. */ +InvokeButton( + register Button *butPtr /* Information about button. */ +) { if (butPtr->type == TYPE_CHECK_BUTTON) { if (butPtr->flags & SELECTED) { @@ -1408,12 +1416,13 @@ InvokeButton(butPtr) /* ARGSUSED */ static char * -ButtonVarProc(clientData, interp, name1, name2, flags) - ClientData clientData; /* Information about button. */ - Tcl_Interp *interp; /* Interpreter containing variable. */ - char *name1; /* Name of variable. */ - char *name2; /* Second part of variable name. */ - int flags; /* Information about what happened. */ +ButtonVarProc ( + ClientData clientData, /* Information about button. */ + Tcl_Interp *interp, /* Interpreter containing variable. */ + char *name1, /* Name of variable. */ + char *name2, /* Second part of variable name. */ + int flags /* Information about what happened. */ +) { register Button *butPtr = (Button *) clientData; char *value; @@ -1489,12 +1498,13 @@ ButtonVarProc(clientData, interp, name1, name2, flags) /* ARGSUSED */ static char * -ButtonTextVarProc(clientData, interp, name1, name2, flags) - ClientData clientData; /* Information about button. */ - Tcl_Interp *interp; /* Interpreter containing variable. */ - char *name1; /* Name of variable. */ - char *name2; /* Second part of variable name. */ - int flags; /* Information about what happened. */ +ButtonTextVarProc ( + ClientData clientData, /* Information about button. */ + Tcl_Interp *interp, /* Interpreter containing variable. */ + char *name1, /* Name of variable. */ + char *name2, /* Second part of variable name. */ + int flags /* Information about what happened. */ +) { register Button *butPtr = (Button *) clientData; char *value; diff --git a/src/tk/tkcanvas.c b/src/tk/tkcanvas.c index 90a9619..f1c4af5 100644 --- a/src/tk/tkcanvas.c +++ b/src/tk/tkcanvas.c @@ -252,12 +252,13 @@ Tk_CustomOption tkCanvasTagsOption = { */ int -Tk_CanvasCmd(clientData, interp, argc, argv) - ClientData clientData; /* Main window associated with +Tk_CanvasCmd( + ClientData clientData, /* Main window associated with * interpreter. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { Tk_Window tkwin = (Tk_Window) clientData; register Tk_Canvas *canvasPtr; @@ -326,7 +327,7 @@ Tk_CanvasCmd(clientData, interp, argc, argv) Tk_CreateSelHandler(canvasPtr->tkwin, XA_STRING, CanvasFetchSelection, (ClientData) canvasPtr, XA_STRING); Tcl_CreateCommand(interp, Tk_PathName(canvasPtr->tkwin), CanvasWidgetCmd, - (ClientData) canvasPtr, (void (*)()) NULL); + (ClientData) canvasPtr, (void (*)(int *)) NULL); if (ConfigureCanvas(interp, canvasPtr, argc-2, argv+2, 0) != TCL_OK) { goto error; } @@ -360,12 +361,13 @@ Tk_CanvasCmd(clientData, interp, argc, argv) */ static int -CanvasWidgetCmd(clientData, interp, argc, argv) - ClientData clientData; /* Information about canvas +CanvasWidgetCmd( + ClientData clientData, /* Information about canvas * widget. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { register Tk_Canvas *canvasPtr = (Tk_Canvas *) clientData; int length, result; @@ -1311,8 +1313,9 @@ CanvasWidgetCmd(clientData, interp, argc, argv) */ static void -DestroyCanvas(clientData) - ClientData clientData; /* Info about canvas widget. */ +DestroyCanvas( + ClientData clientData /* Info about canvas widget. */ +) { register Tk_Canvas *canvasPtr = (Tk_Canvas *) clientData; register Tk_Item *itemPtr; @@ -1386,13 +1389,14 @@ DestroyCanvas(clientData) */ static int -ConfigureCanvas(interp, canvasPtr, argc, argv, flags) - Tcl_Interp *interp; /* Used for error reporting. */ - register Tk_Canvas *canvasPtr; /* Information about widget; may or may +ConfigureCanvas( + Tcl_Interp *interp, /* Used for error reporting. */ + register Tk_Canvas *canvasPtr, /* Information about widget; may or may * not already have values for some fields. */ - int argc; /* Number of valid entries in argv. */ - char **argv; /* Arguments. */ - int flags; /* Flags to pass to Tk_ConfigureWidget. */ + int argc, /* Number of valid entries in argv. */ + char **argv, /* Arguments. */ + int flags /* Flags to pass to Tk_ConfigureWidget. */ +) { XGCValues gcValues; GC new; @@ -1507,14 +1511,15 @@ ConfigureCanvas(interp, canvasPtr, argc, argv, flags) */ static int -SaveCanvas(interp, canvasPtr, fileName, x, y, width, height) - Tcl_Interp *interp; /* Used for error reporting. */ - register Tk_Canvas *canvasPtr; /* Information about widget */ - char *fileName; /* the output file name. */ - int x; /* upper left x coordinate. */ - int y; /* upper left y coordinate. */ - unsigned int width; /* width of pixmap area to save. */ - unsigned int height; /* height of pixmap area to save. */ +SaveCanvas( + Tcl_Interp *interp, /* Used for error reporting. */ + register Tk_Canvas *canvasPtr, /* Information about widget */ + char *fileName, /* the output file name. */ + int x, /* upper left x coordinate. */ + int y, /* upper left y coordinate. */ + unsigned int width, /* width of pixmap area to save. */ + unsigned int height /* height of pixmap area to save. */ +) { register Tk_Window tkwin = canvasPtr->tkwin; register Tk_Item *itemPtr; @@ -1701,8 +1706,9 @@ SaveCanvas(interp, canvasPtr, fileName, x, y, width, height) */ static void -DisplayCanvas(clientData) - ClientData clientData; /* Information about widget. */ +DisplayCanvas( + ClientData clientData /* Information about widget. */ +) { register Tk_Canvas *canvasPtr = (Tk_Canvas *) clientData; register Tk_Window tkwin = canvasPtr->tkwin; @@ -1890,9 +1896,10 @@ DisplayCanvas(clientData) */ static void -CanvasEventProc(clientData, eventPtr) - ClientData clientData; /* Information about window. */ - XEvent *eventPtr; /* Information about event. */ +CanvasEventProc( + ClientData clientData, /* Information about window. */ + XEvent *eventPtr /* Information about event. */ +) { Tk_Canvas *canvasPtr = (Tk_Canvas *) clientData; @@ -1947,15 +1954,18 @@ CanvasEventProc(clientData, eventPtr) *-------------------------------------------------------------- */ -static void -EventuallyRedrawArea(canvasPtr, x1, y1, x2, y2) - register Tk_Canvas *canvasPtr; /* Information about widget. */ - int x1, y1; /* Upper left corner of area to +static void +EventuallyRedrawArea ( + register Tk_Canvas *canvasPtr, /* Information about widget. */ + int x1, + int y1, /* Upper left corner of area to * redraw. Pixels on edge are * redrawn. */ - int x2, y2; /* Lower right corner of area to + int x2, + int y2 /* Lower right corner of area to * redraw. Pixels on edge are * not redrawn. */ +) { if ((canvasPtr->tkwin == NULL) || !Tk_IsMapped(canvasPtr->tkwin)) { return; @@ -2012,11 +2022,12 @@ EventuallyRedrawArea(canvasPtr, x1, y1, x2, y2) *-------------------------------------------------------------- */ -void -Tk_CreateItemType(typePtr) - Tk_ItemType *typePtr; /* Information about item type; +void +Tk_CreateItemType ( + Tk_ItemType *typePtr /* Information about item type; * storage must be statically * allocated (must live forever). */ +) { if (typeList == NULL) { InitCanvas(); @@ -2043,8 +2054,8 @@ Tk_CreateItemType(typePtr) *-------------------------------------------------------------- */ -static void -InitCanvas() +static void +InitCanvas (void) { if (typeList != NULL) { return; @@ -2088,12 +2099,13 @@ InitCanvas() */ static Tk_Item * -StartTagSearch(canvasPtr, tag, searchPtr) - Tk_Canvas *canvasPtr; /* Canvas whose items are to be +StartTagSearch ( + Tk_Canvas *canvasPtr, /* Canvas whose items are to be * searched. */ - char *tag; /* String giving tag value. */ - TagSearch *searchPtr; /* Record describing tag search; + char *tag, /* String giving tag value. */ + TagSearch *searchPtr /* Record describing tag search; * will be initialized here. */ +) { int id; register Tk_Item *itemPtr, *prevPtr; @@ -2197,9 +2209,10 @@ StartTagSearch(canvasPtr, tag, searchPtr) */ static Tk_Item * -NextItem(searchPtr) - TagSearch *searchPtr; /* Record describing search in +NextItem ( + TagSearch *searchPtr /* Record describing search in * progress. */ +) { register Tk_Item *itemPtr, *prevPtr; register int count; @@ -2285,12 +2298,13 @@ NextItem(searchPtr) */ static void -DoItem(interp, itemPtr, tag) - Tcl_Interp *interp; /* Interpreter in which to (possibly) +DoItem( + Tcl_Interp *interp, /* Interpreter in which to (possibly) * record item id. */ - register Tk_Item *itemPtr; /* Item to (possibly) modify. */ - Tk_Uid tag; /* Tag to add to those already + register Tk_Item *itemPtr, /* Item to (possibly) modify. */ + Tk_Uid tag /* Tag to add to those already * present for item, or NULL. */ +) { register Tk_Uid *tagPtr; register int count; @@ -2367,24 +2381,25 @@ DoItem(interp, itemPtr, tag) */ static int -FindItems(interp, canvasPtr, argc, argv, newTag, cmdName, option) - Tcl_Interp *interp; /* Interpreter for error reporting. */ - Tk_Canvas *canvasPtr; /* Canvas whose items are to be +FindItems( + Tcl_Interp *interp, /* Interpreter for error reporting. */ + Tk_Canvas *canvasPtr, /* Canvas whose items are to be * searched. */ - int argc; /* Number of entries in argv. Must be + int argc, /* Number of entries in argv. Must be * greater than zero. */ - char **argv; /* Arguments that describe what items + char **argv, /* Arguments that describe what items * to search for (see user doc on * "find" and "addtag" options). */ - char *newTag; /* If non-NULL, gives new tag to set - * on all found items; if NULL, then + char *newTag, /* If non-NULL, gives new tag to set + * on all found items, if NULL, then * ids of found items are returned * in interp->result. */ - char *cmdName; /* Name of original Tcl command, for + char *cmdName, /* Name of original Tcl command, for * use in error messages. */ - char *option; /* For error messages: gives option + char *option /* For error messages: gives option * from Tcl command and other stuff * up to what's in argc/argv. */ +) { char c; int length; @@ -2598,21 +2613,22 @@ FindItems(interp, canvasPtr, argc, argv, newTag, cmdName, option) */ static int -FindArea(interp, canvasPtr, argv, uid, enclosed) - Tcl_Interp *interp; /* Interpreter for error reporting +FindArea( + Tcl_Interp *interp, /* Interpreter for error reporting * and result storing. */ - Tk_Canvas *canvasPtr; /* Canvas whose items are to be + Tk_Canvas *canvasPtr, /* Canvas whose items are to be * searched. */ - char **argv; /* Array of four arguments that + char **argv, /* Array of four arguments that * give the coordinates of the * rectangular area to search. */ - Tk_Uid uid; /* If non-NULL, gives new tag to set - * on all found items; if NULL, then + Tk_Uid uid, /* If non-NULL, gives new tag to set + * on all found items, if NULL, then * ids of found items are returned * in interp->result. */ - int enclosed; /* 0 means overlapping or enclosed + int enclosed /* 0 means overlapping or enclosed * items are OK, 1 means only enclosed * items are OK. */ +) { double rect[4], tmp; int x1, y1, x2, y2; @@ -2674,14 +2690,15 @@ FindArea(interp, canvasPtr, argv, uid, enclosed) *-------------------------------------------------------------- */ -static void -RelinkItems(canvasPtr, tag, prevPtr) - Tk_Canvas *canvasPtr; /* Canvas to be modified. */ - char *tag; /* Tag identifying items to be moved +static void +RelinkItems ( + Tk_Canvas *canvasPtr, /* Canvas to be modified. */ + char *tag, /* Tag identifying items to be moved * in the redisplay list. */ - Tk_Item *prevPtr; /* Reposition the items so that they + Tk_Item *prevPtr /* Reposition the items so that they * go just after this item (NULL means * put at beginning of list). */ +) { register Tk_Item *itemPtr; TagSearch search; @@ -2762,10 +2779,11 @@ RelinkItems(canvasPtr, tag, prevPtr) */ static void -CanvasBindProc(clientData, eventPtr) - ClientData clientData; /* Pointer to canvas structure. */ - XEvent *eventPtr; /* Pointer to X event that just +CanvasBindProc( + ClientData clientData, /* Pointer to canvas structure. */ + XEvent *eventPtr /* Pointer to X event that just * happened. */ +) { Tk_Canvas *canvasPtr = (Tk_Canvas *) clientData; int repick = 0; @@ -2853,14 +2871,15 @@ CanvasBindProc(clientData, eventPtr) *-------------------------------------------------------------- */ -static void -PickCurrentItem(canvasPtr, eventPtr) - register Tk_Canvas *canvasPtr; /* Canvas pointer in which to select +static void +PickCurrentItem ( + register Tk_Canvas *canvasPtr, /* Canvas pointer in which to select * current item. */ - XEvent *eventPtr; /* Event describing location of + XEvent *eventPtr /* Event describing location of * mouse cursor. Must be EnterWindow, * LeaveWindow, ButtonRelease, or * MotionNotify. */ +) { Tk_Item *closestPtr = NULL; @@ -2998,12 +3017,13 @@ PickCurrentItem(canvasPtr, eventPtr) *-------------------------------------------------------------- */ -static void -CanvasDoEvent(canvasPtr, eventPtr) - Tk_Canvas *canvasPtr; /* Canvas widget in which event +static void +CanvasDoEvent ( + Tk_Canvas *canvasPtr, /* Canvas widget in which event * occurred. */ - XEvent *eventPtr; /* Real or simulated X event that + XEvent *eventPtr /* Real or simulated X event that * is to be processed. */ +) { #define NUM_STATIC 3 ClientData staticObjects[NUM_STATIC]; @@ -3075,8 +3095,9 @@ CanvasDoEvent(canvasPtr, eventPtr) */ static void -CanvasBlinkProc(clientData) - ClientData clientData; /* Pointer to record describing entry. */ +CanvasBlinkProc( + ClientData clientData /* Pointer to record describing entry. */ +) { register Tk_Canvas *canvasPtr = (Tk_Canvas *) clientData; @@ -3120,10 +3141,11 @@ CanvasBlinkProc(clientData) */ static void -CanvasFocusProc(clientData, gotFocus) - ClientData clientData; /* Pointer to structure describing entry. */ - int gotFocus; /* 1 means window is getting focus, 0 means +CanvasFocusProc( + ClientData clientData, /* Pointer to structure describing entry. */ + int gotFocus /* 1 means window is getting focus, 0 means * it's losing it. */ +) { register Tk_Canvas *canvasPtr = (Tk_Canvas *) clientData; @@ -3163,13 +3185,14 @@ CanvasFocusProc(clientData, gotFocus) *---------------------------------------------------------------------- */ -static void -CanvasSelectTo(canvasPtr, itemPtr, index) - register Tk_Canvas *canvasPtr; /* Information about widget. */ - register Tk_Item *itemPtr; /* Item that is to hold selection. */ - int index; /* Index of element that is to +static void +CanvasSelectTo ( + register Tk_Canvas *canvasPtr, /* Information about widget. */ + register Tk_Item *itemPtr, /* Item that is to hold selection. */ + int index /* Index of element that is to * become the "other" end of the * selection. */ +) { int oldFirst, oldLast; Tk_Item *oldSelPtr; @@ -3233,15 +3256,16 @@ CanvasSelectTo(canvasPtr, itemPtr, index) */ static int -CanvasFetchSelection(clientData, offset, buffer, maxBytes) - ClientData clientData; /* Information about canvas widget. */ - int offset; /* Offset within selection of first +CanvasFetchSelection( + ClientData clientData, /* Information about canvas widget. */ + int offset, /* Offset within selection of first * character to be returned. */ - char *buffer; /* Location in which to place + char *buffer, /* Location in which to place * selection. */ - int maxBytes; /* Maximum number of bytes to place + int maxBytes /* Maximum number of bytes to place * at buffer, not including terminating * NULL character. */ +) { register Tk_Canvas *canvasPtr = (Tk_Canvas *) clientData; @@ -3274,8 +3298,9 @@ CanvasFetchSelection(clientData, offset, buffer, maxBytes) */ static void -CanvasLostSelection(clientData) - ClientData clientData; /* Information about entry widget. */ +CanvasLostSelection( + ClientData clientData /* Information about entry widget. */ +) { Tk_Canvas *canvasPtr = (Tk_Canvas *) clientData; @@ -3308,12 +3333,13 @@ CanvasLostSelection(clientData) *-------------------------------------------------------------- */ -int -TkGetCanvasCoord(canvasPtr, string, doublePtr) - Tk_Canvas *canvasPtr; /* Canvas to which coordinate applies. */ - char *string; /* Describes coordinate (any screen +int +TkGetCanvasCoord ( + Tk_Canvas *canvasPtr, /* Canvas to which coordinate applies. */ + char *string, /* Describes coordinate (any screen * coordinate form may be used here). */ - double *doublePtr; /* Place to store converted coordinate. */ + double *doublePtr /* Place to store converted coordinate. */ +) { if (Tk_GetScreenMM(canvasPtr->interp, canvasPtr->tkwin, string, doublePtr) != TCL_OK) { @@ -3342,11 +3368,12 @@ TkGetCanvasCoord(canvasPtr, string, doublePtr) *-------------------------------------------------------------- */ -static double -GridAlign(coord, spacing) - double coord; /* Coordinate to grid-align. */ - double spacing; /* Spacing between grid lines. If <= 0 +static double +GridAlign ( + double coord, /* Coordinate to grid-align. */ + double spacing /* Spacing between grid lines. If <= 0 * then no alignment is done. */ +) { if (spacing <= 0.0) { return coord; @@ -3378,9 +3405,10 @@ GridAlign(coord, spacing) *-------------------------------------------------------------- */ -static void -CanvasUpdateScrollbars(canvasPtr) - register Tk_Canvas *canvasPtr; /* Information about canvas. */ +static void +CanvasUpdateScrollbars ( + register Tk_Canvas *canvasPtr /* Information about canvas. */ +) { int result, size, first, last, page; char args[200]; @@ -3458,15 +3486,16 @@ CanvasUpdateScrollbars(canvasPtr) *-------------------------------------------------------------- */ -static void -CanvasSetOrigin(canvasPtr, xOrigin, yOrigin) - register Tk_Canvas *canvasPtr; /* Information about canvas. */ - int xOrigin; /* New X origin for canvas (canvas +static void +CanvasSetOrigin ( + register Tk_Canvas *canvasPtr, /* Information about canvas. */ + int xOrigin, /* New X origin for canvas (canvas * x-coord corresponding to left edge * of canvas window). */ - int yOrigin; /* New Y origin for canvas (canvas + int yOrigin /* New Y origin for canvas (canvas * y-coord corresponding to top edge * of canvas window). */ +) { /* * Adjust the origin if necessary to keep as much as possible of the @@ -3539,14 +3568,15 @@ CanvasSetOrigin(canvasPtr, xOrigin, yOrigin) /* ARGSUSED */ static int -CanvasTagsParseProc(clientData, interp, tkwin, value, widgRec, offset) - ClientData clientData; /* Not used.*/ - Tcl_Interp *interp; /* Used for reporting errors. */ - Tk_Window tkwin; /* Window containing canvas widget. */ - char *value; /* Value of option (list of tag +CanvasTagsParseProc( + ClientData clientData, /* Not used.*/ + Tcl_Interp *interp, /* Used for reporting errors. */ + Tk_Window tkwin, /* Window containing canvas widget. */ + char *value, /* Value of option (list of tag * names). */ - char *widgRec; /* Pointer to record for item. */ - int offset; /* Offset into item (ignored). */ + char *widgRec, /* Pointer to record for item. */ + int offset /* Offset into item (ignored). */ +) { register Tk_Item *itemPtr = (Tk_Item *) widgRec; int argc, i; @@ -3609,14 +3639,15 @@ CanvasTagsParseProc(clientData, interp, tkwin, value, widgRec, offset) /* ARGSUSED */ static char * -CanvasTagsPrintProc(clientData, tkwin, widgRec, offset, freeProcPtr) - ClientData clientData; /* Ignored. */ - Tk_Window tkwin; /* Window containing canvas widget. */ - char *widgRec; /* Pointer to record for item. */ - int offset; /* Ignored. */ - Tcl_FreeProc **freeProcPtr; /* Pointer to variable to fill in with +CanvasTagsPrintProc( + ClientData clientData, /* Ignored. */ + Tk_Window tkwin, /* Window containing canvas widget. */ + char *widgRec, /* Pointer to record for item. */ + int offset, /* Ignored. */ + Tcl_FreeProc **freeProcPtr /* Pointer to variable to fill in with * information about how to reclaim * storage for return string. */ +) { register Tk_Item *itemPtr = (Tk_Item *) widgRec; diff --git a/src/tk/tkcmds.c b/src/tk/tkcmds.c index 465740e..14207ad 100644 --- a/src/tk/tkcmds.c +++ b/src/tk/tkcmds.c @@ -65,13 +65,14 @@ static void WaitWindowProc _ANSI_ARGS_((ClientData clientData, */ /* ARGSUSED */ -int -Tk_AfterCmd(clientData, interp, argc, argv) - ClientData clientData; /* Main window associated with +int +Tk_AfterCmd ( + ClientData clientData, /* Main window associated with * interpreter. Not used.*/ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { int ms; AfterInfo *afterPtr; @@ -139,9 +140,10 @@ Tk_AfterCmd(clientData, interp, argc, argv) *---------------------------------------------------------------------- */ -static void -AfterProc(clientData) - ClientData clientData; /* Describes command to execute. */ +static void +AfterProc ( + ClientData clientData /* Describes command to execute. */ +) { AfterInfo *afterPtr = (AfterInfo *) clientData; int result; @@ -176,13 +178,14 @@ AfterProc(clientData) *---------------------------------------------------------------------- */ -int -Tk_BindCmd(clientData, interp, argc, argv) - ClientData clientData; /* Main window associated with +int +Tk_BindCmd ( + ClientData clientData, /* Main window associated with * interpreter. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { Tk_Window tkwin = (Tk_Window) clientData; TkWindow *winPtr; @@ -255,10 +258,11 @@ Tk_BindCmd(clientData, interp, argc, argv) *---------------------------------------------------------------------- */ -void -TkBindEventProc(winPtr, eventPtr) - TkWindow *winPtr; /* Pointer to info about window. */ - XEvent *eventPtr; /* Information about event. */ +void +TkBindEventProc ( + TkWindow *winPtr, /* Pointer to info about window. */ + XEvent *eventPtr /* Information about event. */ +) { ClientData objects[3]; static Tk_Uid allUid = NULL; @@ -293,13 +297,14 @@ TkBindEventProc(winPtr, eventPtr) *---------------------------------------------------------------------- */ -int -Tk_DestroyCmd(clientData, interp, argc, argv) - ClientData clientData; /* Main window associated with +int +Tk_DestroyCmd ( + ClientData clientData, /* Main window associated with * interpreter. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { Tk_Window window; Tk_Window tkwin = (Tk_Window) clientData; @@ -336,13 +341,14 @@ Tk_DestroyCmd(clientData, interp, argc, argv) */ /* ARGSUSED */ -int -Tk_UpdateCmd(clientData, interp, argc, argv) - ClientData clientData; /* Main window associated with +int +Tk_UpdateCmd ( + ClientData clientData, /* Main window associated with * interpreter. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { Tk_Window tkwin = (Tk_Window) clientData; int flags; @@ -404,13 +410,14 @@ Tk_UpdateCmd(clientData, interp, argc, argv) */ /* ARGSUSED */ -int -Tk_TkwaitCmd(clientData, interp, argc, argv) - ClientData clientData; /* Main window associated with +int +Tk_TkwaitCmd ( + ClientData clientData, /* Main window associated with * interpreter. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { Tk_Window tkwin = (Tk_Window) clientData; int c, length; @@ -466,12 +473,13 @@ Tk_TkwaitCmd(clientData, interp, argc, argv) /* ARGSUSED */ static char * -WaitVariableProc(clientData, interp, name1, name2, flags) - ClientData clientData; /* Pointer to integer to set to 1. */ - Tcl_Interp *interp; /* Interpreter containing variable. */ - char *name1; /* Name of variable. */ - char *name2; /* Second part of variable name. */ - int flags; /* Information about what happened. */ +WaitVariableProc ( + ClientData clientData, /* Pointer to integer to set to 1. */ + Tcl_Interp *interp, /* Interpreter containing variable. */ + char *name1, /* Name of variable. */ + char *name2, /* Second part of variable name. */ + int flags /* Information about what happened. */ +) { int *donePtr = (int *) clientData; @@ -479,10 +487,11 @@ WaitVariableProc(clientData, interp, name1, name2, flags) return (char *) NULL; } -static void -WaitWindowProc(clientData, eventPtr) - ClientData clientData; /* Pointer to integer to set to 1. */ - XEvent *eventPtr; /* Information about event. */ +static void +WaitWindowProc ( + ClientData clientData, /* Pointer to integer to set to 1. */ + XEvent *eventPtr /* Information about event. */ +) { int *donePtr = (int *) clientData; @@ -508,13 +517,14 @@ WaitWindowProc(clientData, eventPtr) *---------------------------------------------------------------------- */ -int -Tk_WinfoCmd(clientData, interp, argc, argv) - ClientData clientData; /* Main window associated with +int +Tk_WinfoCmd ( + ClientData clientData, /* Main window associated with * interpreter. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { Tk_Window tkwin = (Tk_Window) clientData; int length; @@ -805,12 +815,13 @@ Tk_WinfoCmd(clientData, interp, argc, argv) */ /* ARGSUSED */ -int -TkDeadAppCmd(clientData, interp, argc, argv) - ClientData clientData; /* Dummy. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +TkDeadAppCmd ( + ClientData clientData, /* Dummy. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { Tcl_AppendResult(interp, "can't invoke \"", argv[0], "\" command: application has been destroyed", (char *) NULL); diff --git a/src/tk/tkcolor.c b/src/tk/tkcolor.c index 4e95c80..713eec2 100644 --- a/src/tk/tkcolor.c +++ b/src/tk/tkcolor.c @@ -141,14 +141,15 @@ static void ColorInit _ANSI_ARGS_((void)); */ XColor * -Tk_GetColor(interp, tkwin, colormap, name) - Tcl_Interp *interp; /* Place to leave error message if +Tk_GetColor ( + Tcl_Interp *interp, /* Place to leave error message if * color can't be found. */ - Tk_Window tkwin; /* Window in which color will be used. */ - Colormap colormap; /* Map from which to allocate color. None + Tk_Window tkwin, /* Window in which color will be used. */ + Colormap colormap, /* Map from which to allocate color. None * means use default. */ - Tk_Uid name; /* Name of color to allocated (in form + Tk_Uid name /* Name of color to allocated (in form * suitable for passing to XParseColor). */ +) { NameKey nameKey; Tcl_HashEntry *nameHashPtr; @@ -252,14 +253,15 @@ Tk_GetColor(interp, tkwin, colormap, name) */ XColor * -Tk_GetColorByValue(interp, tkwin, colormap, colorPtr) - Tcl_Interp *interp; /* Place to leave error message if +Tk_GetColorByValue ( + Tcl_Interp *interp, /* Place to leave error message if * color can't be found. */ - Tk_Window tkwin; /* Window in which color will be used. */ - Colormap colormap; /* Map from which to allocate color. None + Tk_Window tkwin, /* Window in which color will be used. */ + Colormap colormap, /* Map from which to allocate color. None * means use default. */ - XColor *colorPtr; /* Red, green, and blue fields indicate + XColor *colorPtr /* Red, green, and blue fields indicate * desired color. */ +) { ValueKey valueKey; Tcl_HashEntry *valueHashPtr; @@ -339,8 +341,9 @@ Tk_GetColorByValue(interp, tkwin, colormap, colorPtr) */ char * -Tk_NameOfColor(colorPtr) - XColor *colorPtr; /* Color whose name is desired. */ +Tk_NameOfColor ( + XColor *colorPtr /* Color whose name is desired. */ +) { register TkColor *tkColPtr = (TkColor *) colorPtr; static char string[20]; @@ -373,11 +376,12 @@ Tk_NameOfColor(colorPtr) *---------------------------------------------------------------------- */ -void -Tk_FreeColor(colorPtr) - XColor *colorPtr; /* Color to be released. Must have been +void +Tk_FreeColor ( + XColor *colorPtr /* Color to be released. Must have been * allocated by Tk_GetColor or * Tk_GetColorByValue. */ +) { register TkColor *tkColPtr = (TkColor *) colorPtr; Visual *visual; @@ -429,8 +433,8 @@ Tk_FreeColor(colorPtr) *---------------------------------------------------------------------- */ -static void -ColorInit() +static void +ColorInit (void) { initialized = 1; Tcl_InitHashTable(&nameTable, sizeof(NameKey)/sizeof(int)); diff --git a/src/tk/tkconfig.c b/src/tk/tkconfig.c index 6087513..70ed65c 100644 --- a/src/tk/tkconfig.c +++ b/src/tk/tkconfig.c @@ -65,21 +65,22 @@ static char * FormatConfigInfo _ANSI_ARGS_ ((Tk_Window tkwin, *-------------------------------------------------------------- */ -int -Tk_ConfigureWidget(interp, tkwin, specs, argc, argv, widgRec, flags) - Tcl_Interp *interp; /* Interpreter for error reporting. */ - Tk_Window tkwin; /* Window containing widget (needed to +int +Tk_ConfigureWidget ( + Tcl_Interp *interp, /* Interpreter for error reporting. */ + Tk_Window tkwin, /* Window containing widget (needed to * set up X resources). */ - Tk_ConfigSpec *specs; /* Describes legal options. */ - int argc; /* Number of elements in argv. */ - char **argv; /* Command-line options. */ - char *widgRec; /* Record whose fields are to be + Tk_ConfigSpec *specs, /* Describes legal options. */ + int argc, /* Number of elements in argv. */ + char **argv, /* Command-line options. */ + char *widgRec, /* Record whose fields are to be * modified. Values must be properly * initialized. */ - int flags; /* Used to specify additional flags + int flags /* Used to specify additional flags * that must be present in config specs * for them to be considered. Also, * may have TK_CONFIG_ARGV_ONLY set. */ +) { register Tk_ConfigSpec *specPtr; Tk_Uid value; /* Value of option from database. */ @@ -224,16 +225,17 @@ Tk_ConfigureWidget(interp, tkwin, specs, argc, argv, widgRec, flags) */ static Tk_ConfigSpec * -FindConfigSpec(interp, specs, argvName, needFlags, hateFlags) - Tcl_Interp *interp; /* Used for reporting errors. */ - Tk_ConfigSpec *specs; /* Pointer to table of configuration +FindConfigSpec ( + Tcl_Interp *interp, /* Used for reporting errors. */ + Tk_ConfigSpec *specs, /* Pointer to table of configuration * specifications for a widget. */ - char *argvName; /* Name (suitable for use in a "config" + char *argvName, /* Name (suitable for use in a "config" * command) identifying particular option. */ - int needFlags; /* Flags that must be present in matching + int needFlags, /* Flags that must be present in matching * entry. */ - int hateFlags; /* Flags that must NOT be present in + int hateFlags /* Flags that must NOT be present in * matching entry. */ +) { register Tk_ConfigSpec *specPtr; register char c; /* First character of current argument. */ @@ -318,18 +320,19 @@ FindConfigSpec(interp, specs, argvName, needFlags, hateFlags) *-------------------------------------------------------------- */ -static int -DoConfig(interp, tkwin, specPtr, value, valueIsUid, widgRec) - Tcl_Interp *interp; /* Interpreter for error reporting. */ - Tk_Window tkwin; /* Window containing widget (needed to +static int +DoConfig ( + Tcl_Interp *interp, /* Interpreter for error reporting. */ + Tk_Window tkwin, /* Window containing widget (needed to * set up X resources). */ - Tk_ConfigSpec *specPtr; /* Specifier to apply. */ - char *value; /* Value to use to fill in widgRec. */ - int valueIsUid; /* Non-zero means value is a Tk_Uid; + Tk_ConfigSpec *specPtr, /* Specifier to apply. */ + char *value, /* Value to use to fill in widgRec. */ + int valueIsUid, /* Non-zero means value is a Tk_Uid; * zero means it's an ordinary string. */ - char *widgRec; /* Record whose fields are to be + char *widgRec /* Record whose fields are to be * modified. Values must be properly * initialized. */ +) { char *ptr; Tk_Uid uid; @@ -606,19 +609,20 @@ DoConfig(interp, tkwin, specPtr, value, valueIsUid, widgRec) *-------------------------------------------------------------- */ -int -Tk_ConfigureInfo(interp, tkwin, specs, widgRec, argvName, flags) - Tcl_Interp *interp; /* Interpreter for error reporting. */ - Tk_Window tkwin; /* Window corresponding to widgRec. */ - Tk_ConfigSpec *specs; /* Describes legal options. */ - char *widgRec; /* Record whose fields contain current +int +Tk_ConfigureInfo ( + Tcl_Interp *interp, /* Interpreter for error reporting. */ + Tk_Window tkwin, /* Window corresponding to widgRec. */ + Tk_ConfigSpec *specs, /* Describes legal options. */ + char *widgRec, /* Record whose fields contain current * values for options. */ - char *argvName; /* If non-NULL, indicates a single option + char *argvName, /* If non-NULL, indicates a single option * whose info is to be returned. Otherwise * info is returned for all options. */ - int flags; /* Used to specify additional flags + int flags /* Used to specify additional flags * that must be present in config specs * for them to be considered. */ +) { register Tk_ConfigSpec *specPtr; int needFlags, hateFlags; @@ -692,12 +696,13 @@ Tk_ConfigureInfo(interp, tkwin, specs, widgRec, argvName, flags) */ static char * -FormatConfigInfo(tkwin, specPtr, widgRec) - Tk_Window tkwin; /* Window corresponding to widget. */ - register Tk_ConfigSpec *specPtr; /* Pointer to information describing +FormatConfigInfo ( + Tk_Window tkwin, /* Window corresponding to widget. */ + register Tk_ConfigSpec *specPtr, /* Pointer to information describing * option. */ - char *widgRec; /* Pointer to record holding current + char *widgRec /* Pointer to record holding current * values of info for widget. */ +) { char *argv[6], *ptr, *result; char buffer[200]; diff --git a/src/tk/tkconfig.h b/src/tk/tkconfig.h index ca64595..9286b68 100644 --- a/src/tk/tkconfig.h +++ b/src/tk/tkconfig.h @@ -117,7 +117,7 @@ extern int gettimeofday _ANSI_ARGS_((struct timeval *tp, #if !(defined(_CRAY) || defined(sparc) || defined(_IBMR2) || defined(sgi)) extern int open _ANSI_ARGS_((CONST char *path, int flags, ...)); #endif -extern void panic _ANSI_ARGS_(VARARGS); +extern void panic _ANSI_ARGS_((char *format, ...)); #if 0 extern int read _ANSI_ARGS_((int fd, void *buf, unsigned int numBytes)); extern int select _ANSI_ARGS_((int nfds, SELECT_MASK *readfds, diff --git a/src/tk/tkcursor.c b/src/tk/tkcursor.c index 2c150bb..9008a34 100644 --- a/src/tk/tkcursor.c +++ b/src/tk/tkcursor.c @@ -207,12 +207,13 @@ static void CursorInit _ANSI_ARGS_((void)); *---------------------------------------------------------------------- */ -Cursor -Tk_GetCursor(interp, tkwin, string) - Tcl_Interp *interp; /* Interpreter to use for error reporting. */ - Tk_Window tkwin; /* Window in which cursor will be used. */ - Tk_Uid string; /* Description of cursor. See manual entry +Cursor +Tk_GetCursor ( + Tcl_Interp *interp, /* Interpreter to use for error reporting. */ + Tk_Window tkwin, /* Window in which cursor will be used. */ + Tk_Uid string /* Description of cursor. See manual entry * for details on legal syntax. */ +) { NameKey key; Tcl_HashEntry *nameHashPtr, *idHashPtr; @@ -444,17 +445,19 @@ Tk_GetCursor(interp, tkwin, string) *---------------------------------------------------------------------- */ -Cursor -Tk_GetCursorFromData(interp, tkwin, source, mask, width, height, - xHot, yHot, fg, bg) - Tcl_Interp *interp; /* Interpreter to use for error reporting. */ - Tk_Window tkwin; /* Window in which cursor will be used. */ - char *source; /* Bitmap data for cursor shape. */ - char *mask; /* Bitmap data for cursor mask. */ - unsigned int width, height; /* Dimensions of cursor. */ - int xHot, yHot; /* Location of hot-spot in cursor. */ - Tk_Uid fg; /* Foreground color for cursor. */ - Tk_Uid bg; /* Background color for cursor. */ +Cursor +Tk_GetCursorFromData ( + Tcl_Interp *interp, /* Interpreter to use for error reporting. */ + Tk_Window tkwin, /* Window in which cursor will be used. */ + char *source, /* Bitmap data for cursor shape. */ + char *mask, /* Bitmap data for cursor mask. */ + unsigned int width, + unsigned int height, /* Dimensions of cursor. */ + int xHot, + int yHot, /* Location of hot-spot in cursor. */ + Tk_Uid fg, /* Foreground color for cursor. */ + Tk_Uid bg /* Background color for cursor. */ +) { DataKey key; Tcl_HashEntry *dataHashPtr, *idHashPtr; @@ -551,8 +554,9 @@ Tk_GetCursorFromData(interp, tkwin, source, mask, width, height, */ char * -Tk_NameOfCursor(cursor) - Cursor cursor; /* Cursor to be released. */ +Tk_NameOfCursor ( + Cursor cursor /* Cursor to be released. */ +) { Tcl_HashEntry *idHashPtr; TkCursor *cursorPtr; @@ -592,9 +596,10 @@ Tk_NameOfCursor(cursor) *---------------------------------------------------------------------- */ -void -Tk_FreeCursor(cursor) - Cursor cursor; /* Cursor to be released. */ +void +Tk_FreeCursor ( + Cursor cursor /* Cursor to be released. */ +) { Tcl_HashEntry *idHashPtr; register TkCursor *cursorPtr; @@ -633,8 +638,8 @@ Tk_FreeCursor(cursor) *---------------------------------------------------------------------- */ -static void -CursorInit() +static void +CursorInit (void) { initialized = 1; Tcl_InitHashTable(&nameTable, sizeof(NameKey)/sizeof(long)); diff --git a/src/tk/tkcvarc.c b/src/tk/tkcvarc.c index 1251b43..5c9b29d 100644 --- a/src/tk/tkcvarc.c +++ b/src/tk/tkcvarc.c @@ -189,13 +189,14 @@ static Tk_Uid pieSliceUid = NULL; *-------------------------------------------------------------- */ -static int -CreateArc(canvasPtr, itemPtr, argc, argv) - register Tk_Canvas *canvasPtr; /* Canvas to hold new item. */ - Tk_Item *itemPtr; /* Record to hold new item; header +static int +CreateArc ( + register Tk_Canvas *canvasPtr, /* Canvas to hold new item. */ + Tk_Item *itemPtr, /* Record to hold new item; header * has been initialized by caller. */ - int argc; /* Number of arguments in argv. */ - char **argv; /* Arguments describing arc. */ + int argc, /* Number of arguments in argv. */ + char **argv /* Arguments describing arc. */ +) { register ArcItem *arcPtr = (ArcItem *) itemPtr; @@ -273,15 +274,16 @@ CreateArc(canvasPtr, itemPtr, argc, argv) *-------------------------------------------------------------- */ -static int -ArcCoords(canvasPtr, itemPtr, argc, argv) - register Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item whose coordinates are to be +static int +ArcCoords ( + register Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item whose coordinates are to be * read or modified. */ - int argc; /* Number of coordinates supplied in + int argc, /* Number of coordinates supplied in * argv. */ - char **argv; /* Array of coordinates: x1, y1, + char **argv /* Array of coordinates: x1, y1, * x2, y2, ... */ +) { register ArcItem *arcPtr = (ArcItem *) itemPtr; char buffer[500]; @@ -331,13 +333,14 @@ ArcCoords(canvasPtr, itemPtr, argc, argv) *-------------------------------------------------------------- */ -static int -ConfigureArc(canvasPtr, itemPtr, argc, argv, flags) - Tk_Canvas *canvasPtr; /* Canvas containing itemPtr. */ - Tk_Item *itemPtr; /* Arc item to reconfigure. */ - int argc; /* Number of elements in argv. */ - char **argv; /* Arguments describing things to configure. */ - int flags; /* Flags to pass to Tk_ConfigureWidget. */ +static int +ConfigureArc ( + Tk_Canvas *canvasPtr, /* Canvas containing itemPtr. */ + Tk_Item *itemPtr, /* Arc item to reconfigure. */ + int argc, /* Number of elements in argv. */ + char **argv, /* Arguments describing things to configure. */ + int flags /* Flags to pass to Tk_ConfigureWidget. */ +) { register ArcItem *arcPtr = (ArcItem *) itemPtr; XGCValues gcValues; @@ -447,9 +450,10 @@ ConfigureArc(canvasPtr, itemPtr, argc, argv, flags) *-------------------------------------------------------------- */ -static void -DeleteArc(itemPtr) - Tk_Item *itemPtr; /* Item that is being deleted. */ +static void +DeleteArc ( + Tk_Item *itemPtr /* Item that is being deleted. */ +) { register ArcItem *arcPtr = (ArcItem *) itemPtr; @@ -492,11 +496,12 @@ DeleteArc(itemPtr) */ /* ARGSUSED */ -static void -ComputeArcBbox(canvasPtr, arcPtr) - register Tk_Canvas *canvasPtr; /* Canvas that contains item. */ - register ArcItem *arcPtr; /* Item whose bbox is to be +static void +ComputeArcBbox ( + register Tk_Canvas *canvasPtr, /* Canvas that contains item. */ + register ArcItem *arcPtr /* Item whose bbox is to be * recomputed. */ +) { double tmp, center[2], point[2]; @@ -606,12 +611,13 @@ ComputeArcBbox(canvasPtr, arcPtr) *-------------------------------------------------------------- */ -static void -DisplayArc(canvasPtr, itemPtr, drawable) - register Tk_Canvas *canvasPtr; /* Canvas that contains item. */ - Tk_Item *itemPtr; /* Item to be displayed. */ - Drawable drawable; /* Pixmap or window in which to draw +static void +DisplayArc ( + register Tk_Canvas *canvasPtr, /* Canvas that contains item. */ + Tk_Item *itemPtr, /* Item to be displayed. */ + Drawable drawable /* Pixmap or window in which to draw * item. */ +) { register ArcItem *arcPtr = (ArcItem *) itemPtr; Display *display = Tk_Display(canvasPtr->tkwin); @@ -711,11 +717,12 @@ DisplayArc(canvasPtr, itemPtr, drawable) */ /* ARGSUSED */ -static double -ArcToPoint(canvasPtr, itemPtr, pointPtr) - Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item to check against point. */ - double *pointPtr; /* Pointer to x and y coordinates. */ +static double +ArcToPoint ( + Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item to check against point. */ + double *pointPtr /* Pointer to x and y coordinates. */ +) { register ArcItem *arcPtr = (ArcItem *) itemPtr; double vertex[2], pointAngle, diff, dist, newDist; @@ -863,13 +870,14 @@ ArcToPoint(canvasPtr, itemPtr, pointPtr) */ /* ARGSUSED */ -static int -ArcToArea(canvasPtr, itemPtr, rectPtr) - Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item to check against arc. */ - double *rectPtr; /* Pointer to array of four coordinates +static int +ArcToArea ( + Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item to check against arc. */ + double *rectPtr /* Pointer to array of four coordinates * (x1, y1, x2, y2) describing rectangular * area. */ +) { register ArcItem *arcPtr = (ArcItem *) itemPtr; double rx, ry; /* Radii for transformed oval: these define @@ -1106,13 +1114,15 @@ ArcToArea(canvasPtr, itemPtr, rectPtr) *-------------------------------------------------------------- */ -static void -ScaleArc(canvasPtr, itemPtr, originX, originY, scaleX, scaleY) - Tk_Canvas *canvasPtr; /* Canvas containing arc. */ - Tk_Item *itemPtr; /* Arc to be scaled. */ - double originX, originY; /* Origin about which to scale rect. */ - double scaleX; /* Amount to scale in X direction. */ - double scaleY; /* Amount to scale in Y direction. */ +static void +ScaleArc ( + Tk_Canvas *canvasPtr, /* Canvas containing arc. */ + Tk_Item *itemPtr, /* Arc to be scaled. */ + double originX, + double originY, /* Origin about which to scale rect. */ + double scaleX, /* Amount to scale in X direction. */ + double scaleY /* Amount to scale in Y direction. */ +) { register ArcItem *arcPtr = (ArcItem *) itemPtr; @@ -1141,12 +1151,14 @@ ScaleArc(canvasPtr, itemPtr, originX, originY, scaleX, scaleY) *-------------------------------------------------------------- */ -static void -TranslateArc(canvasPtr, itemPtr, deltaX, deltaY) - Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item that is being moved. */ - double deltaX, deltaY; /* Amount by which item is to be +static void +TranslateArc ( + Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item that is being moved. */ + double deltaX, + double deltaY /* Amount by which item is to be * moved. */ +) { register ArcItem *arcPtr = (ArcItem *) itemPtr; @@ -1178,9 +1190,8 @@ TranslateArc(canvasPtr, itemPtr, deltaX, deltaY) *-------------------------------------------------------------- */ -static void -ComputeArcOutline(arcPtr) - register ArcItem *arcPtr; +static void +ComputeArcOutline (register ArcItem *arcPtr) { double sin1, cos1, sin2, cos2, angle, halfWidth; double boxWidth, boxHeight; @@ -1372,15 +1383,19 @@ ComputeArcOutline(arcPtr) *-------------------------------------------------------------- */ -static int -HorizLineToArc(x1, x2, y, rx, ry, start, extent) - double x1, x2; /* X-coords of endpoints of line segment. +static int +HorizLineToArc ( + double x1, + double x2, /* X-coords of endpoints of line segment. * X1 must be <= x2. */ - double y; /* Y-coordinate of line segment. */ - double rx, ry; /* These x- and y-radii define an oval + double y, /* Y-coordinate of line segment. */ + double rx, + double ry, /* These x- and y-radii define an oval * centered at the origin. */ - double start, extent; /* Angles that define extent of arc, in + double start, + double extent /* Angles that define extent of arc, in * the standard fashion for this module. */ +) { double tmp; double tx, ty; /* Coordinates of intersection point in @@ -1436,15 +1451,19 @@ HorizLineToArc(x1, x2, y, rx, ry, start, extent) *-------------------------------------------------------------- */ -static int -VertLineToArc(x, y1, y2, rx, ry, start, extent) - double x; /* X-coordinate of line segment. */ - double y1, y2; /* Y-coords of endpoints of line segment. +static int +VertLineToArc ( + double x, /* X-coordinate of line segment. */ + double y1, + double y2, /* Y-coords of endpoints of line segment. * Y1 must be <= y2. */ - double rx, ry; /* These x- and y-radii define an oval + double rx, + double ry, /* These x- and y-radii define an oval * centered at the origin. */ - double start, extent; /* Angles that define extent of arc, in + double start, + double extent /* Angles that define extent of arc, in * the standard fashion for this module. */ +) { double tmp; double tx, ty; /* Coordinates of intersection point in @@ -1500,12 +1519,14 @@ VertLineToArc(x, y1, y2, rx, ry, start, extent) *-------------------------------------------------------------- */ -static int -AngleInRange(x, y, start, extent) - double x, y; /* Coordinate of point; angle measured +static int +AngleInRange ( + double x, + double y, /* Coordinate of point; angle measured * from origin to here, relative to x-axis. */ - double start; /* First angle, degrees, >=0, <=360. */ - double extent; /* Size of arc in degrees >=-360, <=360. */ + double start, /* First angle, degrees, >=0, <=360. */ + double extent /* Size of arc in degrees >=-360, <=360. */ +) { double diff; diff --git a/src/tk/tkcvbmap.c b/src/tk/tkcvbmap.c index 5fe1726..8f0cec1 100644 --- a/src/tk/tkcvbmap.c +++ b/src/tk/tkcvbmap.c @@ -139,13 +139,14 @@ Tk_ItemType TkBitmapType = { *-------------------------------------------------------------- */ -static int -CreateBitmap(canvasPtr, itemPtr, argc, argv) - register Tk_Canvas *canvasPtr; /* Canvas to hold new item. */ - Tk_Item *itemPtr; /* Record to hold new item; header +static int +CreateBitmap ( + register Tk_Canvas *canvasPtr, /* Canvas to hold new item. */ + Tk_Item *itemPtr, /* Record to hold new item; header * has been initialized by caller. */ - int argc; /* Number of arguments in argv. */ - char **argv; /* Arguments describing rectangle. */ + int argc, /* Number of arguments in argv. */ + char **argv /* Arguments describing rectangle. */ +) { register BitmapItem *bmapPtr = (BitmapItem *) itemPtr; @@ -202,15 +203,16 @@ CreateBitmap(canvasPtr, itemPtr, argc, argv) *-------------------------------------------------------------- */ -static int -BitmapCoords(canvasPtr, itemPtr, argc, argv) - register Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item whose coordinates are to be +static int +BitmapCoords ( + register Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item whose coordinates are to be * read or modified. */ - int argc; /* Number of coordinates supplied in + int argc, /* Number of coordinates supplied in * argv. */ - char **argv; /* Array of coordinates: x1, y1, + char **argv /* Array of coordinates: x1, y1, * x2, y2, ... */ +) { register BitmapItem *bmapPtr = (BitmapItem *) itemPtr; @@ -250,13 +252,14 @@ BitmapCoords(canvasPtr, itemPtr, argc, argv) *-------------------------------------------------------------- */ -static int -ConfigureBitmap(canvasPtr, itemPtr, argc, argv, flags) - Tk_Canvas *canvasPtr; /* Canvas containing itemPtr. */ - Tk_Item *itemPtr; /* Bitmap item to reconfigure. */ - int argc; /* Number of elements in argv. */ - char **argv; /* Arguments describing things to configure. */ - int flags; /* Flags to pass to Tk_ConfigureWidget. */ +static int +ConfigureBitmap ( + Tk_Canvas *canvasPtr, /* Canvas containing itemPtr. */ + Tk_Item *itemPtr, /* Bitmap item to reconfigure. */ + int argc, /* Number of elements in argv. */ + char **argv, /* Arguments describing things to configure. */ + int flags /* Flags to pass to Tk_ConfigureWidget. */ +) { register BitmapItem *bmapPtr = (BitmapItem *) itemPtr; XGCValues gcValues; @@ -306,9 +309,10 @@ ConfigureBitmap(canvasPtr, itemPtr, argc, argv, flags) *-------------------------------------------------------------- */ -static void -DeleteBitmap(itemPtr) - Tk_Item *itemPtr; /* Item that is being deleted. */ +static void +DeleteBitmap ( + Tk_Item *itemPtr /* Item that is being deleted. */ +) { register BitmapItem *bmapPtr = (BitmapItem *) itemPtr; @@ -351,11 +355,12 @@ DeleteBitmap(itemPtr) */ /* ARGSUSED */ -static void -ComputeBitmapBbox(canvasPtr, bmapPtr) - Tk_Canvas *canvasPtr; /* Canvas that contains item. */ - register BitmapItem *bmapPtr; /* Item whose bbox is to be +static void +ComputeBitmapBbox ( + Tk_Canvas *canvasPtr, /* Canvas that contains item. */ + register BitmapItem *bmapPtr /* Item whose bbox is to be * recomputed. */ +) { unsigned int width, height; int x, y; @@ -439,12 +444,13 @@ ComputeBitmapBbox(canvasPtr, bmapPtr) *-------------------------------------------------------------- */ -static void -DisplayBitmap(canvasPtr, itemPtr, drawable) - register Tk_Canvas *canvasPtr; /* Canvas that contains item. */ - Tk_Item *itemPtr; /* Item to be displayed. */ - Drawable drawable; /* Pixmap or window in which to draw +static void +DisplayBitmap ( + register Tk_Canvas *canvasPtr, /* Canvas that contains item. */ + Tk_Item *itemPtr, /* Item to be displayed. */ + Drawable drawable /* Pixmap or window in which to draw * item. */ +) { register BitmapItem *bmapPtr = (BitmapItem *) itemPtr; @@ -488,11 +494,12 @@ DisplayBitmap(canvasPtr, itemPtr, drawable) */ /* ARGSUSED */ -static double -BitmapToPoint(canvasPtr, itemPtr, coordPtr) - Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item to check against point. */ - double *coordPtr; /* Pointer to x and y coordinates. */ +static double +BitmapToPoint ( + Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item to check against point. */ + double *coordPtr /* Pointer to x and y coordinates. */ +) { register BitmapItem *bmapPtr = (BitmapItem *) itemPtr; double x1, x2, y1, y2, xDiff, yDiff; @@ -546,13 +553,14 @@ BitmapToPoint(canvasPtr, itemPtr, coordPtr) */ /* ARGSUSED */ -static int -BitmapToArea(canvasPtr, itemPtr, rectPtr) - Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item to check against rectangle. */ - double *rectPtr; /* Pointer to array of four coordinates +static int +BitmapToArea ( + Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item to check against rectangle. */ + double *rectPtr /* Pointer to array of four coordinates * (x1, y1, x2, y2) describing rectangular * area. */ +) { register BitmapItem *bmapPtr = (BitmapItem *) itemPtr; @@ -592,13 +600,15 @@ BitmapToArea(canvasPtr, itemPtr, rectPtr) *-------------------------------------------------------------- */ -static void -ScaleBitmap(canvasPtr, itemPtr, originX, originY, scaleX, scaleY) - Tk_Canvas *canvasPtr; /* Canvas containing rectangle. */ - Tk_Item *itemPtr; /* Rectangle to be scaled. */ - double originX, originY; /* Origin about which to scale rect. */ - double scaleX; /* Amount to scale in X direction. */ - double scaleY; /* Amount to scale in Y direction. */ +static void +ScaleBitmap ( + Tk_Canvas *canvasPtr, /* Canvas containing rectangle. */ + Tk_Item *itemPtr, /* Rectangle to be scaled. */ + double originX, + double originY, /* Origin about which to scale rect. */ + double scaleX, /* Amount to scale in X direction. */ + double scaleY /* Amount to scale in Y direction. */ +) { register BitmapItem *bmapPtr = (BitmapItem *) itemPtr; @@ -626,12 +636,14 @@ ScaleBitmap(canvasPtr, itemPtr, originX, originY, scaleX, scaleY) *-------------------------------------------------------------- */ -static void -TranslateBitmap(canvasPtr, itemPtr, deltaX, deltaY) - Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item that is being moved. */ - double deltaX, deltaY; /* Amount by which item is to be +static void +TranslateBitmap ( + Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item that is being moved. */ + double deltaX, + double deltaY /* Amount by which item is to be * moved. */ +) { register BitmapItem *bmapPtr = (BitmapItem *) itemPtr; diff --git a/src/tk/tkcvline.c b/src/tk/tkcvline.c index 851a176..8505119 100644 --- a/src/tk/tkcvline.c +++ b/src/tk/tkcvline.c @@ -205,13 +205,14 @@ static Tk_Uid bothUid = NULL; *-------------------------------------------------------------- */ -static int -CreateLine(canvasPtr, itemPtr, argc, argv) - register Tk_Canvas *canvasPtr; /* Canvas to hold new item. */ - Tk_Item *itemPtr; /* Record to hold new item; header +static int +CreateLine ( + register Tk_Canvas *canvasPtr, /* Canvas to hold new item. */ + Tk_Item *itemPtr, /* Record to hold new item; header * has been initialized by caller. */ - int argc; /* Number of arguments in argv. */ - char **argv; /* Arguments describing line. */ + int argc, /* Number of arguments in argv. */ + char **argv /* Arguments describing line. */ +) { register LineItem *linePtr = (LineItem *) itemPtr; int i; @@ -296,15 +297,16 @@ CreateLine(canvasPtr, itemPtr, argc, argv) *-------------------------------------------------------------- */ -static int -LineCoords(canvasPtr, itemPtr, argc, argv) - register Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item whose coordinates are to be +static int +LineCoords ( + register Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item whose coordinates are to be * read or modified. */ - int argc; /* Number of coordinates supplied in + int argc, /* Number of coordinates supplied in * argv. */ - char **argv; /* Array of coordinates: x1, y1, + char **argv /* Array of coordinates: x1, y1, * x2, y2, ... */ +) { register LineItem *linePtr = (LineItem *) itemPtr; char buffer[300]; @@ -365,13 +367,14 @@ LineCoords(canvasPtr, itemPtr, argc, argv) *-------------------------------------------------------------- */ -static int -ConfigureLine(canvasPtr, itemPtr, argc, argv, flags) - Tk_Canvas *canvasPtr; /* Canvas containing itemPtr. */ - Tk_Item *itemPtr; /* Line item to reconfigure. */ - int argc; /* Number of elements in argv. */ - char **argv; /* Arguments describing things to configure. */ - int flags; /* Flags to pass to Tk_ConfigureWidget. */ +static int +ConfigureLine ( + Tk_Canvas *canvasPtr, /* Canvas containing itemPtr. */ + Tk_Item *itemPtr, /* Line item to reconfigure. */ + int argc, /* Number of elements in argv. */ + char **argv, /* Arguments describing things to configure. */ + int flags /* Flags to pass to Tk_ConfigureWidget. */ +) { register LineItem *linePtr = (LineItem *) itemPtr; XGCValues gcValues; @@ -485,9 +488,10 @@ ConfigureLine(canvasPtr, itemPtr, argc, argv, flags) *-------------------------------------------------------------- */ -static void -DeleteLine(itemPtr) - Tk_Item *itemPtr; /* Item that is being deleted. */ +static void +DeleteLine ( + Tk_Item *itemPtr /* Item that is being deleted. */ +) { register LineItem *linePtr = (LineItem *) itemPtr; @@ -529,11 +533,12 @@ DeleteLine(itemPtr) *-------------------------------------------------------------- */ -static void -ComputeLineBbox(canvasPtr, linePtr) - register Tk_Canvas *canvasPtr; /* Canvas that contains item. */ - LineItem *linePtr; /* Item whose bbos is to be +static void +ComputeLineBbox ( + register Tk_Canvas *canvasPtr, /* Canvas that contains item. */ + LineItem *linePtr /* Item whose bbos is to be * recomputed. */ +) { register double *coordPtr; int i; @@ -630,12 +635,13 @@ ComputeLineBbox(canvasPtr, linePtr) *-------------------------------------------------------------- */ -static void -DisplayLine(canvasPtr, itemPtr, drawable) - register Tk_Canvas *canvasPtr; /* Canvas that contains item. */ - Tk_Item *itemPtr; /* Item to be displayed. */ - Drawable drawable; /* Pixmap or window in which to draw +static void +DisplayLine ( + register Tk_Canvas *canvasPtr, /* Canvas that contains item. */ + Tk_Item *itemPtr, /* Item to be displayed. */ + Drawable drawable /* Pixmap or window in which to draw * item. */ +) { register LineItem *linePtr = (LineItem *) itemPtr; XPoint staticPoints[MAX_STATIC_POINTS]; @@ -727,11 +733,12 @@ DisplayLine(canvasPtr, itemPtr, drawable) */ /* ARGSUSED */ -static double -LineToPoint(canvasPtr, itemPtr, pointPtr) - Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item to check against point. */ - double *pointPtr; /* Pointer to x and y coordinates. */ +static double +LineToPoint ( + Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item to check against point. */ + double *pointPtr /* Pointer to x and y coordinates. */ +) { register LineItem *linePtr = (LineItem *) itemPtr; register double *coordPtr, *linePoints; @@ -929,11 +936,12 @@ LineToPoint(canvasPtr, itemPtr, pointPtr) */ /* ARGSUSED */ -static int -LineToArea(canvasPtr, itemPtr, rectPtr) - Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item to check against line. */ - double *rectPtr; +static int +LineToArea ( + Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item to check against line. */ + double *rectPtr +) { register LineItem *linePtr = (LineItem *) itemPtr; register double *coordPtr; @@ -1131,13 +1139,15 @@ LineToArea(canvasPtr, itemPtr, rectPtr) *-------------------------------------------------------------- */ -static void -ScaleLine(canvasPtr, itemPtr, originX, originY, scaleX, scaleY) - Tk_Canvas *canvasPtr; /* Canvas containing line. */ - Tk_Item *itemPtr; /* Line to be scaled. */ - double originX, originY; /* Origin about which to scale rect. */ - double scaleX; /* Amount to scale in X direction. */ - double scaleY; /* Amount to scale in Y direction. */ +static void +ScaleLine ( + Tk_Canvas *canvasPtr, /* Canvas containing line. */ + Tk_Item *itemPtr, /* Line to be scaled. */ + double originX, + double originY, /* Origin about which to scale rect. */ + double scaleX, /* Amount to scale in X direction. */ + double scaleY /* Amount to scale in Y direction. */ +) { LineItem *linePtr = (LineItem *) itemPtr; register double *coordPtr; @@ -1183,12 +1193,14 @@ ScaleLine(canvasPtr, itemPtr, originX, originY, scaleX, scaleY) *-------------------------------------------------------------- */ -static void -TranslateLine(canvasPtr, itemPtr, deltaX, deltaY) - Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item that is being moved. */ - double deltaX, deltaY; /* Amount by which item is to be +static void +TranslateLine ( + Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item that is being moved. */ + double deltaX, + double deltaY /* Amount by which item is to be * moved. */ +) { LineItem *linePtr = (LineItem *) itemPtr; register double *coordPtr; @@ -1236,16 +1248,17 @@ TranslateLine(canvasPtr, itemPtr, deltaX, deltaY) */ /* ARGSUSED */ -static int -ParseArrowShape(clientData, interp, tkwin, value, recordPtr, offset) - ClientData clientData; /* Not used. */ - Tcl_Interp *interp; /* Used for error reporting. */ - Tk_Window tkwin; /* Not used. */ - char *value; /* Textual specification of arrow shape. */ - char *recordPtr; /* Pointer to item record in which to +static int +ParseArrowShape ( + ClientData clientData, /* Not used. */ + Tcl_Interp *interp, /* Used for error reporting. */ + Tk_Window tkwin, /* Not used. */ + char *value, /* Textual specification of arrow shape. */ + char *recordPtr, /* Pointer to item record in which to * store arrow information. */ - int offset; /* Offset of shape information in widget + int offset /* Offset of shape information in widget * record. */ +) { LineItem *linePtr = (LineItem *) recordPtr; double a, b, c; @@ -1300,14 +1313,15 @@ ParseArrowShape(clientData, interp, tkwin, value, recordPtr, offset) /* ARGSUSED */ static char * -PrintArrowShape(clientData, tkwin, recordPtr, offset, freeProcPtr) - ClientData clientData; /* Not used. */ - Tk_Window tkwin; /* Window associated with linePtr's widget. */ - char *recordPtr; /* Pointer to item record containing current +PrintArrowShape ( + ClientData clientData, /* Not used. */ + Tk_Window tkwin, /* Window associated with linePtr's widget. */ + char *recordPtr, /* Pointer to item record containing current * shape information. */ - int offset; /* Offset of arrow information in record. */ - Tcl_FreeProc **freeProcPtr; /* Store address of procedure to call to + int offset, /* Offset of arrow information in record. */ + Tcl_FreeProc **freeProcPtr /* Store address of procedure to call to * free string here. */ +) { LineItem *linePtr = (LineItem *) recordPtr; char *buffer; @@ -1342,12 +1356,13 @@ PrintArrowShape(clientData, tkwin, recordPtr, offset, freeProcPtr) */ /* ARGSUSED */ -static int -ConfigureArrows(canvasPtr, linePtr) - Tk_Canvas *canvasPtr; /* Canvas in which arrows will be +static int +ConfigureArrows ( + Tk_Canvas *canvasPtr, /* Canvas in which arrows will be * displayed (interp and tkwin * fields are needed). */ - register LineItem *linePtr; /* Item to configure for arrows. */ + register LineItem *linePtr /* Item to configure for arrows. */ +) { double *poly, *coordPtr; double dx, dy, length, sinTheta, cosTheta, temp, shapeC; diff --git a/src/tk/tkcvpoly.c b/src/tk/tkcvpoly.c index 21b05a1..93bfe03 100644 --- a/src/tk/tkcvpoly.c +++ b/src/tk/tkcvpoly.c @@ -146,13 +146,14 @@ Tk_ItemType TkPolygonType = { *-------------------------------------------------------------- */ -static int -CreatePolygon(canvasPtr, itemPtr, argc, argv) - register Tk_Canvas *canvasPtr; /* Canvas to hold new item. */ - Tk_Item *itemPtr; /* Record to hold new item; header +static int +CreatePolygon ( + register Tk_Canvas *canvasPtr, /* Canvas to hold new item. */ + Tk_Item *itemPtr, /* Record to hold new item; header * has been initialized by caller. */ - int argc; /* Number of arguments in argv. */ - char **argv; /* Arguments describing polygon. */ + int argc, /* Number of arguments in argv. */ + char **argv /* Arguments describing polygon. */ +) { register PolygonItem *polyPtr = (PolygonItem *) itemPtr; int i; @@ -221,15 +222,16 @@ CreatePolygon(canvasPtr, itemPtr, argc, argv) *-------------------------------------------------------------- */ -static int -PolygonCoords(canvasPtr, itemPtr, argc, argv) - register Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item whose coordinates are to be +static int +PolygonCoords ( + register Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item whose coordinates are to be * read or modified. */ - int argc; /* Number of coordinates supplied in + int argc, /* Number of coordinates supplied in * argv. */ - char **argv; /* Array of coordinates: x1, y1, + char **argv /* Array of coordinates: x1, y1, * x2, y2, ... */ +) { register PolygonItem *polyPtr = (PolygonItem *) itemPtr; char buffer[300]; @@ -307,13 +309,14 @@ PolygonCoords(canvasPtr, itemPtr, argc, argv) *-------------------------------------------------------------- */ -static int -ConfigurePolygon(canvasPtr, itemPtr, argc, argv, flags) - Tk_Canvas *canvasPtr; /* Canvas containing itemPtr. */ - Tk_Item *itemPtr; /* Polygon item to reconfigure. */ - int argc; /* Number of elements in argv. */ - char **argv; /* Arguments describing things to configure. */ - int flags; /* Flags to pass to Tk_ConfigureWidget. */ +static int +ConfigurePolygon ( + Tk_Canvas *canvasPtr, /* Canvas containing itemPtr. */ + Tk_Item *itemPtr, /* Polygon item to reconfigure. */ + int argc, /* Number of elements in argv. */ + char **argv, /* Arguments describing things to configure. */ + int flags /* Flags to pass to Tk_ConfigureWidget. */ +) { register PolygonItem *polyPtr = (PolygonItem *) itemPtr; XGCValues gcValues; @@ -378,9 +381,10 @@ ConfigurePolygon(canvasPtr, itemPtr, argc, argv, flags) *-------------------------------------------------------------- */ -static void -DeletePolygon(itemPtr) - Tk_Item *itemPtr; /* Item that is being deleted. */ +static void +DeletePolygon ( + Tk_Item *itemPtr /* Item that is being deleted. */ +) { register PolygonItem *polyPtr = (PolygonItem *) itemPtr; @@ -416,11 +420,12 @@ DeletePolygon(itemPtr) *-------------------------------------------------------------- */ -static void -ComputePolygonBbox(canvasPtr, polyPtr) - register Tk_Canvas *canvasPtr; /* Canvas that contains item. */ - PolygonItem *polyPtr; /* Item whose bbox is to be +static void +ComputePolygonBbox ( + register Tk_Canvas *canvasPtr, /* Canvas that contains item. */ + PolygonItem *polyPtr /* Item whose bbox is to be * recomputed. */ +) { register double *coordPtr; int i; @@ -463,17 +468,18 @@ ComputePolygonBbox(canvasPtr, polyPtr) *-------------------------------------------------------------- */ -void -TkFillPolygon(canvasPtr, coordPtr, numPoints, drawable, gc) - register Tk_Canvas *canvasPtr; /* Canvas whose coordinate system +void +TkFillPolygon ( + register Tk_Canvas *canvasPtr, /* Canvas whose coordinate system * is to be used for drawing. */ - double *coordPtr; /* Array of coordinates for polygon: + double *coordPtr, /* Array of coordinates for polygon: * x1, y1, x2, y2, .... */ - int numPoints; /* Twice this many coordinates are + int numPoints, /* Twice this many coordinates are * present at *coordPtr. */ - Drawable drawable; /* Pixmap or window in which to draw + Drawable drawable, /* Pixmap or window in which to draw * polygon. */ - GC gc; /* Graphics context for drawing. */ + GC gc /* Graphics context for drawing. */ +) { XPoint staticPoints[MAX_STATIC_POINTS]; XPoint *pointPtr; @@ -528,12 +534,13 @@ TkFillPolygon(canvasPtr, coordPtr, numPoints, drawable, gc) *-------------------------------------------------------------- */ -static void -DisplayPolygon(canvasPtr, itemPtr, drawable) - register Tk_Canvas *canvasPtr; /* Canvas that contains item. */ - Tk_Item *itemPtr; /* Item to be displayed. */ - Drawable drawable; /* Pixmap or window in which to draw +static void +DisplayPolygon ( + register Tk_Canvas *canvasPtr, /* Canvas that contains item. */ + Tk_Item *itemPtr, /* Item to be displayed. */ + Drawable drawable /* Pixmap or window in which to draw * item. */ +) { register PolygonItem *polyPtr = (PolygonItem *) itemPtr; @@ -593,11 +600,12 @@ DisplayPolygon(canvasPtr, itemPtr, drawable) */ /* ARGSUSED */ -static double -PolygonToPoint(canvasPtr, itemPtr, pointPtr) - Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item to check against point. */ - double *pointPtr; /* Pointer to x and y coordinates. */ +static double +PolygonToPoint ( + Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item to check against point. */ + double *pointPtr /* Pointer to x and y coordinates. */ +) { PolygonItem *polyPtr = (PolygonItem *) itemPtr; double *coordPtr, distance; @@ -652,13 +660,14 @@ PolygonToPoint(canvasPtr, itemPtr, pointPtr) */ /* ARGSUSED */ -static int -PolygonToArea(canvasPtr, itemPtr, rectPtr) - Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item to check against polygon. */ - double *rectPtr; /* Pointer to array of four coordinates +static int +PolygonToArea ( + Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item to check against polygon. */ + double *rectPtr /* Pointer to array of four coordinates * (x1, y1, x2, y2) describing rectangular * area. */ +) { PolygonItem *polyPtr = (PolygonItem *) itemPtr; double *coordPtr; @@ -711,13 +720,15 @@ PolygonToArea(canvasPtr, itemPtr, rectPtr) *-------------------------------------------------------------- */ -static void -ScalePolygon(canvasPtr, itemPtr, originX, originY, scaleX, scaleY) - Tk_Canvas *canvasPtr; /* Canvas containing polygon. */ - Tk_Item *itemPtr; /* Polygon to be scaled. */ - double originX, originY; /* Origin about which to scale rect. */ - double scaleX; /* Amount to scale in X direction. */ - double scaleY; /* Amount to scale in Y direction. */ +static void +ScalePolygon ( + Tk_Canvas *canvasPtr, /* Canvas containing polygon. */ + Tk_Item *itemPtr, /* Polygon to be scaled. */ + double originX, + double originY, /* Origin about which to scale rect. */ + double scaleX, /* Amount to scale in X direction. */ + double scaleY /* Amount to scale in Y direction. */ +) { PolygonItem *polyPtr = (PolygonItem *) itemPtr; register double *coordPtr; @@ -750,12 +761,14 @@ ScalePolygon(canvasPtr, itemPtr, originX, originY, scaleX, scaleY) *-------------------------------------------------------------- */ -static void -TranslatePolygon(canvasPtr, itemPtr, deltaX, deltaY) - Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item that is being moved. */ - double deltaX, deltaY; /* Amount by which item is to be +static void +TranslatePolygon ( + Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item that is being moved. */ + double deltaX, + double deltaY /* Amount by which item is to be * moved. */ +) { PolygonItem *polyPtr = (PolygonItem *) itemPtr; register double *coordPtr; diff --git a/src/tk/tkcvtext.c b/src/tk/tkcvtext.c index 20314d4..b81f761 100644 --- a/src/tk/tkcvtext.c +++ b/src/tk/tkcvtext.c @@ -193,13 +193,14 @@ Tk_ItemType TkTextType = { *-------------------------------------------------------------- */ -static int -CreateText(canvasPtr, itemPtr, argc, argv) - register Tk_Canvas *canvasPtr; /* Canvas to hold new item. */ - Tk_Item *itemPtr; /* Record to hold new item; header +static int +CreateText ( + register Tk_Canvas *canvasPtr, /* Canvas to hold new item. */ + Tk_Item *itemPtr, /* Record to hold new item; header * has been initialized by caller. */ - int argc; /* Number of arguments in argv. */ - char **argv; /* Arguments describing rectangle. */ + int argc, /* Number of arguments in argv. */ + char **argv /* Arguments describing rectangle. */ +) { register TextItem *textPtr = (TextItem *) itemPtr; @@ -262,15 +263,16 @@ CreateText(canvasPtr, itemPtr, argc, argv) *-------------------------------------------------------------- */ -static int -TextCoords(canvasPtr, itemPtr, argc, argv) - register Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item whose coordinates are to be +static int +TextCoords ( + register Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item whose coordinates are to be * read or modified. */ - int argc; /* Number of coordinates supplied in + int argc, /* Number of coordinates supplied in * argv. */ - char **argv; /* Array of coordinates: x1, y1, + char **argv /* Array of coordinates: x1, y1, * x2, y2, ... */ +) { register TextItem *textPtr = (TextItem *) itemPtr; @@ -311,13 +313,14 @@ TextCoords(canvasPtr, itemPtr, argc, argv) *-------------------------------------------------------------- */ -static int -ConfigureText(canvasPtr, itemPtr, argc, argv, flags) - Tk_Canvas *canvasPtr; /* Canvas containing itemPtr. */ - Tk_Item *itemPtr; /* Rectangle item to reconfigure. */ - int argc; /* Number of elements in argv. */ - char **argv; /* Arguments describing things to configure. */ - int flags; /* Flags to pass to Tk_ConfigureWidget. */ +static int +ConfigureText ( + Tk_Canvas *canvasPtr, /* Canvas containing itemPtr. */ + Tk_Item *itemPtr, /* Rectangle item to reconfigure. */ + int argc, /* Number of elements in argv. */ + char **argv, /* Arguments describing things to configure. */ + int flags /* Flags to pass to Tk_ConfigureWidget. */ +) { register TextItem *textPtr = (TextItem *) itemPtr; XGCValues gcValues; @@ -401,9 +404,10 @@ ConfigureText(canvasPtr, itemPtr, argc, argv, flags) *-------------------------------------------------------------- */ -static void -DeleteText(itemPtr) - Tk_Item *itemPtr; /* Item that is being deleted. */ +static void +DeleteText ( + Tk_Item *itemPtr /* Item that is being deleted. */ +) { register TextItem *textPtr = (TextItem *) itemPtr; @@ -451,11 +455,12 @@ DeleteText(itemPtr) *-------------------------------------------------------------- */ -static void -ComputeTextBbox(canvasPtr, textPtr) - register Tk_Canvas *canvasPtr; /* Canvas that contains item. */ - register TextItem *textPtr; /* Item whose bbos is to be +static void +ComputeTextBbox ( + register Tk_Canvas *canvasPtr, /* Canvas that contains item. */ + register TextItem *textPtr /* Item whose bbos is to be * recomputed. */ +) { register TextLine *linePtr; #define MAX_LINES 100 @@ -644,12 +649,13 @@ ComputeTextBbox(canvasPtr, textPtr) *-------------------------------------------------------------- */ -static void -DisplayText(canvasPtr, itemPtr, drawable) - register Tk_Canvas *canvasPtr; /* Canvas that contains item. */ - Tk_Item *itemPtr; /* Item to be displayed. */ - Drawable drawable; /* Pixmap or window in which to draw +static void +DisplayText ( + register Tk_Canvas *canvasPtr, /* Canvas that contains item. */ + Tk_Item *itemPtr, /* Item to be displayed. */ + Drawable drawable /* Pixmap or window in which to draw * item. */ +) { register TextItem *textPtr = (TextItem *) itemPtr; Display *display = Tk_Display(canvasPtr->tkwin); @@ -809,13 +815,14 @@ DisplayText(canvasPtr, itemPtr, drawable) *-------------------------------------------------------------- */ -static int -TextInsert(canvasPtr, itemPtr, beforeThis, string) - Tk_Canvas *canvasPtr; /* Canvas containing text item. */ - Tk_Item *itemPtr; /* Text item to be modified. */ - int beforeThis; /* Index of character before which text is +static int +TextInsert ( + Tk_Canvas *canvasPtr, /* Canvas containing text item. */ + Tk_Item *itemPtr, /* Text item to be modified. */ + int beforeThis, /* Index of character before which text is * to be inserted. */ - char *string; /* New characters to be inserted. */ + char *string /* New characters to be inserted. */ +) { register TextItem *textPtr = (TextItem *) itemPtr; int length; @@ -882,12 +889,13 @@ TextInsert(canvasPtr, itemPtr, beforeThis, string) *-------------------------------------------------------------- */ -static int -TextDeleteChars(canvasPtr, itemPtr, first, last) - Tk_Canvas *canvasPtr; /* Canvas containing itemPtr. */ - Tk_Item *itemPtr; /* Item in which to delete characters. */ - int first; /* Index of first character to delete. */ - int last; /* Index of last character to delete. */ +static int +TextDeleteChars ( + Tk_Canvas *canvasPtr, /* Canvas containing itemPtr. */ + Tk_Item *itemPtr, /* Item in which to delete characters. */ + int first, /* Index of first character to delete. */ + int last /* Index of last character to delete. */ +) { register TextItem *textPtr = (TextItem *) itemPtr; int count; @@ -971,11 +979,12 @@ TextDeleteChars(canvasPtr, itemPtr, first, last) */ /* ARGSUSED */ -static double -TextToPoint(canvasPtr, itemPtr, pointPtr) - Tk_Canvas *canvasPtr; /* Canvas containing itemPtr. */ - Tk_Item *itemPtr; /* Item to check against point. */ - double *pointPtr; /* Pointer to x and y coordinates. */ +static double +TextToPoint ( + Tk_Canvas *canvasPtr, /* Canvas containing itemPtr. */ + Tk_Item *itemPtr, /* Item to check against point. */ + double *pointPtr /* Pointer to x and y coordinates. */ +) { TextItem *textPtr = (TextItem *) itemPtr; register TextLine *linePtr; @@ -1055,13 +1064,14 @@ TextToPoint(canvasPtr, itemPtr, pointPtr) */ /* ARGSUSED */ -static int -TextToArea(canvasPtr, itemPtr, rectPtr) - Tk_Canvas *canvasPtr; /* Canvas containing itemPtr. */ - Tk_Item *itemPtr; /* Item to check against rectangle. */ - double *rectPtr; /* Pointer to array of four coordinates +static int +TextToArea ( + Tk_Canvas *canvasPtr, /* Canvas containing itemPtr. */ + Tk_Item *itemPtr, /* Item to check against rectangle. */ + double *rectPtr /* Pointer to array of four coordinates * (x1, y1, x2, y2) describing rectangular * area. */ +) { TextItem *textPtr = (TextItem *) itemPtr; register TextLine *linePtr; @@ -1116,13 +1126,15 @@ TextToArea(canvasPtr, itemPtr, rectPtr) */ /* ARGSUSED */ -static void -ScaleText(canvasPtr, itemPtr, originX, originY, scaleX, scaleY) - Tk_Canvas *canvasPtr; /* Canvas containing rectangle. */ - Tk_Item *itemPtr; /* Rectangle to be scaled. */ - double originX, originY; /* Origin about which to scale rect. */ - double scaleX; /* Amount to scale in X direction. */ - double scaleY; /* Amount to scale in Y direction. */ +static void +ScaleText ( + Tk_Canvas *canvasPtr, /* Canvas containing rectangle. */ + Tk_Item *itemPtr, /* Rectangle to be scaled. */ + double originX, + double originY, /* Origin about which to scale rect. */ + double scaleX, /* Amount to scale in X direction. */ + double scaleY /* Amount to scale in Y direction. */ +) { register TextItem *textPtr = (TextItem *) itemPtr; @@ -1151,12 +1163,14 @@ ScaleText(canvasPtr, itemPtr, originX, originY, scaleX, scaleY) *-------------------------------------------------------------- */ -static void -TranslateText(canvasPtr, itemPtr, deltaX, deltaY) - Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item that is being moved. */ - double deltaX, deltaY; /* Amount by which item is to be +static void +TranslateText ( + Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item that is being moved. */ + double deltaX, + double deltaY /* Amount by which item is to be * moved. */ +) { register TextItem *textPtr = (TextItem *) itemPtr; @@ -1185,14 +1199,15 @@ TranslateText(canvasPtr, itemPtr, deltaX, deltaY) *-------------------------------------------------------------- */ -static int -GetTextIndex(canvasPtr, itemPtr, string, indexPtr) - Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item for which the index is being +static int +GetTextIndex ( + Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item for which the index is being * specified. */ - char *string; /* Specification of a particular character + char *string, /* Specification of a particular character * in itemPtr's text. */ - int *indexPtr; /* Where to store converted index. */ + int *indexPtr /* Where to store converted index. */ +) { register TextItem *textPtr = (TextItem *) itemPtr; int length; @@ -1298,13 +1313,14 @@ GetTextIndex(canvasPtr, itemPtr, string, indexPtr) */ /* ARGSUSED */ -static void -SetTextCursor(canvasPtr, itemPtr, index) - Tk_Canvas *canvasPtr; /* Record describing canvas widget. */ - Tk_Item *itemPtr; /* Text item in which cursor position +static void +SetTextCursor ( + Tk_Canvas *canvasPtr, /* Record describing canvas widget. */ + Tk_Item *itemPtr, /* Text item in which cursor position * is to be set. */ - int index; /* Index of character just before which + int index /* Index of character just before which * cursor is to be positioned. */ +) { register TextItem *textPtr = (TextItem *) itemPtr; @@ -1338,17 +1354,18 @@ SetTextCursor(canvasPtr, itemPtr, index) *-------------------------------------------------------------- */ -static int -GetSelText(canvasPtr, itemPtr, offset, buffer, maxBytes) - Tk_Canvas *canvasPtr; /* Canvas containing selection. */ - Tk_Item *itemPtr; /* Text item containing selection. */ - int offset; /* Offset within selection of first +static int +GetSelText ( + Tk_Canvas *canvasPtr, /* Canvas containing selection. */ + Tk_Item *itemPtr, /* Text item containing selection. */ + int offset, /* Offset within selection of first * character to be returned. */ - char *buffer; /* Location in which to place + char *buffer, /* Location in which to place * selection. */ - int maxBytes; /* Maximum number of bytes to place + int maxBytes /* Maximum number of bytes to place * at buffer, not including terminating * NULL character. */ +) { TextItem *textPtr = (TextItem *) itemPtr; int count; diff --git a/src/tk/tkcvwind.c b/src/tk/tkcvwind.c index 5140321..22245ae 100644 --- a/src/tk/tkcvwind.c +++ b/src/tk/tkcvwind.c @@ -140,13 +140,14 @@ Tk_ItemType TkWindowType = { *-------------------------------------------------------------- */ -static int -CreateWinItem(canvasPtr, itemPtr, argc, argv) - register Tk_Canvas *canvasPtr; /* Canvas to hold new item. */ - Tk_Item *itemPtr; /* Record to hold new item; header +static int +CreateWinItem ( + register Tk_Canvas *canvasPtr, /* Canvas to hold new item. */ + Tk_Item *itemPtr, /* Record to hold new item; header * has been initialized by caller. */ - int argc; /* Number of arguments in argv. */ - char **argv; /* Arguments describing rectangle. */ + int argc, /* Number of arguments in argv. */ + char **argv /* Arguments describing rectangle. */ +) { register WindowItem *winItemPtr = (WindowItem *) itemPtr; @@ -203,15 +204,16 @@ CreateWinItem(canvasPtr, itemPtr, argc, argv) *-------------------------------------------------------------- */ -static int -WinItemCoords(canvasPtr, itemPtr, argc, argv) - register Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item whose coordinates are to be +static int +WinItemCoords ( + register Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item whose coordinates are to be * read or modified. */ - int argc; /* Number of coordinates supplied in + int argc, /* Number of coordinates supplied in * argv. */ - char **argv; /* Array of coordinates: x1, y1, + char **argv /* Array of coordinates: x1, y1, * x2, y2, ... */ +) { register WindowItem *winItemPtr = (WindowItem *) itemPtr; @@ -252,13 +254,14 @@ WinItemCoords(canvasPtr, itemPtr, argc, argv) *-------------------------------------------------------------- */ -static int -ConfigureWinItem(canvasPtr, itemPtr, argc, argv, flags) - Tk_Canvas *canvasPtr; /* Canvas containing itemPtr. */ - Tk_Item *itemPtr; /* Window item to reconfigure. */ - int argc; /* Number of elements in argv. */ - char **argv; /* Arguments describing things to configure. */ - int flags; /* Flags to pass to Tk_ConfigureWidget. */ +static int +ConfigureWinItem ( + Tk_Canvas *canvasPtr, /* Canvas containing itemPtr. */ + Tk_Item *itemPtr, /* Window item to reconfigure. */ + int argc, /* Number of elements in argv. */ + char **argv, /* Arguments describing things to configure. */ + int flags /* Flags to pass to Tk_ConfigureWidget. */ +) { register WindowItem *winItemPtr = (WindowItem *) itemPtr; Tk_Window oldWindow; @@ -341,9 +344,10 @@ ConfigureWinItem(canvasPtr, itemPtr, argc, argv, flags) *-------------------------------------------------------------- */ -static void -DeleteWinItem(itemPtr) - Tk_Item *itemPtr; /* Item that is being deleted. */ +static void +DeleteWinItem ( + Tk_Item *itemPtr /* Item that is being deleted. */ +) { register WindowItem *winItemPtr = (WindowItem *) itemPtr; @@ -377,11 +381,12 @@ DeleteWinItem(itemPtr) */ /* ARGSUSED */ -static void -ComputeWindowBbox(canvasPtr, winItemPtr) - Tk_Canvas *canvasPtr; /* Canvas that contains item. */ - register WindowItem *winItemPtr; /* Item whose bbox is to be +static void +ComputeWindowBbox ( + Tk_Canvas *canvasPtr, /* Canvas that contains item. */ + register WindowItem *winItemPtr /* Item whose bbox is to be * recomputed. */ +) { int width, height, x, y; @@ -481,12 +486,13 @@ ComputeWindowBbox(canvasPtr, winItemPtr) */ /* ARGSUSED */ -static void -DisplayWinItem(canvasPtr, itemPtr, drawable) - register Tk_Canvas *canvasPtr; /* Canvas that contains item. */ - Tk_Item *itemPtr; /* Item to be displayed. */ - Drawable drawable; /* Pixmap or window in which to draw +static void +DisplayWinItem ( + register Tk_Canvas *canvasPtr, /* Canvas that contains item. */ + Tk_Item *itemPtr, /* Item to be displayed. */ + Drawable drawable /* Pixmap or window in which to draw * item. */ +) { register WindowItem *winItemPtr = (WindowItem *) itemPtr; int x,y, width, height; @@ -549,11 +555,12 @@ DisplayWinItem(canvasPtr, itemPtr, drawable) */ /* ARGSUSED */ -static double -WinItemToPoint(canvasPtr, itemPtr, pointPtr) - Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item to check against point. */ - double *pointPtr; /* Pointer to x and y coordinates. */ +static double +WinItemToPoint ( + Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item to check against point. */ + double *pointPtr /* Pointer to x and y coordinates. */ +) { register WindowItem *winItemPtr = (WindowItem *) itemPtr; double x1, x2, y1, y2, xDiff, yDiff; @@ -607,13 +614,14 @@ WinItemToPoint(canvasPtr, itemPtr, pointPtr) */ /* ARGSUSED */ -static int -WinItemToArea(canvasPtr, itemPtr, rectPtr) - Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item to check against rectangle. */ - double *rectPtr; /* Pointer to array of four coordinates +static int +WinItemToArea ( + Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item to check against rectangle. */ + double *rectPtr /* Pointer to array of four coordinates * (x1, y1, x2, y2) describing rectangular * area. */ +) { register WindowItem *winItemPtr = (WindowItem *) itemPtr; @@ -653,13 +661,15 @@ WinItemToArea(canvasPtr, itemPtr, rectPtr) *-------------------------------------------------------------- */ -static void -ScaleWinItem(canvasPtr, itemPtr, originX, originY, scaleX, scaleY) - Tk_Canvas *canvasPtr; /* Canvas containing rectangle. */ - Tk_Item *itemPtr; /* Rectangle to be scaled. */ - double originX, originY; /* Origin about which to scale rect. */ - double scaleX; /* Amount to scale in X direction. */ - double scaleY; /* Amount to scale in Y direction. */ +static void +ScaleWinItem ( + Tk_Canvas *canvasPtr, /* Canvas containing rectangle. */ + Tk_Item *itemPtr, /* Rectangle to be scaled. */ + double originX, + double originY, /* Origin about which to scale rect. */ + double scaleX, /* Amount to scale in X direction. */ + double scaleY /* Amount to scale in Y direction. */ +) { register WindowItem *winItemPtr = (WindowItem *) itemPtr; @@ -693,12 +703,14 @@ ScaleWinItem(canvasPtr, itemPtr, originX, originY, scaleX, scaleY) *-------------------------------------------------------------- */ -static void -TranslateWinItem(canvasPtr, itemPtr, deltaX, deltaY) - Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item that is being moved. */ - double deltaX, deltaY; /* Amount by which item is to be +static void +TranslateWinItem ( + Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item that is being moved. */ + double deltaX, + double deltaY /* Amount by which item is to be * moved. */ +) { register WindowItem *winItemPtr = (WindowItem *) itemPtr; @@ -727,10 +739,11 @@ TranslateWinItem(canvasPtr, itemPtr, deltaX, deltaY) *-------------------------------------------------------------- */ -static void -WinItemStructureProc(clientData, eventPtr) - ClientData clientData; /* Pointer to record describing window item. */ - XEvent *eventPtr; /* Describes what just happened. */ +static void +WinItemStructureProc ( + ClientData clientData, /* Pointer to record describing window item. */ + XEvent *eventPtr /* Describes what just happened. */ +) { register WindowItem *winItemPtr = (WindowItem *) clientData; @@ -758,11 +771,12 @@ WinItemStructureProc(clientData, eventPtr) */ /* ARGSUSED */ -static void -WinItemRequestProc(clientData, tkwin) - ClientData clientData; /* Pointer to record for window item. */ - Tk_Window tkwin; /* Window that changed its desired +static void +WinItemRequestProc ( + ClientData clientData, /* Pointer to record for window item. */ + Tk_Window tkwin /* Window that changed its desired * size. */ +) { WindowItem *winItemPtr = (WindowItem *) clientData; diff --git a/src/tk/tkentry.c b/src/tk/tkentry.c index 10e0c35..dc4f6c0 100644 --- a/src/tk/tkentry.c +++ b/src/tk/tkentry.c @@ -273,13 +273,14 @@ static int EntryWidgetCmd _ANSI_ARGS_((ClientData clientData, *-------------------------------------------------------------- */ -int -Tk_EntryCmd(clientData, interp, argc, argv) - ClientData clientData; /* Main window associated with +int +Tk_EntryCmd ( + ClientData clientData, /* Main window associated with * interpreter. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { Tk_Window tkwin = (Tk_Window) clientData; register Entry *entryPtr; @@ -336,7 +337,7 @@ Tk_EntryCmd(clientData, interp, argc, argv) Tk_CreateSelHandler(entryPtr->tkwin, XA_STRING, EntryFetchSelection, (ClientData) entryPtr, XA_STRING); Tcl_CreateCommand(interp, Tk_PathName(entryPtr->tkwin), EntryWidgetCmd, - (ClientData) entryPtr, (void (*)()) NULL); + (ClientData) entryPtr, (void (*)(int *)) NULL); if (ConfigureEntry(interp, entryPtr, argc-2, argv+2, 0) != TCL_OK) { goto error; } @@ -369,12 +370,13 @@ Tk_EntryCmd(clientData, interp, argc, argv) *-------------------------------------------------------------- */ -static int -EntryWidgetCmd(clientData, interp, argc, argv) - ClientData clientData; /* Information about entry widget. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +static int +EntryWidgetCmd ( + ClientData clientData, /* Information about entry widget. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { register Entry *entryPtr = (Entry *) clientData; int result = TCL_OK; @@ -611,9 +613,10 @@ EntryWidgetCmd(clientData, interp, argc, argv) *---------------------------------------------------------------------- */ -static void -DestroyEntry(clientData) - ClientData clientData; /* Info about entry widget. */ +static void +DestroyEntry ( + ClientData clientData /* Info about entry widget. */ +) { register Entry *entryPtr = (Entry *) clientData; @@ -682,14 +685,15 @@ DestroyEntry(clientData) *---------------------------------------------------------------------- */ -static int -ConfigureEntry(interp, entryPtr, argc, argv, flags) - Tcl_Interp *interp; /* Used for error reporting. */ - register Entry *entryPtr; /* Information about widget; may or may +static int +ConfigureEntry ( + Tcl_Interp *interp, /* Used for error reporting. */ + register Entry *entryPtr, /* Information about widget; may or may * not already have values for some fields. */ - int argc; /* Number of valid entries in argv. */ - char **argv; /* Arguments. */ - int flags; /* Flags to pass to Tk_ConfigureWidget. */ + int argc, /* Number of valid entries in argv. */ + char **argv, /* Arguments. */ + int flags /* Flags to pass to Tk_ConfigureWidget. */ +) { XGCValues gcValues; GC new; @@ -831,9 +835,10 @@ ConfigureEntry(interp, entryPtr, argc, argv, flags) *-------------------------------------------------------------- */ -static void -DisplayEntry(clientData) - ClientData clientData; /* Information about window. */ +static void +DisplayEntry ( + ClientData clientData /* Information about window. */ +) { register Entry *entryPtr = (Entry *) clientData; register Tk_Window tkwin = entryPtr->tkwin; @@ -1018,14 +1023,15 @@ DisplayEntry(clientData) *---------------------------------------------------------------------- */ -static void -InsertChars(entryPtr, index, string) - register Entry *entryPtr; /* Entry that is to get the new +static void +InsertChars ( + register Entry *entryPtr, /* Entry that is to get the new * elements. */ - int index; /* Add the new elements before this + int index, /* Add the new elements before this * element. */ - char *string; /* New characters to add (NULL-terminated + char *string /* New characters to add (NULL-terminated * string). */ +) { int length; char *new; @@ -1089,11 +1095,12 @@ InsertChars(entryPtr, index, string) *---------------------------------------------------------------------- */ -static void -DeleteChars(entryPtr, index, count) - register Entry *entryPtr; /* Entry widget to modify. */ - int index; /* Index of first character to delete. */ - int count; /* How many characters to delete. */ +static void +DeleteChars ( + register Entry *entryPtr, /* Entry widget to modify. */ + int index, /* Index of first character to delete. */ + int count /* How many characters to delete. */ +) { char *new; @@ -1185,11 +1192,12 @@ DeleteChars(entryPtr, index, count) *---------------------------------------------------------------------- */ -static void -EntrySetValue(entryPtr, value) - register Entry *entryPtr; /* Entry whose value is to be +static void +EntrySetValue ( + register Entry *entryPtr, /* Entry whose value is to be * changed. */ - char *value; /* New text to display in entry. */ + char *value /* New text to display in entry. */ +) { ckfree(entryPtr->string); entryPtr->numChars = strlen(value); @@ -1221,10 +1229,11 @@ EntrySetValue(entryPtr, value) *-------------------------------------------------------------- */ -static void -EntryEventProc(clientData, eventPtr) - ClientData clientData; /* Information about window. */ - XEvent *eventPtr; /* Information about event. */ +static void +EntryEventProc ( + ClientData clientData, /* Information about window. */ + XEvent *eventPtr /* Information about event. */ +) { Entry *entryPtr = (Entry *) clientData; if (eventPtr->type == Expose) { @@ -1266,13 +1275,14 @@ EntryEventProc(clientData, eventPtr) *-------------------------------------------------------------- */ -static int -GetEntryIndex(interp, entryPtr, string, indexPtr) - Tcl_Interp *interp; /* For error messages. */ - Entry *entryPtr; /* Entry for which the index is being +static int +GetEntryIndex ( + Tcl_Interp *interp, /* For error messages. */ + Entry *entryPtr, /* Entry for which the index is being * specified. */ - char *string; /* Specifies character in entryPtr. */ - int *indexPtr; /* Where to store converted index. */ + char *string, /* Specifies character in entryPtr. */ + int *indexPtr /* Where to store converted index. */ +) { int length; @@ -1359,11 +1369,12 @@ GetEntryIndex(interp, entryPtr, string, indexPtr) *---------------------------------------------------------------------- */ -static void -EntryScanTo(entryPtr, x) - register Entry *entryPtr; /* Information about widget. */ - int x; /* X-coordinate to use for scan +static void +EntryScanTo ( + register Entry *entryPtr, /* Information about widget. */ + int x /* X-coordinate to use for scan * operation. */ +) { int newLeftIndex; @@ -1412,12 +1423,13 @@ EntryScanTo(entryPtr, x) *---------------------------------------------------------------------- */ -static void -EntrySelectTo(entryPtr, index) - register Entry *entryPtr; /* Information about widget. */ - int index; /* Index of element that is to +static void +EntrySelectTo ( + register Entry *entryPtr, /* Information about widget. */ + int index /* Index of element that is to * become the "other" end of the * selection. */ +) { int newFirst, newLast; @@ -1479,16 +1491,17 @@ EntrySelectTo(entryPtr, index) *---------------------------------------------------------------------- */ -static int -EntryFetchSelection(clientData, offset, buffer, maxBytes) - ClientData clientData; /* Information about entry widget. */ - int offset; /* Offset within selection of first +static int +EntryFetchSelection ( + ClientData clientData, /* Information about entry widget. */ + int offset, /* Offset within selection of first * character to be returned. */ - char *buffer; /* Location in which to place + char *buffer, /* Location in which to place * selection. */ - int maxBytes; /* Maximum number of bytes to place + int maxBytes /* Maximum number of bytes to place * at buffer, not including terminating * NULL character. */ +) { Entry *entryPtr = (Entry *) clientData; int count; @@ -1526,9 +1539,10 @@ EntryFetchSelection(clientData, offset, buffer, maxBytes) *---------------------------------------------------------------------- */ -static void -EntryLostSelection(clientData) - ClientData clientData; /* Information about entry widget. */ +static void +EntryLostSelection ( + ClientData clientData /* Information about entry widget. */ +) { Entry *entryPtr = (Entry *) clientData; @@ -1558,9 +1572,10 @@ EntryLostSelection(clientData) *---------------------------------------------------------------------- */ -static void -EventuallyRedraw(entryPtr) - register Entry *entryPtr; /* Information about widget. */ +static void +EventuallyRedraw ( + register Entry *entryPtr /* Information about widget. */ +) { if ((entryPtr->tkwin == NULL) || !Tk_IsMapped(entryPtr->tkwin)) { return; @@ -1598,9 +1613,10 @@ EventuallyRedraw(entryPtr) *---------------------------------------------------------------------- */ -static void -EntryUpdateScrollbar(entryPtr) - register Entry *entryPtr; /* Information about widget. */ +static void +EntryUpdateScrollbar ( + register Entry *entryPtr /* Information about widget. */ +) { char args[100]; int result, last, charsInWindow, endX; @@ -1656,9 +1672,10 @@ EntryUpdateScrollbar(entryPtr) *---------------------------------------------------------------------- */ -static void -EntryBlinkProc(clientData) - ClientData clientData; /* Pointer to record describing entry. */ +static void +EntryBlinkProc ( + ClientData clientData /* Pointer to record describing entry. */ +) { register Entry *entryPtr = (Entry *) clientData; @@ -1695,11 +1712,12 @@ EntryBlinkProc(clientData) *---------------------------------------------------------------------- */ -static void -EntryFocusProc(clientData, gotFocus) - ClientData clientData; /* Pointer to structure describing entry. */ - int gotFocus; /* 1 means window is getting focus, 0 means +static void +EntryFocusProc ( + ClientData clientData, /* Pointer to structure describing entry. */ + int gotFocus /* 1 means window is getting focus, 0 means * it's losing it. */ +) { register Entry *entryPtr = (Entry *) clientData; @@ -1741,12 +1759,13 @@ EntryFocusProc(clientData, gotFocus) /* ARGSUSED */ static char * -EntryTextVarProc(clientData, interp, name1, name2, flags) - ClientData clientData; /* Information about button. */ - Tcl_Interp *interp; /* Interpreter containing variable. */ - char *name1; /* Name of variable. */ - char *name2; /* Second part of variable name. */ - int flags; /* Information about what happened. */ +EntryTextVarProc ( + ClientData clientData, /* Information about button. */ + Tcl_Interp *interp, /* Interpreter containing variable. */ + char *name1, /* Name of variable. */ + char *name2, /* Second part of variable name. */ + int flags /* Information about what happened. */ +) { register Entry *entryPtr = (Entry *) clientData; char *value; diff --git a/src/tk/tkerror.c b/src/tk/tkerror.c index b6fdb17..5255cf5 100644 --- a/src/tk/tkerror.c +++ b/src/tk/tkerror.c @@ -75,23 +75,24 @@ static int ErrorProc _ANSI_ARGS_((Display *display, */ Tk_ErrorHandler -Tk_CreateErrorHandler(display, error, request, minorCode, errorProc, clientData) - Display *display; /* Display for which to handle +Tk_CreateErrorHandler( + Display *display, /* Display for which to handle * errors. */ - int error; /* Consider only errors with this + int error, /* Consider only errors with this * error_code (-1 means consider * all errors). */ - int request; /* Consider only errors with this + int request, /* Consider only errors with this * major request code (-1 means * consider all major codes). */ - int minorCode; /* Consider only errors with this + int minorCode, /* Consider only errors with this * minor request code (-1 means * consider all minor codes). */ - Tk_ErrorProc *errorProc; /* Procedure to invoke when a + Tk_ErrorProc *errorProc, /* Procedure to invoke when a * matching error occurs. NULL means * just ignore matching errors. */ - ClientData clientData; /* Arbitrary value to pass to + ClientData clientData /* Arbitrary value to pass to * errorProc. */ +) { register TkErrorHandler *errorPtr; register TkDisplay *dispPtr; @@ -161,10 +162,11 @@ Tk_CreateErrorHandler(display, error, request, minorCode, errorProc, clientData) */ void -Tk_DeleteErrorHandler(handler) - Tk_ErrorHandler handler; /* Token for handler to delete; +Tk_DeleteErrorHandler( + Tk_ErrorHandler handler /* Token for handler to delete; * was previous return value from * Tk_CreateErrorHandler. */ +) { register TkErrorHandler *errorPtr = (TkErrorHandler *) handler; register TkDisplay *dispPtr = errorPtr->dispPtr; @@ -234,15 +236,16 @@ Tk_DeleteErrorHandler(handler) *-------------------------------------------------------------- */ -static int -ErrorProc(display, errEventPtr) - Display *display; /* Display for which error +static int +ErrorProc ( + Display *display, /* Display for which error * occurred. */ - register XErrorEvent *errEventPtr; /* Information about error. */ + register XErrorEvent *errEventPtr /* Information about error. */ +) { register TkDisplay *dispPtr; register TkErrorHandler *errorPtr; - extern int _XDefaultError(); + extern int _XDefaultError(Display *, XErrorEvent *); /* * See if we know anything about the display. If not, then diff --git a/src/tk/tkevent.c b/src/tk/tkevent.c index 0e9deb0..f35b8ee 100644 --- a/src/tk/tkevent.c +++ b/src/tk/tkevent.c @@ -291,14 +291,15 @@ DefPool(IdleHandler) */ void -Tk_CreateEventHandler(token, mask, proc, clientData) - Tk_Window token; /* Token for window in which to +Tk_CreateEventHandler( + Tk_Window token, /* Token for window in which to * create handler. */ - unsigned long mask; /* Events for which proc should + unsigned long mask, /* Events for which proc should * be called. */ - Tk_EventProc *proc; /* Procedure to call for each + Tk_EventProc *proc, /* Procedure to call for each * selected event */ - ClientData clientData; /* Arbitrary data to pass to proc. */ + ClientData clientData /* Arbitrary data to pass to proc. */ +) { register TkEventHandler *handlerPtr; register TkWindow *winPtr = (TkWindow *) token; @@ -370,12 +371,13 @@ Tk_CreateEventHandler(token, mask, proc, clientData) *-------------------------------------------------------------- */ -void -Tk_DeleteEventHandler(token, mask, proc, clientData) - Tk_Window token; /* Same as corresponding arguments passed */ - unsigned long mask; /* previously to Tk_CreateEventHandler. */ - Tk_EventProc *proc; - ClientData clientData; +void +Tk_DeleteEventHandler ( + Tk_Window token, /* Same as corresponding arguments passed */ + unsigned long mask, /* previously to Tk_CreateEventHandler. */ + Tk_EventProc *proc, + ClientData clientData +) { register TkEventHandler *handlerPtr; register InProgress *ipPtr; @@ -446,10 +448,11 @@ Tk_DeleteEventHandler(token, mask, proc, clientData) *-------------------------------------------------------------- */ -void -Tk_CreateGenericHandler(proc, clientData) - Tk_GenericProc *proc; /* Procedure to call on every event. */ - ClientData clientData; /* One-word value to pass to proc. */ +void +Tk_CreateGenericHandler ( + Tk_GenericProc *proc, /* Procedure to call on every event. */ + ClientData clientData /* One-word value to pass to proc. */ +) { GenericHandler *handlerPtr; @@ -486,10 +489,8 @@ Tk_CreateGenericHandler(proc, clientData) *-------------------------------------------------------------- */ -void -Tk_DeleteGenericHandler(proc, clientData) - Tk_GenericProc *proc; - ClientData clientData; +void +Tk_DeleteGenericHandler (Tk_GenericProc *proc, ClientData clientData) { GenericHandler * handler; @@ -517,9 +518,10 @@ Tk_DeleteGenericHandler(proc, clientData) *-------------------------------------------------------------- */ -void -Tk_HandleEvent(eventPtr) - XEvent *eventPtr; /* Event to dispatch. */ +void +Tk_HandleEvent ( + XEvent *eventPtr /* Event to dispatch. */ +) { register TkEventHandler *handlerPtr; register GenericHandler *genericPtr; @@ -730,20 +732,21 @@ Tk_HandleEvent(eventPtr) *-------------------------------------------------------------- */ -void -Tk_CreateFileHandler(fd, mask, proc, clientData) - int fd; /* Integer identifier for stream. */ - int mask; /* OR'ed combination of TK_READABLE, +void +Tk_CreateFileHandler ( + int fd, /* Integer identifier for stream. */ + int mask, /* OR'ed combination of TK_READABLE, * TK_WRITABLE, and TK_EXCEPTION: * indicates conditions under which * proc should be called. */ - Tk_FileProc *proc; /* Procedure to call for each + Tk_FileProc *proc, /* Procedure to call for each * selected event. NULL means that * this is a display, and that * clientData is the (Display *) * for it, and that events should * be handled automatically. */ - ClientData clientData; /* Arbitrary data to pass to proc. */ + ClientData clientData /* Arbitrary data to pass to proc. */ +) { register FileEvent *filePtr; int index; @@ -841,10 +844,11 @@ Tk_CreateFileHandler(fd, mask, proc, clientData) *-------------------------------------------------------------- */ -void -Tk_DeleteFileHandler(fd) - int fd; /* Stream id for which to remove +void +Tk_DeleteFileHandler ( + int fd /* Stream id for which to remove * callback procedure. */ +) { register FileEvent *filePtr; FileEvent *prevPtr; @@ -924,12 +928,13 @@ Tk_DeleteFileHandler(fd) *-------------------------------------------------------------- */ -Tk_TimerToken -Tk_CreateTimerHandler(milliseconds, proc, clientData) - int milliseconds; /* How many milliseconds to wait +Tk_TimerToken +Tk_CreateTimerHandler ( + int milliseconds, /* How many milliseconds to wait * before invoking proc. */ - Tk_TimerProc *proc; /* Procedure to invoke. */ - ClientData clientData; /* Arbitrary data to pass to proc. */ + Tk_TimerProc *proc, /* Procedure to invoke. */ + ClientData clientData /* Arbitrary data to pass to proc. */ +) { register TimerEvent *timerPtr, *tPtr2, *prevPtr; static int id = 0; @@ -1000,14 +1005,15 @@ Tk_CreateTimerHandler(milliseconds, proc, clientData) *-------------------------------------------------------------- */ -Tk_TimerToken -Tk_CreateMicroTimerHandler(seconds, microseconds, proc, clientData) - int seconds; /* How many seconds to wait +Tk_TimerToken +Tk_CreateMicroTimerHandler ( + int seconds, /* How many seconds to wait * before invoking proc. */ - int microseconds; /* How many microseconds to wait + int microseconds, /* How many microseconds to wait * before invoking proc. */ - Tk_TimerProc *proc; /* Procedure to invoke. */ - ClientData clientData; /* Arbitrary data to pass to proc. */ + Tk_TimerProc *proc, /* Procedure to invoke. */ + ClientData clientData /* Arbitrary data to pass to proc. */ +) { register TimerEvent *timerPtr, *tPtr2, *prevPtr; static int id = 0; @@ -1078,10 +1084,11 @@ Tk_CreateMicroTimerHandler(seconds, microseconds, proc, clientData) *-------------------------------------------------------------- */ -void -Tk_DeleteTimerHandler(token) - Tk_TimerToken token; /* Result previously returned by +void +Tk_DeleteTimerHandler ( + Tk_TimerToken token /* Result previously returned by * Tk_DeleteTimerHandler. */ +) { register TimerEvent *timerPtr, *prevPtr; @@ -1124,10 +1131,11 @@ Tk_DeleteTimerHandler(token) *-------------------------------------------------------------- */ -void -Tk_DoWhenIdle(proc, clientData) - Tk_IdleProc *proc; /* Procedure to invoke. */ - ClientData clientData; /* Arbitrary value to pass to proc. */ +void +Tk_DoWhenIdle ( + Tk_IdleProc *proc, /* Procedure to invoke. */ + ClientData clientData /* Arbitrary value to pass to proc. */ +) { register IdleHandler *idlePtr; @@ -1161,10 +1169,11 @@ Tk_DoWhenIdle(proc, clientData) *---------------------------------------------------------------------- */ -void -Tk_CancelIdleCall(proc, clientData) - Tk_IdleProc *proc; /* Procedure that was previously registered. */ - ClientData clientData; /* Arbitrary value to pass to proc. */ +void +Tk_CancelIdleCall ( + Tk_IdleProc *proc, /* Procedure that was previously registered. */ + ClientData clientData /* Arbitrary value to pass to proc. */ +) { register IdleHandler *idlePtr, *prevPtr; IdleHandler *nextPtr; @@ -1214,12 +1223,13 @@ Tk_CancelIdleCall(proc, clientData) *-------------------------------------------------------------- */ -int -Tk_DoOneEvent(flags) - int flags; /* Miscellaneous flag values: may be any +int +Tk_DoOneEvent ( + int flags /* Miscellaneous flag values: may be any * combination of TK_DONT_WAIT, TK_X_EVENTS, * TK_FILE_EVENTS, TK_TIMER_EVENTS, and * TK_IDLE_EVENTS. */ +) { register FileEvent *filePtr; struct timeval curTime, timeout, *timeoutPtr; @@ -1285,9 +1295,9 @@ Tk_DoOneEvent(flags) * function to print a nice message. */ - void (*oldHandler)(); + void (*oldHandler)(int); - oldHandler = (void (*)()) signal(SIGPIPE, SIG_IGN); + oldHandler = (void (*)(int)) signal(SIGPIPE, SIG_IGN); XNoOp(display); XFlush(display); (void) signal(SIGPIPE, oldHandler); @@ -1534,8 +1544,8 @@ Tk_DoOneEvent(flags) *-------------------------------------------------------------- */ -void -Tk_MainLoop() +void +Tk_MainLoop (void) { while (!tkMustExit && tk_NumMainWindows > 0) { @@ -1559,9 +1569,10 @@ Tk_MainLoop() *---------------------------------------------------------------------- */ -void -Tk_Sleep(ms) - int ms; /* Number of milliseconds to sleep. */ +void +Tk_Sleep ( + int ms /* Number of milliseconds to sleep. */ +) { static struct timeval delay; @@ -1593,13 +1604,14 @@ Tk_Sleep(ms) */ Tk_RestrictProc * -Tk_RestrictEvents(proc, arg, prevArgPtr) - Tk_RestrictProc *proc; /* X "if" procedure to call for each +Tk_RestrictEvents ( + Tk_RestrictProc *proc, /* X "if" procedure to call for each * incoming event. See "XIfEvent" doc. * for details. */ - char *arg; /* Arbitrary argument to pass to proc. */ - char **prevArgPtr; /* Place to store information about previous + char *arg, /* Arbitrary argument to pass to proc. */ + char **prevArgPtr /* Place to store information about previous * argument. */ +) { Bool (*prev) _ANSI_ARGS_((Display *display, XEvent *eventPtr, char *arg)); @@ -1641,12 +1653,13 @@ Tk_RestrictEvents(proc, arg, prevArgPtr) *-------------------------------------------------------------- */ -void -Tk_CreateFocusHandler(tkwin, proc, clientData) - Tk_Window tkwin; /* Token for window. */ - Tk_FocusProc *proc; /* Procedure to call when tkwin gets +void +Tk_CreateFocusHandler ( + Tk_Window tkwin, /* Token for window. */ + Tk_FocusProc *proc, /* Procedure to call when tkwin gets * or loses the input focus. */ - ClientData clientData; /* Arbitrary value to pass to proc. */ + ClientData clientData /* Arbitrary value to pass to proc. */ +) { register TkWindow *winPtr = (TkWindow *) tkwin; @@ -1671,13 +1684,14 @@ Tk_CreateFocusHandler(tkwin, proc, clientData) *-------------------------------------------------------------- */ -int -Tk_FocusCmd(clientData, interp, argc, argv) - ClientData clientData; /* Main window associated with +int +Tk_FocusCmd ( + ClientData clientData, /* Main window associated with * interpreter. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { Tk_Window tkwin = (Tk_Window) clientData; register TkWindow *winPtr = (TkWindow *) clientData; @@ -1774,10 +1788,11 @@ Tk_FocusCmd(clientData, interp, argc, argv) *-------------------------------------------------------------- */ -void -TkFocusEventProc(winPtr, eventPtr) - register TkWindow *winPtr; /* Top-level window just entered or left. */ - XEvent *eventPtr; /* EnterWindow or LeaveWindow event. */ +void +TkFocusEventProc ( + register TkWindow *winPtr, /* Top-level window just entered or left. */ + XEvent *eventPtr /* EnterWindow or LeaveWindow event. */ +) { register TkWindow *focusPtr; TkWindow *newMouseMainPtr = NULL; @@ -1823,10 +1838,11 @@ TkFocusEventProc(winPtr, eventPtr) *-------------------------------------------------------------- */ -void -TkEventDeadWindow(winPtr) - TkWindow *winPtr; /* Information about the window +void +TkEventDeadWindow ( + TkWindow *winPtr /* Information about the window * that is being deleted. */ +) { register TkEventHandler *handlerPtr; register InProgress *ipPtr; @@ -1877,9 +1893,10 @@ TkEventDeadWindow(winPtr) *---------------------------------------------------------------------- */ -Time -TkCurrentTime(dispPtr) - TkDisplay *dispPtr; /* Display for which the time is desired. */ +Time +TkCurrentTime ( + TkDisplay *dispPtr /* Display for which the time is desired. */ +) { register XEvent *eventPtr; diff --git a/src/tk/tkfont.c b/src/tk/tkfont.c index 9d6acbe..9ff9cb2 100644 --- a/src/tk/tkfont.c +++ b/src/tk/tkfont.c @@ -138,12 +138,13 @@ static void SetFontMetrics _ANSI_ARGS_((TkFont *fontPtr)); */ XFontStruct * -Tk_GetFontStruct(interp, tkwin, name) - Tcl_Interp *interp; /* Place to leave error message if +Tk_GetFontStruct ( + Tcl_Interp *interp, /* Place to leave error message if * font can't be found. */ - Tk_Window tkwin; /* Window in which font will be used. */ - Tk_Uid name; /* Name of font (in form suitable for + Tk_Window tkwin, /* Window in which font will be used. */ + Tk_Uid name /* Name of font (in form suitable for * passing to XLoadQueryFont). */ +) { NameKey nameKey; Tcl_HashEntry *nameHashPtr, *fontHashPtr; @@ -219,8 +220,9 @@ Tk_GetFontStruct(interp, tkwin, name) */ char * -Tk_NameOfFontStruct(fontStructPtr) - XFontStruct *fontStructPtr; /* Font whose name is desired. */ +Tk_NameOfFontStruct ( + XFontStruct *fontStructPtr /* Font whose name is desired. */ +) { Tcl_HashEntry *fontHashPtr; TkFont *fontPtr; @@ -258,9 +260,10 @@ Tk_NameOfFontStruct(fontStructPtr) *---------------------------------------------------------------------- */ -void -Tk_FreeFontStruct(fontStructPtr) - XFontStruct *fontStructPtr; /* Font to be released. */ +void +Tk_FreeFontStruct ( + XFontStruct *fontStructPtr /* Font to be released. */ +) { Tcl_HashEntry *fontHashPtr; register TkFont *fontPtr; @@ -306,8 +309,8 @@ Tk_FreeFontStruct(fontStructPtr) *---------------------------------------------------------------------- */ -static void -FontInit() +static void +FontInit (void) { initialized = 1; Tcl_InitHashTable(&nameTable, sizeof(NameKey)/sizeof(int)); @@ -331,10 +334,11 @@ FontInit() *-------------------------------------------------------------- */ -static void -SetFontMetrics(fontPtr) - register TkFont *fontPtr; /* Font structure in which to +static void +SetFontMetrics ( + register TkFont *fontPtr /* Font structure in which to * set metrics. */ +) { int i, replaceOK, baseWidth; register XFontStruct *fontStructPtr = fontPtr->fontStructPtr; @@ -446,18 +450,18 @@ SetFontMetrics(fontPtr) *-------------------------------------------------------------- */ -int -TkMeasureChars(fontStructPtr, source, maxChars, startX, maxX, flags, nextXPtr) - XFontStruct *fontStructPtr; /* Font in which to draw characters. */ - char *source; /* Characters to be displayed. Need not +int +TkMeasureChars ( + XFontStruct *fontStructPtr, /* Font in which to draw characters. */ + char *source, /* Characters to be displayed. Need not * be NULL-terminated. */ - int maxChars; /* Maximum # of characters to consider from + int maxChars, /* Maximum # of characters to consider from * source. */ - int startX; /* X-position at which first character will + int startX, /* X-position at which first character will * be drawn. */ - int maxX; /* Don't consider any character that would + int maxX, /* Don't consider any character that would * cross this x-position. */ - int flags; /* Various flag bits OR-ed together. + int flags, /* Various flag bits OR-ed together. * TK_WHOLE_WORDS means stop on a word boundary * (just before a space character) if * possible. TK_AT_LEAST_ONE means always @@ -468,8 +472,9 @@ TkMeasureChars(fontStructPtr, source, maxChars, startX, maxX, flags, nextXPtr) * TK_NEWLINES_NOT_SPECIAL means that newlines * are treated just like other control chars: * they don't terminate the line,*/ - int *nextXPtr; /* Return x-position of terminating + int *nextXPtr /* Return x-position of terminating * character here. */ +) { register TkFont *fontPtr; register char *p; /* Current character. */ @@ -591,24 +596,25 @@ TkMeasureChars(fontStructPtr, source, maxChars, startX, maxX, flags, nextXPtr) *-------------------------------------------------------------- */ -void -TkDisplayChars(display, drawable, gc, fontStructPtr, string, numChars, - x, y, flags) - Display *display; /* Display on which to draw. */ - Drawable drawable; /* Window or pixmap in which to draw. */ - GC gc; /* Graphics context for actually drawing +void +TkDisplayChars ( + Display *display, /* Display on which to draw. */ + Drawable drawable, /* Window or pixmap in which to draw. */ + GC gc, /* Graphics context for actually drawing * characters. */ - XFontStruct *fontStructPtr; /* Font used in GC; must have been allocated + XFontStruct *fontStructPtr, /* Font used in GC; must have been allocated * by Tk_GetFontStruct. Used to compute sizes * of tabs, etc. */ - char *string; /* Characters to be displayed. */ - int numChars; /* Number of characters to display from + char *string, /* Characters to be displayed. */ + int numChars, /* Number of characters to display from * string. */ - int x, y; /* Coordinates at which to draw string. */ - int flags; /* Flags to control display. Only + int x, + int y, /* Coordinates at which to draw string. */ + int flags /* Flags to control display. Only * TK_NEWLINES_NOT_SPECIAL is supported right * now. See TkMeasureChars for information * about it. */ +) { register TkFont *fontPtr; register char *p; /* Current character being scanned. */ @@ -721,23 +727,24 @@ TkDisplayChars(display, drawable, gc, fontStructPtr, string, numChars, *---------------------------------------------------------------------- */ -void -TkUnderlineChars(display, drawable, gc, fontStructPtr, string, x, y, - flags, firstChar, lastChar) - Display *display; /* Display on which to draw. */ - Drawable drawable; /* Window or pixmap in which to draw. */ - GC gc; /* Graphics context for actually drawing +void +TkUnderlineChars ( + Display *display, /* Display on which to draw. */ + Drawable drawable, /* Window or pixmap in which to draw. */ + GC gc, /* Graphics context for actually drawing * underline. */ - XFontStruct *fontStructPtr; /* Font used in GC; must have been allocated + XFontStruct *fontStructPtr, /* Font used in GC; must have been allocated * by Tk_GetFontStruct. Used to character * dimensions, etc. */ - char *string; /* String containing characters to be + char *string, /* String containing characters to be * underlined. */ - int x, y; /* Coordinates at which first character of + int x, + int y, /* Coordinates at which first character of * string is drawn. */ - int flags; /* Flags that were passed to TkDisplayChars. */ - int firstChar; /* Index of first character to underline. */ - int lastChar; /* Index of last character to underline. */ + int flags, /* Flags that were passed to TkDisplayChars. */ + int firstChar, /* Index of first character to underline. */ + int lastChar /* Index of last character to underline. */ +) { int xUnder, yUnder, width, height; unsigned long value; diff --git a/src/tk/tkframe.c b/src/tk/tkframe.c index 11bd369..f5b8d2e 100644 --- a/src/tk/tkframe.c +++ b/src/tk/tkframe.c @@ -126,12 +126,13 @@ static void MapFrame _ANSI_ARGS_((ClientData clientData)); */ int -Tk_FrameCmd(clientData, interp, argc, argv) - ClientData clientData; /* Main window associated with +Tk_FrameCmd( + ClientData clientData, /* Main window associated with * interpreter. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { Tk_Window tkwin = (Tk_Window) clientData; Tk_Window new; @@ -210,7 +211,7 @@ Tk_FrameCmd(clientData, interp, argc, argv) Tk_CreateEventHandler(framePtr->tkwin, ExposureMask|StructureNotifyMask, FrameEventProc, (ClientData) framePtr); Tcl_CreateCommand(interp, Tk_PathName(framePtr->tkwin), - FrameWidgetCmd, (ClientData) framePtr, (void (*)()) NULL); + FrameWidgetCmd, (ClientData) framePtr, (void (*)(int *)) NULL); if (ConfigureFrame(interp, framePtr, argc-2, argv+2, 0) != TCL_OK) { Tk_DestroyWindow(framePtr->tkwin); @@ -242,11 +243,12 @@ Tk_FrameCmd(clientData, interp, argc, argv) */ static int -FrameWidgetCmd(clientData, interp, argc, argv) - ClientData clientData; /* Information about frame widget. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +FrameWidgetCmd( + ClientData clientData, /* Information about frame widget. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { register Frame *framePtr = (Frame *) clientData; int result = TCL_OK; @@ -300,8 +302,9 @@ FrameWidgetCmd(clientData, interp, argc, argv) */ static void -DestroyFrame(clientData) - ClientData clientData; /* Info about frame widget. */ +DestroyFrame( + ClientData clientData /* Info about frame widget. */ +) { register Frame *framePtr = (Frame *) clientData; @@ -338,14 +341,15 @@ DestroyFrame(clientData) *---------------------------------------------------------------------- */ -static int -ConfigureFrame(interp, framePtr, argc, argv, flags) - Tcl_Interp *interp; /* Used for error reporting. */ - register Frame *framePtr; /* Information about widget; may or may +static int +ConfigureFrame ( + Tcl_Interp *interp, /* Used for error reporting. */ + register Frame *framePtr, /* Information about widget; may or may * not already have values for some fields. */ - int argc; /* Number of valid entries in argv. */ - char **argv; /* Arguments. */ - int flags; /* Flags to pass to Tk_ConfigureWidget. */ + int argc, /* Number of valid entries in argv. */ + char **argv, /* Arguments. */ + int flags /* Flags to pass to Tk_ConfigureWidget. */ +) { if (Tk_ConfigureWidget(interp, framePtr->tkwin, configSpecs, argc, argv, (char *) framePtr, flags) != TCL_OK) { @@ -393,8 +397,9 @@ ConfigureFrame(interp, framePtr, argc, argv, flags) */ static void -DisplayFrame(clientData) - ClientData clientData; /* Information about widget. */ +DisplayFrame( + ClientData clientData /* Information about widget. */ +) { register Frame *framePtr = (Frame *) clientData; register Tk_Window tkwin = framePtr->tkwin; @@ -436,9 +441,10 @@ DisplayFrame(clientData) */ static void -FrameEventProc(clientData, eventPtr) - ClientData clientData; /* Information about window. */ - register XEvent *eventPtr; /* Information about event. */ +FrameEventProc( + ClientData clientData, /* Information about window. */ + register XEvent *eventPtr /* Information about event. */ +) { register Frame *framePtr = (Frame *) clientData; @@ -477,8 +483,9 @@ FrameEventProc(clientData, eventPtr) */ static void -MapFrame(clientData) - ClientData clientData; /* Pointer to frame structure. */ +MapFrame( + ClientData clientData /* Pointer to frame structure. */ +) { Frame *framePtr = (Frame *) clientData; diff --git a/src/tk/tkgc.c b/src/tk/tkgc.c index b05de57..763dda2 100644 --- a/src/tk/tkgc.c +++ b/src/tk/tkgc.c @@ -84,14 +84,12 @@ static void GCInit _ANSI_ARGS_((void)); *---------------------------------------------------------------------- */ -GC -Tk_GetGC(tkwin, valueMask, valuePtr) - Tk_Window tkwin; /* Window in which GC will be used. */ - register unsigned long valueMask; - /* 1 bits correspond to values specified - * in *valuesPtr; other values are set - * from defaults. */ - register XGCValues *valuePtr; +GC +Tk_GetGC ( + Tk_Window tkwin, /* Window in which GC will be used. */ + register unsigned long valueMask, + register XGCValues *valuePtr +) /* Values are specified here for bits set * in valueMask. */ { @@ -284,9 +282,10 @@ Tk_GetGC(tkwin, valueMask, valuePtr) *---------------------------------------------------------------------- */ -void -Tk_FreeGC(gc) - GC gc; /* Graphics context to be released. */ +void +Tk_FreeGC ( + GC gc /* Graphics context to be released. */ +) { Tcl_HashEntry *idHashPtr; register TkGC *gcPtr; @@ -325,8 +324,8 @@ Tk_FreeGC(gc) *---------------------------------------------------------------------- */ -static void -GCInit() +static void +GCInit (void) { initialized = 1; Tcl_InitHashTable(&valueTable, sizeof(ValueKey)/sizeof(int)); diff --git a/src/tk/tkgeo.c b/src/tk/tkgeo.c index 974faeb..043c32a 100644 --- a/src/tk/tkgeo.c +++ b/src/tk/tkgeo.c @@ -58,14 +58,15 @@ static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkGeometry.c,v 1.18 92/05 *-------------------------------------------------------------- */ -void -Tk_ManageGeometry(tkwin, proc, clientData) - Tk_Window tkwin; /* Window whose geometry is to +void +Tk_ManageGeometry ( + Tk_Window tkwin, /* Window whose geometry is to * be managed by proc. */ - Tk_GeometryProc *proc; /* Procedure to manage geometry. + Tk_GeometryProc *proc, /* Procedure to manage geometry. * NULL means make tkwin unmanaged. */ - ClientData clientData; /* Arbitrary one-word argument to + ClientData clientData /* Arbitrary one-word argument to * pass to proc. */ +) { register TkWindow *winPtr = (TkWindow *) tkwin; @@ -97,12 +98,14 @@ Tk_ManageGeometry(tkwin, proc, clientData) *-------------------------------------------------------------- */ -void -Tk_GeometryRequest(tkwin, reqWidth, reqHeight) - Tk_Window tkwin; /* Window that geometry information +void +Tk_GeometryRequest ( + Tk_Window tkwin, /* Window that geometry information * pertains to. */ - int reqWidth, reqHeight; /* Minimum desired dimensions for + int reqWidth, + int reqHeight /* Minimum desired dimensions for * window, in pixels. */ +) { register TkWindow *winPtr = (TkWindow *) tkwin; @@ -136,10 +139,11 @@ Tk_GeometryRequest(tkwin, reqWidth, reqHeight) *---------------------------------------------------------------------- */ -void -Tk_SetInternalBorder(tkwin, width) - Tk_Window tkwin; /* Window that will have internal border. */ - int width; /* Width of internal border, in pixels. */ +void +Tk_SetInternalBorder ( + Tk_Window tkwin, /* Window that will have internal border. */ + int width /* Width of internal border, in pixels. */ +) { register TkWindow *winPtr = (TkWindow *) tkwin; diff --git a/src/tk/tkget.c b/src/tk/tkget.c index 0eba761..fa4bc5e 100644 --- a/src/tk/tkget.c +++ b/src/tk/tkget.c @@ -52,12 +52,13 @@ static int initialized = 0; *-------------------------------------------------------------- */ -int -Tk_GetAnchor(interp, string, anchorPtr) - Tcl_Interp *interp; /* Use this for error reporting. */ - char *string; /* String describing a direction. */ - Tk_Anchor *anchorPtr; /* Where to store Tk_Anchor corresponding +int +Tk_GetAnchor ( + Tcl_Interp *interp, /* Use this for error reporting. */ + char *string, /* String describing a direction. */ + Tk_Anchor *anchorPtr /* Where to store Tk_Anchor corresponding * to string. */ +) { switch (string[0]) { case 'n': @@ -130,9 +131,10 @@ Tk_GetAnchor(interp, string, anchorPtr) */ char * -Tk_NameOfAnchor(anchor) - Tk_Anchor anchor; /* Anchor for which identifying string +Tk_NameOfAnchor ( + Tk_Anchor anchor /* Anchor for which identifying string * is desired. */ +) { switch (anchor) { case TK_ANCHOR_N: return "n"; @@ -168,12 +170,13 @@ Tk_NameOfAnchor(anchor) *-------------------------------------------------------------- */ -int -Tk_GetJoinStyle(interp, string, joinPtr) - Tcl_Interp *interp; /* Use this for error reporting. */ - char *string; /* String describing a justification style. */ - int *joinPtr; /* Where to store join style corresponding +int +Tk_GetJoinStyle ( + Tcl_Interp *interp, /* Use this for error reporting. */ + char *string, /* String describing a justification style. */ + int *joinPtr /* Where to store join style corresponding * to string. */ +) { int c, length; @@ -217,9 +220,10 @@ Tk_GetJoinStyle(interp, string, joinPtr) */ char * -Tk_NameOfJoinStyle(join) - int join; /* Join style for which identifying string +Tk_NameOfJoinStyle ( + int join /* Join style for which identifying string * is desired. */ +) { switch (join) { case JoinBevel: return "bevel"; @@ -249,12 +253,13 @@ Tk_NameOfJoinStyle(join) *-------------------------------------------------------------- */ -int -Tk_GetCapStyle(interp, string, capPtr) - Tcl_Interp *interp; /* Use this for error reporting. */ - char *string; /* String describing a justification style. */ - int *capPtr; /* Where to store cap style corresponding +int +Tk_GetCapStyle ( + Tcl_Interp *interp, /* Use this for error reporting. */ + char *string, /* String describing a justification style. */ + int *capPtr /* Where to store cap style corresponding * to string. */ +) { int c, length; @@ -298,9 +303,10 @@ Tk_GetCapStyle(interp, string, capPtr) */ char * -Tk_NameOfCapStyle(cap) - int cap; /* Cap style for which identifying string +Tk_NameOfCapStyle ( + int cap /* Cap style for which identifying string * is desired. */ +) { switch (cap) { case CapButt: return "butt"; @@ -330,12 +336,13 @@ Tk_NameOfCapStyle(cap) *-------------------------------------------------------------- */ -int -Tk_GetJustify(interp, string, justifyPtr) - Tcl_Interp *interp; /* Use this for error reporting. */ - char *string; /* String describing a justification style. */ - Tk_Justify *justifyPtr; /* Where to store Tk_Justify corresponding +int +Tk_GetJustify ( + Tcl_Interp *interp, /* Use this for error reporting. */ + char *string, /* String describing a justification style. */ + Tk_Justify *justifyPtr /* Where to store Tk_Justify corresponding * to string. */ +) { int c, length; @@ -383,9 +390,10 @@ Tk_GetJustify(interp, string, justifyPtr) */ char * -Tk_NameOfJustify(justify) - Tk_Justify justify; /* Justification style for which +Tk_NameOfJustify ( + Tk_Justify justify /* Justification style for which * identifying string is desired. */ +) { switch (justify) { case TK_JUSTIFY_LEFT: return "left"; @@ -419,9 +427,10 @@ Tk_NameOfJustify(justify) *---------------------------------------------------------------------- */ -Tk_Uid -Tk_GetUid(string) - char *string; /* String to convert. */ +Tk_Uid +Tk_GetUid ( + char *string /* String to convert. */ +) { int dummy; @@ -454,14 +463,15 @@ Tk_GetUid(string) *-------------------------------------------------------------- */ -int -Tk_GetScreenMM(interp, tkwin, string, doublePtr) - Tcl_Interp *interp; /* Use this for error reporting. */ - Tk_Window tkwin; /* Window whose screen determines conversion +int +Tk_GetScreenMM ( + Tcl_Interp *interp, /* Use this for error reporting. */ + Tk_Window tkwin, /* Window whose screen determines conversion * from centimeters and other absolute * units. */ - char *string; /* String describing a screen distance. */ - double *doublePtr; /* Place to store converted result. */ + char *string, /* String describing a screen distance. */ + double *doublePtr /* Place to store converted result. */ +) { char *end; double d; @@ -530,14 +540,15 @@ Tk_GetScreenMM(interp, tkwin, string, doublePtr) *-------------------------------------------------------------- */ -int -Tk_GetPixels(interp, tkwin, string, intPtr) - Tcl_Interp *interp; /* Use this for error reporting. */ - Tk_Window tkwin; /* Window whose screen determines conversion +int +Tk_GetPixels ( + Tcl_Interp *interp, /* Use this for error reporting. */ + Tk_Window tkwin, /* Window whose screen determines conversion * from centimeters and other absolute * units. */ - char *string; /* String describing a justification style. */ - int *intPtr; /* Place to store converted result. */ + char *string, /* String describing a justification style. */ + int *intPtr /* Place to store converted result. */ +) { char *end; double d; diff --git a/src/tk/tkgrab.c b/src/tk/tkgrab.c index 0bf8a39..f9becfa 100644 --- a/src/tk/tkgrab.c +++ b/src/tk/tkgrab.c @@ -84,13 +84,14 @@ static void MovePointer2 _ANSI_ARGS_((TkWindow *sourcePtr, */ /* ARGSUSED */ -int -Tk_GrabCmd(clientData, interp, argc, argv) - ClientData clientData; /* Main window associated with +int +Tk_GrabCmd ( + ClientData clientData, /* Main window associated with * interpreter. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { TkWindow *winPtr = (TkWindow *) clientData; int length, lockScreen; @@ -169,16 +170,17 @@ Tk_GrabCmd(clientData, interp, argc, argv) *---------------------------------------------------------------------- */ -int -Tk_Grab(interp, tkwin, grabGlobal) - Tcl_Interp *interp; /* Used for error reporting. */ - Tk_Window tkwin; /* Window on whose behalf the pointer +int +Tk_Grab ( + Tcl_Interp *interp, /* Used for error reporting. */ + Tk_Window tkwin, /* Window on whose behalf the pointer * is to be grabbed. */ - int grabGlobal; /* Non-zero means issue a grab to the + int grabGlobal /* Non-zero means issue a grab to the * server so that no other application * gets mouse or keyboard events. * Zero means the grab only applies * within this application. */ +) { int grabResult; TkWindow *winPtr = (TkWindow *) tkwin; @@ -354,10 +356,11 @@ Tk_Grab(interp, tkwin, grabGlobal) *---------------------------------------------------------------------- */ -void -Tk_Ungrab(tkwin) - Tk_Window tkwin; /* Window that identifies display +void +Tk_Ungrab ( + Tk_Window tkwin /* Window that identifies display * for grab to be released. */ +) { TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr; int inSequence, ignoring, ungrabRequest, numEvents, i, j, diff; @@ -485,11 +488,12 @@ Tk_Ungrab(tkwin) *---------------------------------------------------------------------- */ -int -TkPointerEvent(eventPtr, winPtr) - register XEvent *eventPtr; /* Pointer to the event. */ - TkWindow *winPtr; /* Tk's information for window +int +TkPointerEvent ( + register XEvent *eventPtr, /* Pointer to the event. */ + TkWindow *winPtr /* Tk's information for window * where event was reported. */ +) { register TkWindow *winPtr2; TkDisplay *dispPtr = winPtr->dispPtr; @@ -737,13 +741,14 @@ TkPointerEvent(eventPtr, winPtr) *---------------------------------------------------------------------- */ -static void -ChangeEventWindow(eventPtr, winPtr) - register XEvent *eventPtr; /* Event to retarget. Must have +static void +ChangeEventWindow ( + register XEvent *eventPtr, /* Event to retarget. Must have * type ButtonPress, ButtonRelease, KeyPress, * KeyRelease, MotionNotify, EnterNotify, * or LeaveNotify. */ - TkWindow *winPtr; /* New target window for event. */ + TkWindow *winPtr /* New target window for event. */ +) { int x, y, sameScreen, bd; register TkWindow *childPtr; @@ -801,20 +806,21 @@ ChangeEventWindow(eventPtr, winPtr) *---------------------------------------------------------------------- */ -static void -MovePointer(eventPtr, sourcePtr, destPtr) - XEvent *eventPtr; /* A template X event. Must have all fields +static void +MovePointer ( + XEvent *eventPtr, /* A template X event. Must have all fields * properly set for EnterNotify and LeaveNotify * events except window, subwindow, x, y, * detail, and same_screen. (x_root and y_root * must be valid, even though x and y needn't * be valid). */ - TkWindow *sourcePtr; /* Window currently containing pointer (NULL + TkWindow *sourcePtr, /* Window currently containing pointer (NULL * means it's not one managed by this * process). */ - TkWindow *destPtr; /* Window that is to end up containing the + TkWindow *destPtr /* Window that is to end up containing the * pointer (NULL means it's not one managed * by this process). */ +) { TkDisplay *dispPtr; register TkWindow *ancestorPtr; /* Lowest ancestor shared between @@ -1009,16 +1015,17 @@ MovePointer(eventPtr, sourcePtr, destPtr) *---------------------------------------------------------------------- */ -static void -MovePointer2(sourcePtr, destPtr, mode) - TkWindow *sourcePtr; /* Window currently containing pointer (NULL +static void +MovePointer2 ( + TkWindow *sourcePtr, /* Window currently containing pointer (NULL * means it's not one managed by this * process). */ - TkWindow *destPtr; /* Window that is to end up containing the + TkWindow *destPtr, /* Window that is to end up containing the * pointer (NULL means it's not one managed * by this process). */ - int mode; /* Mode for enter/leave events, such as + int mode /* Mode for enter/leave events, such as * NotifyNormal or NotifyUngrab. */ +) { XEvent event; Window dummy1, dummy2; @@ -1065,10 +1072,11 @@ MovePointer2(sourcePtr, destPtr, mode) *---------------------------------------------------------------------- */ -void -TkGrabDeadWindow(winPtr) - register TkWindow *winPtr; /* Window that is in the process +void +TkGrabDeadWindow ( + register TkWindow *winPtr /* Window that is in the process * of being deleted. */ +) { TkDisplay *dispPtr = winPtr->dispPtr; diff --git a/src/tk/tklist.c b/src/tk/tklist.c index 8b291c6..2bbae25 100644 --- a/src/tk/tklist.c +++ b/src/tk/tklist.c @@ -271,13 +271,14 @@ static int NearestListboxElement _ANSI_ARGS_((Listbox *listPtr, *-------------------------------------------------------------- */ -int -Tk_ListboxCmd(clientData, interp, argc, argv) - ClientData clientData; /* Main window associated with +int +Tk_ListboxCmd ( + ClientData clientData, /* Main window associated with * interpreter. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { register Listbox *listPtr; Tk_Window new; @@ -329,7 +330,7 @@ Tk_ListboxCmd(clientData, interp, argc, argv) Tk_CreateSelHandler(listPtr->tkwin, XA_STRING, ListboxFetchSelection, (ClientData) listPtr, XA_STRING); Tcl_CreateCommand(interp, Tk_PathName(listPtr->tkwin), ListboxWidgetCmd, - (ClientData) listPtr, (void (*)()) NULL); + (ClientData) listPtr, (void (*)(int *)) NULL); if (ConfigureListbox(interp, listPtr, argc-2, argv+2, 0) != TCL_OK) { goto error; } @@ -360,12 +361,13 @@ Tk_ListboxCmd(clientData, interp, argc, argv) *-------------------------------------------------------------- */ -static int -ListboxWidgetCmd(clientData, interp, argc, argv) - ClientData clientData; /* Information about listbox widget. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +static int +ListboxWidgetCmd ( + ClientData clientData, /* Information about listbox widget. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { register Listbox *listPtr = (Listbox *) clientData; int result = TCL_OK; @@ -619,9 +621,10 @@ ListboxWidgetCmd(clientData, interp, argc, argv) *---------------------------------------------------------------------- */ -static void -DestroyListbox(clientData) - ClientData clientData; /* Info about listbox widget. */ +static void +DestroyListbox ( + ClientData clientData /* Info about listbox widget. */ +) { register Listbox *listPtr = (Listbox *) clientData; register Element *elPtr, *nextPtr; @@ -688,14 +691,15 @@ DestroyListbox(clientData) *---------------------------------------------------------------------- */ -static int -ConfigureListbox(interp, listPtr, argc, argv, flags) - Tcl_Interp *interp; /* Used for error reporting. */ - register Listbox *listPtr; /* Information about widget; may or may +static int +ConfigureListbox ( + Tcl_Interp *interp, /* Used for error reporting. */ + register Listbox *listPtr, /* Information about widget; may or may * not already have values for some fields. */ - int argc; /* Number of valid entries in argv. */ - char **argv; /* Arguments. */ - int flags; /* Flags to pass to Tk_ConfigureWidget. */ + int argc, /* Number of valid entries in argv. */ + char **argv, /* Arguments. */ + int flags /* Flags to pass to Tk_ConfigureWidget. */ +) { XGCValues gcValues; GC new; @@ -787,9 +791,10 @@ ConfigureListbox(interp, listPtr, argc, argv, flags) *-------------------------------------------------------------- */ -static void -DisplayListbox(clientData) - ClientData clientData; /* Information about window. */ +static void +DisplayListbox ( + ClientData clientData /* Information about window. */ +) { register Listbox *listPtr = (Listbox *) clientData; register Tk_Window tkwin = listPtr->tkwin; @@ -892,14 +897,15 @@ DisplayListbox(clientData) *---------------------------------------------------------------------- */ -static void -InsertEls(listPtr, index, argc, argv) - register Listbox *listPtr; /* Listbox that is to get the new +static void +InsertEls ( + register Listbox *listPtr, /* Listbox that is to get the new * elements. */ - int index; /* Add the new elements before this + int index, /* Add the new elements before this * element. */ - int argc; /* Number of new elements to add. */ - char **argv; /* New elements (one per entry). */ + int argc, /* Number of new elements to add. */ + char **argv /* New elements (one per entry). */ +) { register Element *prevPtr, *newPtr; int length, dummy, i, oldMaxWidth; @@ -986,11 +992,12 @@ InsertEls(listPtr, index, argc, argv) *---------------------------------------------------------------------- */ -static void -DeleteEls(listPtr, first, last) - register Listbox *listPtr; /* Listbox widget to modify. */ - int first; /* Index of first element to delete. */ - int last; /* Index of last element to delete. */ +static void +DeleteEls ( + register Listbox *listPtr, /* Listbox widget to modify. */ + int first, /* Index of first element to delete. */ + int last /* Index of last element to delete. */ +) { register Element *prevPtr, *elPtr; int count, i, widthChanged; @@ -1096,10 +1103,11 @@ DeleteEls(listPtr, first, last) *-------------------------------------------------------------- */ -static void -ListboxEventProc(clientData, eventPtr) - ClientData clientData; /* Information about window. */ - XEvent *eventPtr; /* Information about event. */ +static void +ListboxEventProc ( + ClientData clientData, /* Information about window. */ + XEvent *eventPtr /* Information about event. */ +) { Listbox *listPtr = (Listbox *) clientData; @@ -1144,14 +1152,15 @@ ListboxEventProc(clientData, eventPtr) *-------------------------------------------------------------- */ -static int -GetListboxIndex(interp, listPtr, string, indexPtr) - Tcl_Interp *interp; /* For error messages. */ - Listbox *listPtr; /* Listbox for which the index is being +static int +GetListboxIndex ( + Tcl_Interp *interp, /* For error messages. */ + Listbox *listPtr, /* Listbox for which the index is being * specified. */ - char *string; /* Numerical index into listPtr's element + char *string, /* Numerical index into listPtr's element * list, or "end" to refer to last element. */ - int *indexPtr; /* Where to store converted index. */ + int *indexPtr /* Where to store converted index. */ +) { if (string[0] == 'e') { if (strncmp(string, "end", strlen(string)) != 0) { @@ -1191,10 +1200,11 @@ GetListboxIndex(interp, listPtr, string, indexPtr) *---------------------------------------------------------------------- */ -static void -ChangeListboxView(listPtr, index) - register Listbox *listPtr; /* Information about widget. */ - int index; /* Index of element in listPtr. */ +static void +ChangeListboxView ( + register Listbox *listPtr, /* Information about widget. */ + int index /* Index of element in listPtr. */ +) { if (listPtr->tkwin == NULL) { return; @@ -1233,11 +1243,12 @@ ChangeListboxView(listPtr, index) *---------------------------------------------------------------------- */ -static void -ChangeListboxOffset(listPtr, offset) - register Listbox *listPtr; /* Information about widget. */ - int offset; /* Desired new "xOffset" for +static void +ChangeListboxOffset ( + register Listbox *listPtr, /* Information about widget. */ + int offset /* Desired new "xOffset" for * listbox. */ +) { int maxOffset; @@ -1284,13 +1295,14 @@ ChangeListboxOffset(listPtr, offset) *---------------------------------------------------------------------- */ -static void -ListboxScanTo(listPtr, x, y) - register Listbox *listPtr; /* Information about widget. */ - int x; /* X-coordinate to use for scan +static void +ListboxScanTo ( + register Listbox *listPtr, /* Information about widget. */ + int x, /* X-coordinate to use for scan * operation. */ - int y; /* Y-coordinate to use for scan + int y /* Y-coordinate to use for scan * operation. */ +) { int newTopIndex, newOffset; @@ -1352,10 +1364,11 @@ ListboxScanTo(listPtr, x, y) *---------------------------------------------------------------------- */ -static int -NearestListboxElement(listPtr, y) - register Listbox *listPtr; /* Information about widget. */ - int y; /* Y-coordinate in listPtr's window. */ +static int +NearestListboxElement ( + register Listbox *listPtr, /* Information about widget. */ + int y /* Y-coordinate in listPtr's window. */ +) { int index; @@ -1390,11 +1403,12 @@ NearestListboxElement(listPtr, y) *---------------------------------------------------------------------- */ -static void -ListboxSelectFrom(listPtr, index) - register Listbox *listPtr; /* Information about widget. */ - int index; /* Index of element that is to +static void +ListboxSelectFrom ( + register Listbox *listPtr, /* Information about widget. */ + int index /* Index of element that is to * become the new selection. */ +) { /* * Make sure the index is within the proper range for the listbox. @@ -1436,12 +1450,13 @@ ListboxSelectFrom(listPtr, index) *---------------------------------------------------------------------- */ -static void -ListboxSelectTo(listPtr, index) - register Listbox *listPtr; /* Information about widget. */ - int index; /* Index of element that is to +static void +ListboxSelectTo ( + register Listbox *listPtr, /* Information about widget. */ + int index /* Index of element that is to * become the "other" end of the * selection. */ +) { int newFirst, newLast; @@ -1516,16 +1531,17 @@ ListboxSelectTo(listPtr, index) *---------------------------------------------------------------------- */ -static int -ListboxFetchSelection(clientData, offset, buffer, maxBytes) - ClientData clientData; /* Information about listbox widget. */ - int offset; /* Offset within selection of first +static int +ListboxFetchSelection ( + ClientData clientData, /* Information about listbox widget. */ + int offset, /* Offset within selection of first * byte to be returned. */ - char *buffer; /* Location in which to place + char *buffer, /* Location in which to place * selection. */ - int maxBytes; /* Maximum number of bytes to place + int maxBytes /* Maximum number of bytes to place * at buffer, not including terminating * NULL character. */ +) { register Listbox *listPtr = (Listbox *) clientData; register Element *elPtr; @@ -1596,9 +1612,10 @@ ListboxFetchSelection(clientData, offset, buffer, maxBytes) *---------------------------------------------------------------------- */ -static void -ListboxLostSelection(clientData) - ClientData clientData; /* Information about listbox widget. */ +static void +ListboxLostSelection ( + ClientData clientData /* Information about listbox widget. */ +) { register Listbox *listPtr = (Listbox *) clientData; @@ -1626,15 +1643,16 @@ ListboxLostSelection(clientData) */ /* ARGSUSED */ -static void -ListboxRedrawRange(listPtr, first, last) - register Listbox *listPtr; /* Information about widget. */ - int first; /* Index of first element in list +static void +ListboxRedrawRange ( + register Listbox *listPtr, /* Information about widget. */ + int first, /* Index of first element in list * that needs to be redrawn. */ - int last; /* Index of last element in list + int last /* Index of last element in list * that needs to be redrawn. May * be less than first; * these just bracket a range. */ +) { if ((listPtr->tkwin == NULL) || !Tk_IsMapped(listPtr->tkwin) || (listPtr->flags & REDRAW_PENDING)) { @@ -1664,9 +1682,10 @@ ListboxRedrawRange(listPtr, first, last) *---------------------------------------------------------------------- */ -static void -ListboxUpdateVScrollbar(listPtr) - register Listbox *listPtr; /* Information about widget. */ +static void +ListboxUpdateVScrollbar ( + register Listbox *listPtr /* Information about widget. */ +) { char string[60]; int result, last; @@ -1710,9 +1729,10 @@ ListboxUpdateVScrollbar(listPtr) *---------------------------------------------------------------------- */ -static void -ListboxUpdateHScrollbar(listPtr) - register Listbox *listPtr; /* Information about widget. */ +static void +ListboxUpdateHScrollbar ( + register Listbox *listPtr /* Information about widget. */ +) { char string[60]; int result, totalUnits, windowUnits, first, last; @@ -1757,13 +1777,14 @@ ListboxUpdateHScrollbar(listPtr) *---------------------------------------------------------------------- */ -static void -ListboxComputeWidths(listPtr, fontChanged) - Listbox *listPtr; /* Listbox whose geometry is to be +static void +ListboxComputeWidths ( + Listbox *listPtr, /* Listbox whose geometry is to be * recomputed. */ - int fontChanged; /* Non-zero means the font may have changed + int fontChanged /* Non-zero means the font may have changed * so per-element width information also * has to be computed. */ +) { register Element *elPtr; int dummy; diff --git a/src/tk/tkmenu.c b/src/tk/tkmenu.c index cf8eb87..5b1a5e0 100644 --- a/src/tk/tkmenu.c +++ b/src/tk/tkmenu.c @@ -380,13 +380,14 @@ static int PostSubmenu _ANSI_ARGS_((Tcl_Interp *interp, *-------------------------------------------------------------- */ -int -Tk_MenuCmd(clientData, interp, argc, argv) - ClientData clientData; /* Main window associated with +int +Tk_MenuCmd ( + ClientData clientData, /* Main window associated with * interpreter. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { Tk_Window tkwin = (Tk_Window) clientData; Tk_Window new; @@ -445,7 +446,7 @@ Tk_MenuCmd(clientData, interp, argc, argv) Tk_CreateEventHandler(menuPtr->tkwin, ExposureMask|StructureNotifyMask, MenuEventProc, (ClientData) menuPtr); Tcl_CreateCommand(interp, Tk_PathName(menuPtr->tkwin), MenuWidgetCmd, - (ClientData) menuPtr, (void (*)()) NULL); + (ClientData) menuPtr, (void (*)(int *)) NULL); if (ConfigureMenu(interp, menuPtr, argc-2, argv+2, 0) != TCL_OK) { goto error; } @@ -476,12 +477,13 @@ Tk_MenuCmd(clientData, interp, argc, argv) *-------------------------------------------------------------- */ -static int -MenuWidgetCmd(clientData, interp, argc, argv) - ClientData clientData; /* Information about menu widget. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +static int +MenuWidgetCmd ( + ClientData clientData, /* Information about menu widget. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { register Menu *menuPtr = (Menu *) clientData; register MenuEntry *mePtr; @@ -858,9 +860,10 @@ MenuWidgetCmd(clientData, interp, argc, argv) *---------------------------------------------------------------------- */ -static void -DestroyMenu(clientData) - ClientData clientData; /* Info about menu widget. */ +static void +DestroyMenu ( + ClientData clientData /* Info about menu widget. */ +) { register Menu *menuPtr = (Menu *) clientData; int i; @@ -931,9 +934,10 @@ DestroyMenu(clientData) *---------------------------------------------------------------------- */ -static void -DestroyMenuEntry(clientData) - ClientData clientData; /* Pointer to entry to be freed. */ +static void +DestroyMenuEntry ( + ClientData clientData /* Pointer to entry to be freed. */ +) { register MenuEntry *mePtr = (MenuEntry *) clientData; Menu *menuPtr = mePtr->menuPtr; @@ -1015,14 +1019,15 @@ DestroyMenuEntry(clientData) *---------------------------------------------------------------------- */ -static int -ConfigureMenu(interp, menuPtr, argc, argv, flags) - Tcl_Interp *interp; /* Used for error reporting. */ - register Menu *menuPtr; /* Information about widget; may or may +static int +ConfigureMenu ( + Tcl_Interp *interp, /* Used for error reporting. */ + register Menu *menuPtr, /* Information about widget; may or may * not already have values for some fields. */ - int argc; /* Number of valid entries in argv. */ - char **argv; /* Arguments. */ - int flags; /* Flags to pass to Tk_ConfigureWidget. */ + int argc, /* Number of valid entries in argv. */ + char **argv, /* Arguments. */ + int flags /* Flags to pass to Tk_ConfigureWidget. */ +) { XGCValues gcValues; GC newGC; @@ -1134,19 +1139,20 @@ ConfigureMenu(interp, menuPtr, argc, argv, flags) *---------------------------------------------------------------------- */ -static int -ConfigureMenuEntry(interp, menuPtr, mePtr, index, argc, argv, flags) - Tcl_Interp *interp; /* Used for error reporting. */ - Menu *menuPtr; /* Information about whole menu. */ - register MenuEntry *mePtr; /* Information about menu entry; may +static int +ConfigureMenuEntry ( + Tcl_Interp *interp, /* Used for error reporting. */ + Menu *menuPtr, /* Information about whole menu. */ + register MenuEntry *mePtr, /* Information about menu entry; may * or may not already have values for * some fields. */ - int index; /* Index of mePtr within menuPtr's + int index, /* Index of mePtr within menuPtr's * entries. */ - int argc; /* Number of valid entries in argv. */ - char **argv; /* Arguments. */ - int flags; /* Additional flags to pass to + int argc, /* Number of valid entries in argv. */ + char **argv, /* Arguments. */ + int flags /* Additional flags to pass to * Tk_ConfigureWidget. */ +) { XGCValues gcValues; GC newGC, newActiveGC, newDisabledGC; @@ -1336,9 +1342,10 @@ ConfigureMenuEntry(interp, menuPtr, mePtr, index, argc, argv, flags) *-------------------------------------------------------------- */ -static void -ComputeMenuGeometry(clientData) - ClientData clientData; /* Structure describing menu. */ +static void +ComputeMenuGeometry ( + ClientData clientData /* Structure describing menu. */ +) { Menu *menuPtr = (Menu *) clientData; register MenuEntry *mePtr; @@ -1493,9 +1500,10 @@ ComputeMenuGeometry(clientData) *---------------------------------------------------------------------- */ -static void -DisplayMenu(clientData) - ClientData clientData; /* Information about widget. */ +static void +DisplayMenu ( + ClientData clientData /* Information about widget. */ +) { register Menu *menuPtr = (Menu *) clientData; register MenuEntry *mePtr; @@ -1720,14 +1728,15 @@ DisplayMenu(clientData) *-------------------------------------------------------------- */ -static int -GetMenuIndex(interp, menuPtr, string, indexPtr) - Tcl_Interp *interp; /* For error messages. */ - Menu *menuPtr; /* Menu for which the index is being +static int +GetMenuIndex ( + Tcl_Interp *interp, /* For error messages. */ + Menu *menuPtr, /* Menu for which the index is being * specified. */ - char *string; /* Specification of an entry in menu. See + char *string, /* Specification of an entry in menu. See * manual entry for valid .*/ - int *indexPtr; /* Where to store converted relief. */ + int *indexPtr /* Where to store converted relief. */ +) { int i, y; @@ -1813,10 +1822,11 @@ GetMenuIndex(interp, menuPtr, string, indexPtr) *-------------------------------------------------------------- */ -static void -MenuEventProc(clientData, eventPtr) - ClientData clientData; /* Information about window. */ - XEvent *eventPtr; /* Information about event. */ +static void +MenuEventProc ( + ClientData clientData, /* Information about window. */ + XEvent *eventPtr /* Information about event. */ +) { Menu *menuPtr = (Menu *) clientData; if ((eventPtr->type == Expose) && (eventPtr->xexpose.count == 0)) { @@ -1864,12 +1874,13 @@ MenuEventProc(clientData, eventPtr) /* ARGSUSED */ static char * -MenuVarProc(clientData, interp, name1, name2, flags) - ClientData clientData; /* Information about menu entry. */ - Tcl_Interp *interp; /* Interpreter containing variable. */ - char *name1; /* First part of variable's name. */ - char *name2; /* Second part of variable's name. */ - int flags; /* Describes what just happened. */ +MenuVarProc ( + ClientData clientData, /* Information about menu entry. */ + Tcl_Interp *interp, /* Interpreter containing variable. */ + char *name1, /* First part of variable's name. */ + char *name2, /* Second part of variable's name. */ + int flags /* Describes what just happened. */ +) { MenuEntry *mePtr = (MenuEntry *) clientData; Menu *menuPtr; @@ -1931,11 +1942,12 @@ MenuVarProc(clientData, interp, name1, name2, flags) *---------------------------------------------------------------------- */ -static void -EventuallyRedrawMenu(menuPtr, index) - register Menu *menuPtr; /* Information about menu to redraw. */ - int index; /* Which entry to redraw. If -1, then +static void +EventuallyRedrawMenu ( + register Menu *menuPtr, /* Information about menu to redraw. */ + int index /* Which entry to redraw. If -1, then * all the entries in the menu are redrawn. */ +) { if (menuPtr->tkwin == NULL) { return; @@ -1975,14 +1987,15 @@ EventuallyRedrawMenu(menuPtr, index) *-------------------------------------------------------------- */ -static int -PostSubmenu(interp, menuPtr, mePtr) - Tcl_Interp *interp; /* Used for invoking sub-commands and +static int +PostSubmenu ( + Tcl_Interp *interp, /* Used for invoking sub-commands and * reporting errors. */ - register Menu *menuPtr; /* Information about menu as a whole. */ - register MenuEntry *mePtr; /* Info about submenu that is to be + register Menu *menuPtr, /* Information about menu as a whole. */ + register MenuEntry *mePtr /* Info about submenu that is to be * posted. NULL means make sure that * no submenu is posted. */ +) { char string[30]; int result, x, y; @@ -2035,11 +2048,12 @@ PostSubmenu(interp, menuPtr, mePtr) *---------------------------------------------------------------------- */ -static int -ActivateMenuEntry(menuPtr, index) - register Menu *menuPtr; /* Menu in which to activate. */ - int index; /* Index of entry to activate, or +static int +ActivateMenuEntry ( + register Menu *menuPtr, /* Menu in which to activate. */ + int index /* Index of entry to activate, or * -1 to deactivate all entries. */ +) { register MenuEntry *mePtr; int result = TCL_OK; diff --git a/src/tk/tkmnbut.c b/src/tk/tkmnbut.c index 82ef9b1..c6df0d0 100644 --- a/src/tk/tkmnbut.c +++ b/src/tk/tkmnbut.c @@ -250,13 +250,14 @@ static void DisplayMenuButton _ANSI_ARGS_((ClientData clientData)); *-------------------------------------------------------------- */ -int -Tk_MenubuttonCmd(clientData, interp, argc, argv) - ClientData clientData; /* Main window associated with +int +Tk_MenubuttonCmd ( + ClientData clientData, /* Main window associated with * interpreter. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { register MenuButton *mbPtr; Tk_Window tkwin = (Tk_Window) clientData; @@ -310,7 +311,7 @@ Tk_MenubuttonCmd(clientData, interp, argc, argv) Tk_CreateEventHandler(mbPtr->tkwin, ExposureMask|StructureNotifyMask, MenuButtonEventProc, (ClientData) mbPtr); Tcl_CreateCommand(interp, Tk_PathName(mbPtr->tkwin), MenuButtonWidgetCmd, - (ClientData) mbPtr, (void (*)()) NULL); + (ClientData) mbPtr, (void (*)(int *)) NULL); if (ConfigureMenuButton(interp, mbPtr, argc-2, argv+2, 0) != TCL_OK) { Tk_DestroyWindow(mbPtr->tkwin); return TCL_ERROR; @@ -338,12 +339,13 @@ Tk_MenubuttonCmd(clientData, interp, argc, argv) *-------------------------------------------------------------- */ -static int -MenuButtonWidgetCmd(clientData, interp, argc, argv) - ClientData clientData; /* Information about button widget. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +static int +MenuButtonWidgetCmd ( + ClientData clientData, /* Information about button widget. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { register MenuButton *mbPtr = (MenuButton *) clientData; int result = TCL_OK; @@ -469,9 +471,10 @@ MenuButtonWidgetCmd(clientData, interp, argc, argv) *---------------------------------------------------------------------- */ -static void -DestroyMenuButton(clientData) - ClientData clientData; /* Info about button widget. */ +static void +DestroyMenuButton ( + ClientData clientData /* Info about button widget. */ +) { register MenuButton *mbPtr = (MenuButton *) clientData; if (mbPtr->menuName != NULL) { @@ -555,14 +558,15 @@ DestroyMenuButton(clientData) *---------------------------------------------------------------------- */ -static int -ConfigureMenuButton(interp, mbPtr, argc, argv, flags) - Tcl_Interp *interp; /* Used for error reporting. */ - register MenuButton *mbPtr; /* Information about widget; may or may +static int +ConfigureMenuButton ( + Tcl_Interp *interp, /* Used for error reporting. */ + register MenuButton *mbPtr, /* Information about widget; may or may * not already have values for some fields. */ - int argc; /* Number of valid entries in argv. */ - char **argv; /* Arguments. */ - int flags; /* Flags to pass to Tk_ConfigureWidget. */ + int argc, /* Number of valid entries in argv. */ + char **argv, /* Arguments. */ + int flags /* Flags to pass to Tk_ConfigureWidget. */ +) { XGCValues gcValues; GC newGC; @@ -748,9 +752,10 @@ ConfigureMenuButton(interp, mbPtr, argc, argv, flags) *---------------------------------------------------------------------- */ -static void -DisplayMenuButton(clientData) - ClientData clientData; /* Information about widget. */ +static void +DisplayMenuButton ( + ClientData clientData /* Information about widget. */ +) { register MenuButton *mbPtr = (MenuButton *) clientData; GC gc; @@ -921,10 +926,11 @@ DisplayMenuButton(clientData) *-------------------------------------------------------------- */ -static void -MenuButtonEventProc(clientData, eventPtr) - ClientData clientData; /* Information about window. */ - XEvent *eventPtr; /* Information about event. */ +static void +MenuButtonEventProc ( + ClientData clientData, /* Information about window. */ + XEvent *eventPtr /* Information about event. */ +) { MenuButton *mbPtr = (MenuButton *) clientData; if ((eventPtr->type == Expose) && (eventPtr->xexpose.count == 0)) { @@ -969,9 +975,10 @@ MenuButtonEventProc(clientData, eventPtr) *---------------------------------------------------------------------- */ -static void -ComputeMenuButtonGeometry(mbPtr) - register MenuButton *mbPtr; /* Widget record for menu button. */ +static void +ComputeMenuButtonGeometry ( + register MenuButton *mbPtr /* Widget record for menu button. */ +) { XCharStruct bbox; int dummy; @@ -1033,12 +1040,13 @@ ComputeMenuButtonGeometry(mbPtr) /* ARGSUSED */ static char * -MenuButtonVarProc(clientData, interp, name1, name2, flags) - ClientData clientData; /* Information about button. */ - Tcl_Interp *interp; /* Interpreter containing variable. */ - char *name1; /* First part of variable's name. */ - char *name2; /* Second part of variable's name. */ - int flags; /* Describes what's happening to variable. */ +MenuButtonVarProc ( + ClientData clientData, /* Information about button. */ + Tcl_Interp *interp, /* Interpreter containing variable. */ + char *name1, /* First part of variable's name. */ + char *name2, /* Second part of variable's name. */ + int flags /* Describes what's happening to variable. */ +) { register MenuButton *mbPtr = (MenuButton *) clientData; char *value; @@ -1120,12 +1128,13 @@ MenuButtonVarProc(clientData, interp, name1, name2, flags) /* ARGSUSED */ static char * -MenuButtonTextVarProc(clientData, interp, name1, name2, flags) - ClientData clientData; /* Information about button. */ - Tcl_Interp *interp; /* Interpreter containing variable. */ - char *name1; /* Name of variable. */ - char *name2; /* Second part of variable name. */ - int flags; /* Information about what happened. */ +MenuButtonTextVarProc ( + ClientData clientData, /* Information about button. */ + Tcl_Interp *interp, /* Interpreter containing variable. */ + char *name1, /* Name of variable. */ + char *name2, /* Second part of variable name. */ + int flags /* Information about what happened. */ +) { register MenuButton *mbPtr = (MenuButton *) clientData; char *value; diff --git a/src/tk/tkmsg.c b/src/tk/tkmsg.c index 8e5adcc..b50442b 100644 --- a/src/tk/tkmsg.c +++ b/src/tk/tkmsg.c @@ -173,13 +173,14 @@ static void DisplayMessage _ANSI_ARGS_((ClientData clientData)); *-------------------------------------------------------------- */ -int -Tk_MessageCmd(clientData, interp, argc, argv) - ClientData clientData; /* Main window associated with +int +Tk_MessageCmd ( + ClientData clientData, /* Main window associated with * interpreter. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { register Message *msgPtr; Tk_Window new; @@ -219,7 +220,7 @@ Tk_MessageCmd(clientData, interp, argc, argv) Tk_CreateEventHandler(msgPtr->tkwin, ExposureMask|StructureNotifyMask, MessageEventProc, (ClientData) msgPtr); Tcl_CreateCommand(interp, Tk_PathName(msgPtr->tkwin), MessageWidgetCmd, - (ClientData) msgPtr, (void (*)()) NULL); + (ClientData) msgPtr, (void (*)(int *)) NULL); if (ConfigureMessage(interp, msgPtr, argc-2, argv+2, 0) != TCL_OK) { goto error; } @@ -250,12 +251,13 @@ Tk_MessageCmd(clientData, interp, argc, argv) *-------------------------------------------------------------- */ -static int -MessageWidgetCmd(clientData, interp, argc, argv) - ClientData clientData; /* Information about message widget. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +static int +MessageWidgetCmd ( + ClientData clientData, /* Information about message widget. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { register Message *msgPtr = (Message *) clientData; int length; @@ -304,9 +306,10 @@ MessageWidgetCmd(clientData, interp, argc, argv) *---------------------------------------------------------------------- */ -static void -DestroyMessage(clientData) - ClientData clientData; /* Info about message widget. */ +static void +DestroyMessage ( + ClientData clientData /* Info about message widget. */ +) { register Message *msgPtr = (Message *) clientData; @@ -358,14 +361,15 @@ DestroyMessage(clientData) *---------------------------------------------------------------------- */ -static int -ConfigureMessage(interp, msgPtr, argc, argv, flags) - Tcl_Interp *interp; /* Used for error reporting. */ - register Message *msgPtr; /* Information about widget; may or may +static int +ConfigureMessage ( + Tcl_Interp *interp, /* Used for error reporting. */ + register Message *msgPtr, /* Information about widget; may or may * not already have values for some fields. */ - int argc; /* Number of valid entries in argv. */ - char **argv; /* Arguments. */ - int flags; /* Flags to pass to Tk_ConfigureWidget. */ + int argc, /* Number of valid entries in argv. */ + char **argv, /* Arguments. */ + int flags /* Flags to pass to Tk_ConfigureWidget. */ +) { XGCValues gcValues; GC newGC; @@ -476,9 +480,10 @@ ConfigureMessage(interp, msgPtr, argc, argv, flags) *-------------------------------------------------------------- */ -static void -ComputeMessageGeometry(msgPtr) - register Message *msgPtr; /* Information about window. */ +static void +ComputeMessageGeometry ( + register Message *msgPtr /* Information about window. */ +) { char *p; int width, inc, height, numLines; @@ -582,9 +587,10 @@ ComputeMessageGeometry(msgPtr) *-------------------------------------------------------------- */ -static void -DisplayMessage(clientData) - ClientData clientData; /* Information about window. */ +static void +DisplayMessage ( + ClientData clientData /* Information about window. */ +) { register Message *msgPtr = (Message *) clientData; register Tk_Window tkwin = msgPtr->tkwin; @@ -698,10 +704,11 @@ DisplayMessage(clientData) *-------------------------------------------------------------- */ -static void -MessageEventProc(clientData, eventPtr) - ClientData clientData; /* Information about window. */ - XEvent *eventPtr; /* Information about event. */ +static void +MessageEventProc ( + ClientData clientData, /* Information about window. */ + XEvent *eventPtr /* Information about event. */ +) { Message *msgPtr = (Message *) clientData; @@ -740,12 +747,13 @@ MessageEventProc(clientData, eventPtr) /* ARGSUSED */ static char * -MessageTextVarProc(clientData, interp, name1, name2, flags) - ClientData clientData; /* Information about message. */ - Tcl_Interp *interp; /* Interpreter containing variable. */ - char *name1; /* Name of variable. */ - char *name2; /* Second part of variable name. */ - int flags; /* Information about what happened. */ +MessageTextVarProc ( + ClientData clientData, /* Information about message. */ + Tcl_Interp *interp, /* Interpreter containing variable. */ + char *name1, /* Name of variable. */ + char *name2, /* Second part of variable name. */ + int flags /* Information about what happened. */ +) { register Message *msgPtr = (Message *) clientData; char *value; diff --git a/src/tk/tkoption.c b/src/tk/tkoption.c index acdc655..ee8caaf 100644 --- a/src/tk/tkoption.c +++ b/src/tk/tkoption.c @@ -231,16 +231,17 @@ static void SetupStacks _ANSI_ARGS_((TkWindow *winPtr, int leaf)); *-------------------------------------------------------------- */ -void -Tk_AddOption(tkwin, name, value, priority) - Tk_Window tkwin; /* Window token; option will be associated +void +Tk_AddOption ( + Tk_Window tkwin, /* Window token; option will be associated * with main window for this window. */ - char *name; /* Multi-element name of option. */ - char *value; /* String value for option. */ - int priority; /* Overall priority level to use for + char *name, /* Multi-element name of option. */ + char *value, /* String value for option. */ + int priority /* Overall priority level to use for * this option, such as TK_USER_DEFAULT_PRIO * or TK_INTERACTIVE_PRIO. Must be between * 0 and TK_MAX_PRIO. */ +) { TkWindow *winPtr = ((TkWindow *) tkwin)->mainPtr->winPtr; register ElArray **arrayPtrPtr; @@ -387,14 +388,15 @@ Tk_AddOption(tkwin, name, value, priority) *-------------------------------------------------------------- */ -Tk_Uid -Tk_GetOption(tkwin, name, className) - Tk_Window tkwin; /* Token for window that option is +Tk_Uid +Tk_GetOption ( + Tk_Window tkwin, /* Token for window that option is * associated with. */ - char *name; /* Name of option. */ - char *className; /* Class of option. NULL means there + char *name, /* Name of option. */ + char *className /* Class of option. NULL means there * is no class for this option: just * check for name. */ +) { Tk_Uid nameId, classId; register Element *elPtr, *bestPtr; @@ -466,13 +468,14 @@ Tk_GetOption(tkwin, name, className) *-------------------------------------------------------------- */ -int -Tk_OptionCmd(clientData, interp, argc, argv) - ClientData clientData; /* Main window associated with +int +Tk_OptionCmd ( + ClientData clientData, /* Main window associated with * interpreter. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { Tk_Window tkwin = (Tk_Window) clientData; int length; @@ -580,9 +583,10 @@ Tk_OptionCmd(clientData, interp, argc, argv) *-------------------------------------------------------------- */ -void -TkOptionDeadWindow(winPtr) - register TkWindow *winPtr; /* Window to be cleaned up. */ +void +TkOptionDeadWindow ( + register TkWindow *winPtr /* Window to be cleaned up. */ +) { /* * If this window is in the option stacks, then clear the stacks. @@ -628,11 +632,12 @@ TkOptionDeadWindow(winPtr) *---------------------------------------------------------------------- */ -static int -ParsePriority(interp, string) - Tcl_Interp *interp; /* Interpreter to use for error reporting. */ - char *string; /* Describes a priority level, either +static int +ParsePriority ( + Tcl_Interp *interp, /* Interpreter to use for error reporting. */ + char *string /* Describes a priority level, either * symbolically or numerically. */ +) { char c; int length, priority; @@ -690,16 +695,17 @@ ParsePriority(interp, string) *---------------------------------------------------------------------- */ -static int -AddFromString(interp, tkwin, string, priority) - Tcl_Interp *interp; /* Interpreter to use for reporting results. */ - Tk_Window tkwin; /* Token for window: options are entered +static int +AddFromString ( + Tcl_Interp *interp, /* Interpreter to use for reporting results. */ + Tk_Window tkwin, /* Token for window: options are entered * for this window's main window. */ - char *string; /* String containing option specifiers. */ - int priority; /* Priority level to use for options in + char *string, /* String containing option specifiers. */ + int priority /* Priority level to use for options in * this string, such as TK_USER_DEFAULT_PRIO * or TK_INTERACTIVE_PRIO. Must be between * 0 and TK_MAX_PRIO. */ +) { register char *src, *dst; char *name, *value; @@ -833,16 +839,17 @@ AddFromString(interp, tkwin, string, priority) *---------------------------------------------------------------------- */ -static int -ReadOptionFile(interp, tkwin, fileName, priority) - Tcl_Interp *interp; /* Interpreter to use for reporting results. */ - Tk_Window tkwin; /* Token for window: options are entered +static int +ReadOptionFile ( + Tcl_Interp *interp, /* Interpreter to use for reporting results. */ + Tk_Window tkwin, /* Token for window: options are entered * for this window's main window. */ - char *fileName; /* Name of file containing options. */ - int priority; /* Priority level to use for options in + char *fileName, /* Name of file containing options. */ + int priority /* Priority level to use for options in * this file, such as TK_USER_DEFAULT_PRIO * or TK_INTERACTIVE_PRIO. Must be between * 0 and TK_MAX_PRIO. */ +) { char *realName, *buffer; int fileId, result; @@ -905,8 +912,9 @@ ReadOptionFile(interp, tkwin, fileName, priority) */ static ElArray * -NewArray(numEls) - int numEls; /* How many elements of space to allocate. */ +NewArray( + int numEls /* How many elements of space to allocate. */ +) { register ElArray *arrayPtr; @@ -936,9 +944,10 @@ NewArray(numEls) */ static ElArray * -ExtendArray(arrayPtr, elPtr) - register ElArray *arrayPtr; /* Array to be extended. */ - register Element *elPtr; /* Element to be copied into array. */ +ExtendArray( + register ElArray *arrayPtr, /* Array to be extended. */ + register Element *elPtr /* Element to be copied into array. */ +) { /* * If the current array has filled up, make it bigger. @@ -982,12 +991,13 @@ ExtendArray(arrayPtr, elPtr) */ static void -SetupStacks(winPtr, leaf) - TkWindow *winPtr; /* Window for which information is to +SetupStacks( + TkWindow *winPtr, /* Window for which information is to * be cached. */ - int leaf; /* Non-zero means this is the leaf + int leaf /* Non-zero means this is the leaf * window being probed. Zero means this * is an ancestor of the desired leaf. */ +) { int level, i, *iPtr; register StackLevel *levelPtr; @@ -1155,10 +1165,11 @@ SetupStacks(winPtr, leaf) */ static void -ExtendStacks(arrayPtr, leaf) - ElArray *arrayPtr; /* Array of elements to copy onto stacks. */ - int leaf; /* If zero, then don't copy exact leaf +ExtendStacks( + ElArray *arrayPtr, /* Array of elements to copy onto stacks. */ + int leaf /* If zero, then don't copy exact leaf * elements. */ +) { register int count; register Element *elPtr; @@ -1189,10 +1200,11 @@ ExtendStacks(arrayPtr, leaf) */ static void -OptionInit(mainPtr) - register TkMainInfo *mainPtr; /* Top-level information about +OptionInit( + register TkMainInfo *mainPtr /* Top-level information about * window that isn't initialized * yet. */ +) { int i; Tcl_Interp *interp; @@ -1247,9 +1259,10 @@ OptionInit(mainPtr) */ static void -ClearOptionTree(arrayPtr) - ElArray *arrayPtr; /* Array of options; delete everything +ClearOptionTree( + ElArray *arrayPtr /* Array of options; delete everything * referred to recursively by this. */ +) { register Element *elPtr; int count; @@ -1284,10 +1297,11 @@ ClearOptionTree(arrayPtr) */ static int -GetDefaultOptions(interp, winPtr) - Tcl_Interp *interp; /* Interpreter to use for error reporting. */ - TkWindow *winPtr; /* Fetch option defaults for main window +GetDefaultOptions( + Tcl_Interp *interp, /* Interpreter to use for error reporting. */ + TkWindow *winPtr /* Fetch option defaults for main window * associated with this. */ +) { char *regProp, *home, *fileName; int result, actualFormat; diff --git a/src/tk/tkpack.c b/src/tk/tkpack.c index a998017..9bb7807 100644 --- a/src/tk/tkpack.c +++ b/src/tk/tkpack.c @@ -129,13 +129,14 @@ static void Unlink _ANSI_ARGS_((Packer *packPtr)); *-------------------------------------------------------------- */ -int -Tk_PackCmd(clientData, interp, argc, argv) - ClientData clientData; /* Main window associated with +int +Tk_PackCmd ( + ClientData clientData, /* Main window associated with * interpreter. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { Tk_Window tkwin = (Tk_Window) clientData; int length; @@ -305,13 +306,14 @@ Tk_PackCmd(clientData, interp, argc, argv) */ /* ARGSUSED */ -static void -PackReqProc(clientData, tkwin) - ClientData clientData; /* Packer's information about +static void +PackReqProc ( + ClientData clientData, /* Packer's information about * window that got new preferred * geometry. */ - Tk_Window tkwin; /* Other Tk-related information + Tk_Window tkwin /* Other Tk-related information * about the window. */ +) { register Packer *packPtr = (Packer *) clientData; @@ -343,11 +345,12 @@ PackReqProc(clientData, tkwin) *-------------------------------------------------------------- */ -static void -ArrangePacking(clientData) - ClientData clientData; /* Structure describing parent +static void +ArrangePacking ( + ClientData clientData /* Structure describing parent * whose children are to be * re-layed out. */ +) { register Packer *parentPtr = (Packer *) clientData; register Packer *childPtr; @@ -671,9 +674,10 @@ ArrangePacking(clientData) */ static Packer * -GetPacker(tkwin) - Tk_Window tkwin; /* Token for window for which +GetPacker ( + Tk_Window tkwin /* Token for window for which * packer structure is desired. */ +) { register Packer *packPtr; Tcl_HashEntry *hPtr; @@ -728,17 +732,18 @@ GetPacker(tkwin) *-------------------------------------------------------------- */ -static int -PackAfter(interp, prevPtr, parentPtr, argc, argv) - Tcl_Interp *interp; /* Interpreter for error reporting. */ - Packer *prevPtr; /* Pack windows in argv just after this +static int +PackAfter ( + Tcl_Interp *interp, /* Interpreter for error reporting. */ + Packer *prevPtr, /* Pack windows in argv just after this * window; NULL means pack as first * child of parentPtr. */ - Packer *parentPtr; /* Parent in which to pack windows. */ - int argc; /* Number of elements in argv. */ - char **argv; /* Array of lists, each containing 2 + Packer *parentPtr, /* Parent in which to pack windows. */ + int argc, /* Number of elements in argv. */ + char **argv /* Array of lists, each containing 2 * elements: window name and side * against which to pack. */ +) { register Packer *packPtr; Tk_Window tkwin; @@ -930,9 +935,10 @@ PackAfter(interp, prevPtr, parentPtr, argc, argv) *---------------------------------------------------------------------- */ -static void -Unlink(packPtr) - register Packer *packPtr; /* Window to unlink. */ +static void +Unlink ( + register Packer *packPtr /* Window to unlink. */ +) { register Packer *parentPtr, *packPtr2; @@ -982,10 +988,11 @@ Unlink(packPtr) *---------------------------------------------------------------------- */ -static void -DestroyPacker(clientData) - ClientData clientData; /* Info about packed window that +static void +DestroyPacker ( + ClientData clientData /* Info about packed window that * is now dead. */ +) { register Packer *packPtr = (Packer *) clientData; ckfree((char *) packPtr); @@ -1010,11 +1017,12 @@ DestroyPacker(clientData) *---------------------------------------------------------------------- */ -static void -PackStructureProc(clientData, eventPtr) - ClientData clientData; /* Our information about window +static void +PackStructureProc ( + ClientData clientData, /* Our information about window * referred to by eventPtr. */ - XEvent *eventPtr; /* Describes what just happened. */ + XEvent *eventPtr /* Describes what just happened. */ +) { register Packer *packPtr = (Packer *) clientData; if (eventPtr->type == ConfigureNotify) { diff --git a/src/tk/tkpixmap.c b/src/tk/tkpixmap.c index 8d23dad..313a04a 100644 --- a/src/tk/tkpixmap.c +++ b/src/tk/tkpixmap.c @@ -145,12 +145,13 @@ static void PixmapInit _ANSI_ARGS_((Tk_Window tkwin)); * *---------------------------------------------------------------------- */ -Pixmap -Tk_GetPixmap(interp, tkwin, string) - Tcl_Interp *interp; /* Interpreter to use for error reporting. */ - Tk_Window tkwin; /* Window in which pixmap will be used. */ - Tk_Uid string; /* Description of pixmap. See manual entry +Pixmap +Tk_GetPixmap ( + Tcl_Interp *interp, /* Interpreter to use for error reporting. */ + Tk_Window tkwin, /* Window in which pixmap will be used. */ + Tk_Uid string /* Description of pixmap. See manual entry * for details on legal syntax. */ +) { NameKey key; Tcl_HashEntry *nameHashPtr, *idHashPtr, *predefHashPtr; @@ -310,17 +311,18 @@ Tk_GetPixmap(interp, tkwin, string) *---------------------------------------------------------------------- */ -int -Tk_DefinePixmap(interp, name, tkwin, pixmap, source, width, height) - Tcl_Interp *interp; /* Interpreter to use for error reporting. */ - Tk_Uid name; /* Name to use for bitmap. Must not already +int +Tk_DefinePixmap ( + Tcl_Interp *interp, /* Interpreter to use for error reporting. */ + Tk_Uid name, /* Name to use for bitmap. Must not already * be defined as a bitmap. */ - Tk_Window tkwin; /* any window on screen where pixmap lives */ - Pixmap pixmap; /* pixmap to associate with name, + Tk_Window tkwin, /* any window on screen where pixmap lives */ + Pixmap pixmap, /* pixmap to associate with name, * or None to create a new pixmap */ - char *source; /* Address of bits for bitmap. */ - unsigned int width; /* Width of bitmap. */ - unsigned int height; /* Height of bitmap. */ + char *source, /* Address of bits for bitmap. */ + unsigned int width, /* Width of bitmap. */ + unsigned int height /* Height of bitmap. */ +) { int new; Tcl_HashEntry *predefHashPtr; @@ -365,9 +367,10 @@ Tk_DefinePixmap(interp, name, tkwin, pixmap, source, width, height) *-------------------------------------------------------------- */ -Tk_Uid -Tk_NameOfPixmap(bitmap) - Pixmap bitmap; /* Bitmap whose name is wanted. */ +Tk_Uid +Tk_NameOfPixmap ( + Pixmap bitmap /* Bitmap whose name is wanted. */ +) { Tcl_HashEntry *idHashPtr; TkBitmap *bitmapPtr; @@ -408,11 +411,12 @@ Tk_NameOfPixmap(bitmap) *-------------------------------------------------------------- */ -void -Tk_SizeOfPixmap(bitmap, widthPtr, heightPtr) - Pixmap bitmap; /* Bitmap whose size is wanted. */ - unsigned int *widthPtr; /* Store bitmap width here. */ - unsigned int *heightPtr; /* Store bitmap height here. */ +void +Tk_SizeOfPixmap ( + Pixmap bitmap, /* Bitmap whose size is wanted. */ + unsigned int *widthPtr, /* Store bitmap width here. */ + unsigned int *heightPtr /* Store bitmap height here. */ +) { Tcl_HashEntry *idHashPtr; TkBitmap *bitmapPtr; @@ -449,9 +453,10 @@ Tk_SizeOfPixmap(bitmap, widthPtr, heightPtr) *---------------------------------------------------------------------- */ -void -Tk_FreePixmap(bitmap) - Pixmap bitmap; /* Bitmap to be released. */ +void +Tk_FreePixmap ( + Pixmap bitmap /* Bitmap to be released. */ +) { Tcl_HashEntry *idHashPtr; register TkBitmap *bitmapPtr; @@ -504,12 +509,14 @@ Tk_FreePixmap(bitmap) */ /* ARGSUSED */ -Pixmap -Tk_GetPixmapFromData(interp, tkwin, source, width, height) - Tcl_Interp *interp; /* Interpreter to use for error reporting. */ - Tk_Window tkwin; /* Window in which bitmap will be used. */ - char *source; /* Bitmap data for bitmap shape. */ - unsigned int width, height; /* Dimensions of bitmap. */ +Pixmap +Tk_GetPixmapFromData ( + Tcl_Interp *interp, /* Interpreter to use for error reporting. */ + Tk_Window tkwin, /* Window in which bitmap will be used. */ + char *source, /* Bitmap data for bitmap shape. */ + unsigned int width, + unsigned int height /* Dimensions of bitmap. */ +) { DataKey key; Tcl_HashEntry *dataHashPtr; @@ -559,9 +566,10 @@ Tk_GetPixmapFromData(interp, tkwin, source, width, height) *---------------------------------------------------------------------- */ -static void -PixmapInit(tkwin) - Tk_Window tkwin; /* any window on screen where pixmap lives */ +static void +PixmapInit ( + Tk_Window tkwin /* any window on screen where pixmap lives */ +) { Tcl_Interp *dummy; @@ -601,11 +609,12 @@ PixmapInit(tkwin) *---------------------------------------------------------------------- */ -int -Tk_UndefinePixmap(interp, name, tkwin) - Tcl_Interp *interp; /* Interpreter to use for error reporting. */ - Tk_Uid name; /* Name of bitmap/pixmap to undefine */ - Tk_Window tkwin; /* any window on screen where pixmap lives */ +int +Tk_UndefinePixmap ( + Tcl_Interp *interp, /* Interpreter to use for error reporting. */ + Tk_Uid name, /* Name of bitmap/pixmap to undefine */ + Tk_Window tkwin /* any window on screen where pixmap lives */ +) { NameKey key; Tcl_HashEntry *predefHashPtr, *nameHashPtr; diff --git a/src/tk/tkplace.c b/src/tk/tkplace.c index 64f4424..a82d854 100644 --- a/src/tk/tkplace.c +++ b/src/tk/tkplace.c @@ -156,12 +156,13 @@ static void UnlinkSlave _ANSI_ARGS_((Slave *slavePtr)); *-------------------------------------------------------------- */ -int -Tk_PlaceCmd(clientData, interp, argc, argv) - ClientData clientData; /* Main window associated with interpreter. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +int +Tk_PlaceCmd ( + ClientData clientData, /* Main window associated with interpreter. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { Tk_Window tkwin; Slave *slavePtr; @@ -330,8 +331,9 @@ Tk_PlaceCmd(clientData, interp, argc, argv) */ static Slave * -FindSlave(tkwin) - Tk_Window tkwin; /* Token for desired slave. */ +FindSlave ( + Tk_Window tkwin /* Token for desired slave. */ +) { Tcl_HashEntry *hPtr; register Slave *slavePtr; @@ -377,9 +379,10 @@ FindSlave(tkwin) *---------------------------------------------------------------------- */ -static void -UnlinkSlave(slavePtr) - Slave *slavePtr; /* Slave structure to be unlinked. */ +static void +UnlinkSlave ( + Slave *slavePtr /* Slave structure to be unlinked. */ +) { register Master *masterPtr; register Slave *prevPtr; @@ -423,8 +426,9 @@ UnlinkSlave(slavePtr) */ static Master * -FindMaster(tkwin) - Tk_Window tkwin; /* Token for desired master. */ +FindMaster ( + Tk_Window tkwin /* Token for desired master. */ +) { Tcl_HashEntry *hPtr; register Master *masterPtr; @@ -464,13 +468,14 @@ FindMaster(tkwin) *---------------------------------------------------------------------- */ -static int -ConfigureSlave(interp, slavePtr, argc, argv) - Tcl_Interp *interp; /* Used for error reporting. */ - Slave *slavePtr; /* Pointer to current information +static int +ConfigureSlave ( + Tcl_Interp *interp, /* Used for error reporting. */ + Slave *slavePtr, /* Pointer to current information * about slave. */ - int argc; /* Number of config arguments. */ - char **argv; /* String values for arguments. */ + int argc, /* Number of config arguments. */ + char **argv /* String values for arguments. */ +) { register Master *masterPtr; int c, length, result; @@ -661,9 +666,10 @@ ConfigureSlave(interp, slavePtr, argc, argv) *---------------------------------------------------------------------- */ -static void -RecomputePlacement(clientData) - ClientData clientData; /* Pointer to Master record. */ +static void +RecomputePlacement ( + ClientData clientData /* Pointer to Master record. */ +) { register Master *masterPtr = (Master *) clientData; register Slave *slavePtr; @@ -831,11 +837,12 @@ RecomputePlacement(clientData) *---------------------------------------------------------------------- */ -static void -MasterStructureProc(clientData, eventPtr) - ClientData clientData; /* Pointer to Master structure for window +static void +MasterStructureProc ( + ClientData clientData, /* Pointer to Master structure for window * referred to by eventPtr. */ - XEvent *eventPtr; /* Describes what just happened. */ + XEvent *eventPtr /* Describes what just happened. */ +) { register Master *masterPtr = (Master *) clientData; register Slave *slavePtr, *nextPtr; @@ -880,11 +887,12 @@ MasterStructureProc(clientData, eventPtr) *---------------------------------------------------------------------- */ -static void -SlaveStructureProc(clientData, eventPtr) - ClientData clientData; /* Pointer to Slave structure for window +static void +SlaveStructureProc ( + ClientData clientData, /* Pointer to Slave structure for window * referred to by eventPtr. */ - XEvent *eventPtr; /* Describes what just happened. */ + XEvent *eventPtr /* Describes what just happened. */ +) { register Slave *slavePtr = (Slave *) clientData; @@ -915,11 +923,12 @@ SlaveStructureProc(clientData, eventPtr) */ /* ARGSUSED */ -static void -PlaceRequestProc(clientData, tkwin) - ClientData clientData; /* Pointer to our record for slave. */ - Tk_Window tkwin; /* Window that changed its desired +static void +PlaceRequestProc ( + ClientData clientData, /* Pointer to our record for slave. */ + Tk_Window tkwin /* Window that changed its desired * size. */ +) { Slave *slavePtr = (Slave *) clientData; Master *masterPtr; diff --git a/src/tk/tkpresrv.c b/src/tk/tkpresrv.c index a7e0c05..8cee711 100644 --- a/src/tk/tkpresrv.c +++ b/src/tk/tkpresrv.c @@ -67,8 +67,9 @@ static int inUse = 0; /* Count of structures currently in use */ void -Tk_Preserve(clientData) - ClientData clientData; /* Pointer to malloc'ed block of memory. */ +Tk_Preserve( + ClientData clientData /* Pointer to malloc'ed block of memory. */ +) { register Reference *refPtr; int i; @@ -139,8 +140,9 @@ Tk_Preserve(clientData) */ void -Tk_Release(clientData) - ClientData clientData; /* Pointer to malloc'ed block of memory. */ +Tk_Release( + ClientData clientData /* Pointer to malloc'ed block of memory. */ +) { register Reference *refPtr; int i; @@ -200,9 +202,10 @@ Tk_Release(clientData) */ void -Tk_EventuallyFree(clientData, freeProc) - ClientData clientData; /* Pointer to malloc'ed block of memory. */ - Tk_FreeProc *freeProc; /* Procedure to actually do free. */ +Tk_EventuallyFree( + ClientData clientData, /* Pointer to malloc'ed block of memory. */ + Tk_FreeProc *freeProc /* Procedure to actually do free. */ +) { register Reference *refPtr; int i; diff --git a/src/tk/tkrawtcp.c b/src/tk/tkrawtcp.c index 6caea99..20b538b 100644 --- a/src/tk/tkrawtcp.c +++ b/src/tk/tkrawtcp.c @@ -73,11 +73,8 @@ typedef struct { */ /* ARGSUSED */ -void -Tcp_MakeOpenFile(interp,fd,r,w) - Tcl_Interp *interp; - int fd; - int r,w; +void +Tcp_MakeOpenFile (Tcl_Interp *interp, int fd, int r, int w) {/* Create an OpenFile structure using f and install it in the interpreter with * Readable and Writable set to r and w */ @@ -134,14 +131,9 @@ Tcp_MakeOpenFile(interp,fd,r,w) */ /* ARGSUSED */ -int -Tcp_ConnectCmd(notUsed, interp, argc, argv) - ClientData notUsed; - Tcl_Interp *interp; - int argc; - char **argv; +int +Tcp_ConnectCmd (ClientData notUsed, Tcl_Interp *interp, int argc, char **argv) { - Interp *iPtr = (Interp *) interp; char *host,*port; int fd; int server=0; @@ -206,7 +198,7 @@ Tcp_ConnectCmd(notUsed, interp, argc, argv) Tcl_SetVar2(interp,"connect_info",interp->result,buf,TCL_GLOBAL_ONLY); } - Tcp_MakeOpenFile(iPtr,fd,1,1-server); + Tcp_MakeOpenFile(interp,fd,1,1-server); return TCL_OK; } @@ -227,12 +219,8 @@ Tcp_ConnectCmd(notUsed, interp, argc, argv) */ /* ARGSUSED */ -int -Tcp_ShutdownCmd(notUsed, interp, argc, argv) - ClientData notUsed; - Tcl_Interp *interp; - int argc; - char **argv; +int +Tcp_ShutdownCmd (ClientData notUsed, Tcl_Interp *interp, int argc, char **argv) { Interp *iPtr = (Interp *) interp; OpenFile *filePtr; @@ -311,14 +299,9 @@ Tcp_ShutdownCmd(notUsed, interp, argc, argv) */ /* ARGSUSED */ -int -Tcp_AcceptCmd(notUsed, interp, argc, argv) - ClientData notUsed; - Tcl_Interp *interp; - int argc; - char **argv; +int +Tcp_AcceptCmd (ClientData notUsed, Tcl_Interp *interp, int argc, char **argv) { - Interp *iPtr = (Interp *) interp; struct sockaddr_in sockaddr; int len = sizeof sockaddr; OpenFile *filePtr; @@ -364,7 +347,7 @@ Tcp_AcceptCmd(notUsed, interp, argc, argv) /* * Create the FILE* */ - Tcp_MakeOpenFile(iPtr,fd,1,1); + Tcp_MakeOpenFile(interp,fd,1,1); sprintf(interp->result, "file%d", fd); return TCL_OK; @@ -385,10 +368,11 @@ Tcp_AcceptCmd(notUsed, interp, argc, argv) *---------------------------------------------------------------- */ -static int -unix_connect(path,server) - char *path; /* Path name to create or use */ - int server; /* 1->make server, 0->connect to server */ +static int +unix_connect ( + char *path, /* Path name to create or use */ + int server /* 1->make server, 0->connect to server */ +) { struct sockaddr_un sockaddr; int sock, status; @@ -436,11 +420,12 @@ unix_connect(path,server) *---------------------------------------------------------------- */ -static int -inet_connect(host, service,server) - char *host; /* Host to connect, name or IP address */ - char *service; /* Port to use, service name or port number */ - int server; +static int +inet_connect ( + char *host, /* Host to connect, name or IP address */ + char *service, /* Port to use, service name or port number */ + int server +) { struct hostent *hostent, _hostent; struct servent *servent, _servent; @@ -538,12 +523,8 @@ inet_connect(host, service,server) */ /* ARGSUSED */ -int -Tcp_FileHandlerCmd(notUsed, interp, argc, argv) - ClientData notUsed; - Tcl_Interp *interp; - int argc; - char **argv; +int +Tcp_FileHandlerCmd (ClientData notUsed, Tcl_Interp *interp, int argc, char **argv) { FileCmd *cmdPtr; OpenFile *filePtr; @@ -629,10 +610,8 @@ Tcp_FileHandlerCmd(notUsed, interp, argc, argv) *---------------------------------------------------------------- */ -static void -HandleSocket(clientData, mask) - ClientData clientData; - int mask; +static void +HandleSocket (ClientData clientData, int mask) { int result; FileCmd *cmdPtr = (FileCmd *) clientData; diff --git a/src/tk/tkrectov.c b/src/tk/tkrectov.c index 2e0c738..156e4e1 100644 --- a/src/tk/tkrectov.c +++ b/src/tk/tkrectov.c @@ -163,13 +163,14 @@ Tk_ItemType TkOvalType = { *-------------------------------------------------------------- */ -static int -CreateRectOval(canvasPtr, itemPtr, argc, argv) - register Tk_Canvas *canvasPtr; /* Canvas to hold new item. */ - Tk_Item *itemPtr; /* Record to hold new item; header +static int +CreateRectOval ( + register Tk_Canvas *canvasPtr, /* Canvas to hold new item. */ + Tk_Item *itemPtr, /* Record to hold new item; header * has been initialized by caller. */ - int argc; /* Number of arguments in argv. */ - char **argv; /* Arguments describing rectangle. */ + int argc, /* Number of arguments in argv. */ + char **argv /* Arguments describing rectangle. */ +) { register RectOvalItem *rectOvalPtr = (RectOvalItem *) itemPtr; @@ -232,15 +233,16 @@ CreateRectOval(canvasPtr, itemPtr, argc, argv) *-------------------------------------------------------------- */ -static int -RectOvalCoords(canvasPtr, itemPtr, argc, argv) - register Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item whose coordinates are to be +static int +RectOvalCoords ( + register Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item whose coordinates are to be * read or modified. */ - int argc; /* Number of coordinates supplied in + int argc, /* Number of coordinates supplied in * argv. */ - char **argv; /* Array of coordinates: x1, y1, + char **argv /* Array of coordinates: x1, y1, * x2, y2, ... */ +) { register RectOvalItem *rectOvalPtr = (RectOvalItem *) itemPtr; char buffer[500]; @@ -291,13 +293,14 @@ RectOvalCoords(canvasPtr, itemPtr, argc, argv) *-------------------------------------------------------------- */ -static int -ConfigureRectOval(canvasPtr, itemPtr, argc, argv, flags) - Tk_Canvas *canvasPtr; /* Canvas containing itemPtr. */ - Tk_Item *itemPtr; /* Rectangle item to reconfigure. */ - int argc; /* Number of elements in argv. */ - char **argv; /* Arguments describing things to configure. */ - int flags; /* Flags to pass to Tk_ConfigureWidget. */ +static int +ConfigureRectOval ( + Tk_Canvas *canvasPtr, /* Canvas containing itemPtr. */ + Tk_Item *itemPtr, /* Rectangle item to reconfigure. */ + int argc, /* Number of elements in argv. */ + char **argv, /* Arguments describing things to configure. */ + int flags /* Flags to pass to Tk_ConfigureWidget. */ +) { register RectOvalItem *rectOvalPtr = (RectOvalItem *) itemPtr; XGCValues gcValues; @@ -370,9 +373,10 @@ ConfigureRectOval(canvasPtr, itemPtr, argc, argv, flags) *-------------------------------------------------------------- */ -static void -DeleteRectOval(itemPtr) - Tk_Item *itemPtr; /* Item that is being deleted. */ +static void +DeleteRectOval ( + Tk_Item *itemPtr /* Item that is being deleted. */ +) { register RectOvalItem *rectOvalPtr = (RectOvalItem *) itemPtr; @@ -413,11 +417,12 @@ DeleteRectOval(itemPtr) */ /* ARGSUSED */ -static void -ComputeRectOvalBbox(canvasPtr, rectOvalPtr) - Tk_Canvas *canvasPtr; /* Canvas that contains item. */ - register RectOvalItem *rectOvalPtr; /* Item whose bbox is to be +static void +ComputeRectOvalBbox ( + Tk_Canvas *canvasPtr, /* Canvas that contains item. */ + register RectOvalItem *rectOvalPtr /* Item whose bbox is to be * recomputed. */ +) { int bloat; @@ -463,12 +468,13 @@ ComputeRectOvalBbox(canvasPtr, rectOvalPtr) *-------------------------------------------------------------- */ -static void -DisplayRectOval(canvasPtr, itemPtr, drawable) - register Tk_Canvas *canvasPtr; /* Canvas that contains item. */ - Tk_Item *itemPtr; /* Item to be displayed. */ - Drawable drawable; /* Pixmap or window in which to draw +static void +DisplayRectOval ( + register Tk_Canvas *canvasPtr, /* Canvas that contains item. */ + Tk_Item *itemPtr, /* Item to be displayed. */ + Drawable drawable /* Pixmap or window in which to draw * item. */ +) { register RectOvalItem *rectOvalPtr = (RectOvalItem *) itemPtr; Display *display = Tk_Display(canvasPtr->tkwin); @@ -539,11 +545,12 @@ DisplayRectOval(canvasPtr, itemPtr, drawable) */ /* ARGSUSED */ -static double -RectToPoint(canvasPtr, itemPtr, pointPtr) - Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item to check against point. */ - double *pointPtr; /* Pointer to x and y coordinates. */ +static double +RectToPoint ( + Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item to check against point. */ + double *pointPtr /* Pointer to x and y coordinates. */ +) { register RectOvalItem *rectPtr = (RectOvalItem *) itemPtr; double xDiff, yDiff, x1, y1, x2, y2, inc, tmp; @@ -644,11 +651,12 @@ RectToPoint(canvasPtr, itemPtr, pointPtr) */ /* ARGSUSED */ -static double -OvalToPoint(canvasPtr, itemPtr, pointPtr) - Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item to check against point. */ - double *pointPtr; /* Pointer to x and y coordinates. */ +static double +OvalToPoint ( + Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item to check against point. */ + double *pointPtr /* Pointer to x and y coordinates. */ +) { register RectOvalItem *ovalPtr = (RectOvalItem *) itemPtr; double width; @@ -684,13 +692,14 @@ OvalToPoint(canvasPtr, itemPtr, pointPtr) */ /* ARGSUSED */ -static int -RectToArea(canvasPtr, itemPtr, areaPtr) - Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item to check against rectangle. */ - double *areaPtr; /* Pointer to array of four coordinates +static int +RectToArea ( + Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item to check against rectangle. */ + double *areaPtr /* Pointer to array of four coordinates * (x1, y1, x2, y2) describing rectangular * area. */ +) { register RectOvalItem *rectPtr = (RectOvalItem *) itemPtr; double halfWidth; @@ -743,13 +752,14 @@ RectToArea(canvasPtr, itemPtr, areaPtr) */ /* ARGSUSED */ -static int -OvalToArea(canvasPtr, itemPtr, areaPtr) - Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item to check against oval. */ - double *areaPtr; /* Pointer to array of four coordinates +static int +OvalToArea ( + Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item to check against oval. */ + double *areaPtr /* Pointer to array of four coordinates * (x1, y1, x2, y2) describing rectangular * area. */ +) { register RectOvalItem *ovalPtr = (RectOvalItem *) itemPtr; double oval[4], halfWidth; @@ -825,13 +835,15 @@ OvalToArea(canvasPtr, itemPtr, areaPtr) *-------------------------------------------------------------- */ -static void -ScaleRectOval(canvasPtr, itemPtr, originX, originY, scaleX, scaleY) - Tk_Canvas *canvasPtr; /* Canvas containing rectangle. */ - Tk_Item *itemPtr; /* Rectangle to be scaled. */ - double originX, originY; /* Origin about which to scale rect. */ - double scaleX; /* Amount to scale in X direction. */ - double scaleY; /* Amount to scale in Y direction. */ +static void +ScaleRectOval ( + Tk_Canvas *canvasPtr, /* Canvas containing rectangle. */ + Tk_Item *itemPtr, /* Rectangle to be scaled. */ + double originX, + double originY, /* Origin about which to scale rect. */ + double scaleX, /* Amount to scale in X direction. */ + double scaleY /* Amount to scale in Y direction. */ +) { register RectOvalItem *rectOvalPtr = (RectOvalItem *) itemPtr; @@ -861,12 +873,14 @@ ScaleRectOval(canvasPtr, itemPtr, originX, originY, scaleX, scaleY) *-------------------------------------------------------------- */ -static void -TranslateRectOval(canvasPtr, itemPtr, deltaX, deltaY) - Tk_Canvas *canvasPtr; /* Canvas containing item. */ - Tk_Item *itemPtr; /* Item that is being moved. */ - double deltaX, deltaY; /* Amount by which item is to be +static void +TranslateRectOval ( + Tk_Canvas *canvasPtr, /* Canvas containing item. */ + Tk_Item *itemPtr, /* Item that is being moved. */ + double deltaX, + double deltaY /* Amount by which item is to be * moved. */ +) { register RectOvalItem *rectOvalPtr = (RectOvalItem *) itemPtr; diff --git a/src/tk/tkscale.c b/src/tk/tkscale.c index 7ea2b22..aab80ba 100644 --- a/src/tk/tkscale.c +++ b/src/tk/tkscale.c @@ -247,13 +247,14 @@ static int ValueToPixel _ANSI_ARGS_((Scale *scalePtr, int value)); *-------------------------------------------------------------- */ -int -Tk_ScaleCmd(clientData, interp, argc, argv) - ClientData clientData; /* Main window associated with +int +Tk_ScaleCmd ( + ClientData clientData, /* Main window associated with * interpreter. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { Tk_Window tkwin = (Tk_Window) clientData; register Scale *scalePtr; @@ -299,7 +300,7 @@ Tk_ScaleCmd(clientData, interp, argc, argv) |PointerMotionMask|ButtonPressMask|ButtonReleaseMask, ScaleMouseProc, (ClientData) scalePtr); Tcl_CreateCommand(interp, Tk_PathName(scalePtr->tkwin), ScaleWidgetCmd, - (ClientData) scalePtr, (void (*)()) NULL); + (ClientData) scalePtr, (void (*)(int *)) NULL); if (ConfigureScale(interp, scalePtr, argc-2, argv+2, 0) != TCL_OK) { goto error; } @@ -330,13 +331,14 @@ Tk_ScaleCmd(clientData, interp, argc, argv) *-------------------------------------------------------------- */ -static int -ScaleWidgetCmd(clientData, interp, argc, argv) - ClientData clientData; /* Information about scale +static int +ScaleWidgetCmd ( + ClientData clientData, /* Information about scale * widget. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { register Scale *scalePtr = (Scale *) clientData; int result = TCL_OK; @@ -422,9 +424,10 @@ ScaleWidgetCmd(clientData, interp, argc, argv) *---------------------------------------------------------------------- */ -static void -DestroyScale(clientData) - ClientData clientData; /* Info about scale widget. */ +static void +DestroyScale ( + ClientData clientData /* Info about scale widget. */ +) { register Scale *scalePtr = (Scale *) clientData; @@ -479,14 +482,15 @@ DestroyScale(clientData) *---------------------------------------------------------------------- */ -static int -ConfigureScale(interp, scalePtr, argc, argv, flags) - Tcl_Interp *interp; /* Used for error reporting. */ - register Scale *scalePtr; /* Information about widget; may or may +static int +ConfigureScale ( + Tcl_Interp *interp, /* Used for error reporting. */ + register Scale *scalePtr, /* Information about widget; may or may * not already have values for some fields. */ - int argc; /* Number of valid entries in argv. */ - char **argv; /* Arguments. */ - int flags; /* Flags to pass to Tk_ConfigureWidget. */ + int argc, /* Number of valid entries in argv. */ + char **argv, /* Arguments. */ + int flags /* Flags to pass to Tk_ConfigureWidget. */ +) { XGCValues gcValues; GC newGC; @@ -597,9 +601,10 @@ ConfigureScale(interp, scalePtr, argc, argv, flags) *---------------------------------------------------------------------- */ -static void -ComputeScaleGeometry(scalePtr) - register Scale *scalePtr; /* Information about widget. */ +static void +ComputeScaleGeometry ( + register Scale *scalePtr /* Information about widget. */ +) { XCharStruct bbox; char valueString[30]; @@ -701,9 +706,10 @@ ComputeScaleGeometry(scalePtr) *-------------------------------------------------------------- */ -static void -DisplayVerticalScale(clientData) - ClientData clientData; /* Information about widget. */ +static void +DisplayVerticalScale ( + ClientData clientData /* Information about widget. */ +) { register Scale *scalePtr = (Scale *) clientData; register Tk_Window tkwin = scalePtr->tkwin; @@ -866,15 +872,16 @@ DisplayVerticalScale(clientData) *---------------------------------------------------------------------- */ -static void -DisplayVerticalValue(scalePtr, value, rightEdge) - register Scale *scalePtr; /* Information about widget in which to +static void +DisplayVerticalValue ( + register Scale *scalePtr, /* Information about widget in which to * display value. */ - int value; /* Y-coordinate of number to display, + int value, /* Y-coordinate of number to display, * specified in application coords, not * in pixels (we'll compute pixels). */ - int rightEdge; /* X-coordinate of right edge of text, + int rightEdge /* X-coordinate of right edge of text, * specified in pixels. */ +) { register Tk_Window tkwin = scalePtr->tkwin; int y, dummy, length; @@ -921,9 +928,10 @@ DisplayVerticalValue(scalePtr, value, rightEdge) *-------------------------------------------------------------- */ -static void -DisplayHorizontalScale(clientData) - ClientData clientData; /* Information about widget. */ +static void +DisplayHorizontalScale ( + ClientData clientData /* Information about widget. */ +) { register Scale *scalePtr = (Scale *) clientData; register Tk_Window tkwin = scalePtr->tkwin; @@ -1085,15 +1093,16 @@ DisplayHorizontalScale(clientData) *---------------------------------------------------------------------- */ -static void -DisplayHorizontalValue(scalePtr, value, bottom) - register Scale *scalePtr; /* Information about widget in which to +static void +DisplayHorizontalValue ( + register Scale *scalePtr, /* Information about widget in which to * display value. */ - int value; /* Y-coordinate of number to display, + int value, /* Y-coordinate of number to display, * specified in application coords, not * in pixels (we'll compute pixels). */ - int bottom; /* Y-coordinate of bottom edge of text, + int bottom /* Y-coordinate of bottom edge of text, * specified in pixels. */ +) { register Tk_Window tkwin = scalePtr->tkwin; int x, y, dummy, length; @@ -1140,11 +1149,13 @@ DisplayHorizontalValue(scalePtr, value, bottom) *---------------------------------------------------------------------- */ -static int -PixelToValue(scalePtr, x, y) - register Scale *scalePtr; /* Information about widget. */ - int x, y; /* Coordinates of point within +static int +PixelToValue ( + register Scale *scalePtr, /* Information about widget. */ + int x, + int y /* Coordinates of point within * window. */ +) { int value, pixelRange; @@ -1207,10 +1218,11 @@ PixelToValue(scalePtr, x, y) *---------------------------------------------------------------------- */ -static int -ValueToPixel(scalePtr, value) - register Scale *scalePtr; /* Information about widget. */ - int value; /* Reading of the widget. */ +static int +ValueToPixel ( + register Scale *scalePtr, /* Information about widget. */ + int value /* Reading of the widget. */ +) { int y, pixelRange, valueRange; @@ -1247,10 +1259,11 @@ ValueToPixel(scalePtr, value) *-------------------------------------------------------------- */ -static void -ScaleEventProc(clientData, eventPtr) - ClientData clientData; /* Information about window. */ - XEvent *eventPtr; /* Information about event. */ +static void +ScaleEventProc ( + ClientData clientData, /* Information about window. */ + XEvent *eventPtr /* Information about event. */ +) { Scale *scalePtr = (Scale *) clientData; @@ -1293,10 +1306,11 @@ ScaleEventProc(clientData, eventPtr) *-------------------------------------------------------------- */ -static void -ScaleMouseProc(clientData, eventPtr) - ClientData clientData; /* Information about window. */ - register XEvent *eventPtr; /* Information about event. */ +static void +ScaleMouseProc ( + ClientData clientData, /* Information about window. */ + register XEvent *eventPtr /* Information about event. */ +) { register Scale *scalePtr = (Scale *) clientData; @@ -1349,11 +1363,12 @@ ScaleMouseProc(clientData, eventPtr) *-------------------------------------------------------------- */ -static void -SetScaleValue(scalePtr, value) - register Scale *scalePtr; /* Info about widget. */ - int value; /* New value for scale. Gets +static void +SetScaleValue ( + register Scale *scalePtr, /* Info about widget. */ + int value /* New value for scale. Gets * adjusted if it's off the scale. */ +) { int result; char string[20]; @@ -1399,11 +1414,12 @@ SetScaleValue(scalePtr, value) *-------------------------------------------------------------- */ -static void -EventuallyRedrawScale(scalePtr, what) - register Scale *scalePtr; /* Information about widget. */ - int what; /* What to redraw: REDRAW_SLIDER +static void +EventuallyRedrawScale ( + register Scale *scalePtr, /* Information about widget. */ + int what /* What to redraw: REDRAW_SLIDER * or REDRAW_ALL. */ +) { if ((what == 0) || (scalePtr->tkwin == NULL) || !Tk_IsMapped(scalePtr->tkwin)) { diff --git a/src/tk/tkscrbar.c b/src/tk/tkscrbar.c index bb843bc..3b5cdec 100644 --- a/src/tk/tkscrbar.c +++ b/src/tk/tkscrbar.c @@ -229,13 +229,14 @@ static void ScrollCmd _ANSI_ARGS_((Scrollbar *scrollPtr, *-------------------------------------------------------------- */ -int -Tk_ScrollbarCmd(clientData, interp, argc, argv) - ClientData clientData; /* Main window associated with +int +Tk_ScrollbarCmd ( + ClientData clientData, /* Main window associated with * interpreter. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { Tk_Window tkwin = (Tk_Window) clientData; register Scrollbar *scrollPtr; @@ -283,7 +284,7 @@ Tk_ScrollbarCmd(clientData, interp, argc, argv) |PointerMotionMask|ButtonPressMask|ButtonReleaseMask, ScrollbarMouseProc, (ClientData) scrollPtr); Tcl_CreateCommand(interp, Tk_PathName(scrollPtr->tkwin), ScrollbarWidgetCmd, - (ClientData) scrollPtr, (void (*)()) NULL); + (ClientData) scrollPtr, (void (*)(int *)) NULL); if (ConfigureScrollbar(interp, scrollPtr, argc-2, argv+2, 0) != TCL_OK) { goto error; } @@ -314,13 +315,14 @@ Tk_ScrollbarCmd(clientData, interp, argc, argv) *-------------------------------------------------------------- */ -static int -ScrollbarWidgetCmd(clientData, interp, argc, argv) - ClientData clientData; /* Information about scrollbar +static int +ScrollbarWidgetCmd ( + ClientData clientData, /* Information about scrollbar * widget. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { register Scrollbar *scrollPtr = (Scrollbar *) clientData; int result = TCL_OK; @@ -430,9 +432,10 @@ ScrollbarWidgetCmd(clientData, interp, argc, argv) *---------------------------------------------------------------------- */ -static void -DestroyScrollbar(clientData) - ClientData clientData; /* Info about scrollbar widget. */ +static void +DestroyScrollbar ( + ClientData clientData /* Info about scrollbar widget. */ +) { register Scrollbar *scrollPtr = (Scrollbar *) clientData; @@ -478,16 +481,17 @@ DestroyScrollbar(clientData) *---------------------------------------------------------------------- */ -static int -ConfigureScrollbar(interp, scrollPtr, argc, argv, flags) - Tcl_Interp *interp; /* Used for error reporting. */ - register Scrollbar *scrollPtr; /* Information about widget; may or +static int +ConfigureScrollbar ( + Tcl_Interp *interp, /* Used for error reporting. */ + register Scrollbar *scrollPtr, /* Information about widget; may or * may not already have values for * some fields. */ - int argc; /* Number of valid entries in argv. */ - char **argv; /* Arguments. */ - int flags; /* Flags to pass to + int argc, /* Number of valid entries in argv. */ + char **argv, /* Arguments. */ + int flags /* Flags to pass to * Tk_ConfigureWidget. */ +) { int length; XGCValues gcValues; @@ -557,9 +561,10 @@ ConfigureScrollbar(interp, scrollPtr, argc, argv, flags) *-------------------------------------------------------------- */ -static void -DisplayScrollbar(clientData) - ClientData clientData; /* Information about window. */ +static void +DisplayScrollbar ( + ClientData clientData /* Information about window. */ +) { register Scrollbar *scrollPtr = (Scrollbar *) clientData; register Tk_Window tkwin = scrollPtr->tkwin; @@ -722,10 +727,11 @@ DisplayScrollbar(clientData) *-------------------------------------------------------------- */ -static void -ScrollbarEventProc(clientData, eventPtr) - ClientData clientData; /* Information about window. */ - XEvent *eventPtr; /* Information about event. */ +static void +ScrollbarEventProc ( + ClientData clientData, /* Information about window. */ + XEvent *eventPtr /* Information about event. */ +) { Scrollbar *scrollPtr = (Scrollbar *) clientData; @@ -761,10 +767,11 @@ ScrollbarEventProc(clientData, eventPtr) *---------------------------------------------------------------------- */ -static void -ComputeScrollbarGeometry(scrollPtr) - register Scrollbar *scrollPtr; /* Scrollbar whose geometry may +static void +ComputeScrollbarGeometry ( + register Scrollbar *scrollPtr /* Scrollbar whose geometry may * have changed. */ +) { int width, fieldLength; @@ -857,11 +864,13 @@ ComputeScrollbarGeometry(scrollPtr) *-------------------------------------------------------------- */ -static int -ScrollbarPosition(scrollPtr, x, y) - register Scrollbar *scrollPtr; /* Scrollbar widget record. */ - int x, y; /* Coordinates within scrollPtr's +static int +ScrollbarPosition ( + register Scrollbar *scrollPtr, /* Scrollbar widget record. */ + int x, + int y /* Coordinates within scrollPtr's * window. */ +) { int length, width, tmp; @@ -920,10 +929,11 @@ ScrollbarPosition(scrollPtr, x, y) *-------------------------------------------------------------- */ -static void -ScrollbarMouseProc(clientData, eventPtr) - ClientData clientData; /* Information about window. */ - register XEvent *eventPtr; /* Information about event. */ +static void +ScrollbarMouseProc ( + ClientData clientData, /* Information about window. */ + register XEvent *eventPtr /* Information about event. */ +) { register Scrollbar *scrollPtr = (Scrollbar *) clientData; @@ -1053,13 +1063,14 @@ ScrollbarMouseProc(clientData, eventPtr) *-------------------------------------------------------------- */ -static void -ScrollCmd(scrollPtr, unit) - register Scrollbar *scrollPtr; /* Scrollbar from which to issue +static void +ScrollCmd ( + register Scrollbar *scrollPtr, /* Scrollbar from which to issue * command. */ - int unit; /* Unit position within thing being + int unit /* Unit position within thing being * being displayed that should appear * at top or right of screen. */ +) { char string[20]; int result; @@ -1092,9 +1103,10 @@ ScrollCmd(scrollPtr, unit) *-------------------------------------------------------------- */ -static void -EventuallyRedraw(scrollPtr) - register Scrollbar *scrollPtr; /* Information about widget. */ +static void +EventuallyRedraw ( + register Scrollbar *scrollPtr /* Information about widget. */ +) { if ((scrollPtr->tkwin == NULL) || (!Tk_IsMapped(scrollPtr->tkwin))) { return; @@ -1124,11 +1136,12 @@ EventuallyRedraw(scrollPtr) *-------------------------------------------------------------- */ -static void -ScrollbarNewField(scrollPtr, field) - register Scrollbar *scrollPtr; /* Information about widget. */ - int field; /* Identifies field under mouse, +static void +ScrollbarNewField ( + register Scrollbar *scrollPtr, /* Information about widget. */ + int field /* Identifies field under mouse, * e.g. TOP_ARROW. */ +) { if (field == scrollPtr->mouseField) { return; @@ -1157,9 +1170,10 @@ ScrollbarNewField(scrollPtr, field) *-------------------------------------------------------------- */ -static void -ScrollbarTimerProc(clientData) - ClientData clientData; /* Information about widget. */ +static void +ScrollbarTimerProc ( + ClientData clientData /* Information about widget. */ +) { register Scrollbar *scrollPtr = (Scrollbar *) clientData; diff --git a/src/tk/tkselect.c b/src/tk/tkselect.c index f832140..e95b03e 100644 --- a/src/tk/tkselect.c +++ b/src/tk/tkselect.c @@ -223,20 +223,21 @@ static void SelTimeoutProc _ANSI_ARGS_((ClientData clientData)); *-------------------------------------------------------------- */ -void -Tk_CreateSelHandler(tkwin, target, proc, clientData, format) - Tk_Window tkwin; /* Token for window. */ - Atom target; /* The kind of selection conversions +void +Tk_CreateSelHandler ( + Tk_Window tkwin, /* Token for window. */ + Atom target, /* The kind of selection conversions * that can be handled by proc, * e.g. TARGETS or XA_STRING. */ - Tk_SelectionProc *proc; /* Procedure to invoke to convert + Tk_SelectionProc *proc, /* Procedure to invoke to convert * selection to type "target". */ - ClientData clientData; /* Value to pass to proc. */ - Atom format; /* Format in which the selection + ClientData clientData, /* Value to pass to proc. */ + Atom format /* Format in which the selection * information should be returned to * the requestor. XA_STRING is best by * far, but anything listed in the ICCCM * will be tolerated (blech). */ +) { register TkSelHandler *selPtr; TkWindow *winPtr = (TkWindow *) tkwin; @@ -302,14 +303,15 @@ Tk_CreateSelHandler(tkwin, target, proc, clientData, format) *-------------------------------------------------------------- */ -void -Tk_OwnSelection(tkwin, proc, clientData) - Tk_Window tkwin; /* Window to become new selection +void +Tk_OwnSelection ( + Tk_Window tkwin, /* Window to become new selection * owner. */ - Tk_LostSelProc *proc; /* Procedure to call when selection + Tk_LostSelProc *proc, /* Procedure to call when selection * is taken away from tkwin. */ - ClientData clientData; /* Arbitrary one-word argument to + ClientData clientData /* Arbitrary one-word argument to * pass to proc. */ +) { register TkWindow *winPtr = (TkWindow *) tkwin; TkDisplay *dispPtr = winPtr->dispPtr; @@ -379,18 +381,19 @@ Tk_OwnSelection(tkwin, proc, clientData) *-------------------------------------------------------------- */ -int -Tk_GetSelection(interp, tkwin, target, proc, clientData) - Tcl_Interp *interp; /* Interpreter to use for reporting +int +Tk_GetSelection ( + Tcl_Interp *interp, /* Interpreter to use for reporting * errors. */ - Tk_Window tkwin; /* Window on whose behalf to retrieve + Tk_Window tkwin, /* Window on whose behalf to retrieve * the selection (determines display * from which to retrieve). */ - Atom target; /* Desired form in which selection + Atom target, /* Desired form in which selection * is to be returned. */ - Tk_GetSelProc *proc; /* Procedure to call to process the + Tk_GetSelProc *proc, /* Procedure to call to process the * selection, once it has been retrieved. */ - ClientData clientData; /* Arbitrary value to pass to proc. */ + ClientData clientData /* Arbitrary value to pass to proc. */ +) { RetrievalInfo retr; TkWindow *winPtr = (TkWindow *) tkwin; @@ -555,13 +558,14 @@ Tk_GetSelection(interp, tkwin, target, proc, clientData) *-------------------------------------------------------------- */ -int -Tk_SelectionCmd(clientData, interp, argc, argv) - ClientData clientData; /* Main window associated with +int +Tk_SelectionCmd ( + ClientData clientData, /* Main window associated with * interpreter. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { Tk_Window tkwin = (Tk_Window) clientData; int length; @@ -686,9 +690,10 @@ Tk_SelectionCmd(clientData, interp, argc, argv) *---------------------------------------------------------------------- */ -void -TkSelDeadWindow(winPtr) - register TkWindow *winPtr; /* Window that's being deleted. */ +void +TkSelDeadWindow ( + register TkWindow *winPtr /* Window that's being deleted. */ +) { register TkSelHandler *selPtr; @@ -723,10 +728,11 @@ TkSelDeadWindow(winPtr) *---------------------------------------------------------------------- */ -static void -SelInit(tkwin) - Tk_Window tkwin; /* Window token (used to find +static void +SelInit ( + Tk_Window tkwin /* Window token (used to find * display to initialize). */ +) { register TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr; @@ -760,13 +766,14 @@ SelInit(tkwin) *-------------------------------------------------------------- */ -void -TkSelEventProc(tkwin, eventPtr) - Tk_Window tkwin; /* Window for which event was +void +TkSelEventProc ( + Tk_Window tkwin, /* Window for which event was * targeted. */ - register XEvent *eventPtr; /* X event: either SelectionClear, + register XEvent *eventPtr /* X event: either SelectionClear, * SelectionRequest, or * SelectionNotify. */ +) { register TkWindow *winPtr = (TkWindow *) tkwin; @@ -928,13 +935,14 @@ TkSelEventProc(tkwin, eventPtr) */ /* ARGSUSED */ -static int -SelGetProc(clientData, interp, portion) - ClientData clientData; /* Information about partially- +static int +SelGetProc ( + ClientData clientData, /* Information about partially- * assembled result. */ - Tcl_Interp *interp; /* Interpreter used for error + Tcl_Interp *interp, /* Interpreter used for error * reporting (not used). */ - char *portion; /* New information to be appended. */ + char *portion /* New information to be appended. */ +) { register GetInfo *getInfoPtr = (GetInfo *) clientData; int newLength; @@ -991,15 +999,16 @@ SelGetProc(clientData, interp, portion) */ static long * -SelCvtToX(string, type, tkwin, numLongsPtr) - char *string; /* String representation of selection. */ - Atom type; /* Atom specifying the X format that is +SelCvtToX ( + char *string, /* String representation of selection. */ + Atom type, /* Atom specifying the X format that is * desired for the selection. Should not * be XA_STRING (if so, don't bother calling * this procedure at all). */ - Tk_Window tkwin; /* Window that governs atom conversion. */ - int *numLongsPtr; /* Number of 32-bit words contained in the + Tk_Window tkwin, /* Window that governs atom conversion. */ + int *numLongsPtr /* Number of 32-bit words contained in the * result. */ +) { register char *p; char *field; @@ -1083,13 +1092,14 @@ SelCvtToX(string, type, tkwin, numLongsPtr) */ static char * -SelCvtFromX(propPtr, numValues, type, tkwin) - register long *propPtr; /* Property value from X. */ - int numValues; /* Number of 32-bit values in property. */ - Atom type; /* Type of property Should not be +SelCvtFromX ( + register long *propPtr, /* Property value from X. */ + int numValues, /* Number of 32-bit values in property. */ + Atom type, /* Type of property Should not be * XA_STRING (if so, don't bother calling * this procedure at all). */ - Tk_Window tkwin; /* Window to use for atom conversion. */ + Tk_Window tkwin /* Window to use for atom conversion. */ +) { char *result; int resultSpace, curSize, fieldSize; @@ -1159,10 +1169,11 @@ SelCvtFromX(propPtr, numValues, type, tkwin) *---------------------------------------------------------------------- */ -static void -ConvertSelection(winPtr, eventPtr) - TkWindow *winPtr; /* Window that owns selection. */ - register XSelectionRequestEvent *eventPtr; +static void +ConvertSelection ( + TkWindow *winPtr, /* Window that owns selection. */ + register XSelectionRequestEvent *eventPtr +) /* Event describing request. */ { XSelectionEvent reply; /* Used to notify requestor that @@ -1176,7 +1187,7 @@ ConvertSelection(winPtr, eventPtr) Tk_ErrorHandler errorHandler; errorHandler = Tk_CreateErrorHandler(eventPtr->display, -1, -1,-1, - (int (*)()) NULL, (ClientData) NULL); + (int (*)(int *, XErrorEvent *)) NULL, (ClientData) NULL); /* * Initialize the reply event. @@ -1376,7 +1387,7 @@ ConvertSelection(winPtr, eventPtr) } Tk_DeleteTimerHandler(info.timeout); errorHandler = Tk_CreateErrorHandler(winPtr->display, - -1, -1,-1, (int (*)()) NULL, (ClientData) NULL); + -1, -1,-1, (int (*)(int *, XErrorEvent *)) NULL, (ClientData) NULL); XSelectInput(reply.display, reply.requestor, 0L); Tk_DeleteErrorHandler(errorHandler); if (pendingIncrs == &info) { @@ -1435,10 +1446,11 @@ ConvertSelection(winPtr, eventPtr) *---------------------------------------------------------------------- */ -static void -SelRcvIncrProc(clientData, eventPtr) - ClientData clientData; /* Information about retrieval. */ - register XEvent *eventPtr; /* X PropertyChange event. */ +static void +SelRcvIncrProc ( + ClientData clientData, /* Information about retrieval. */ + register XEvent *eventPtr /* X PropertyChange event. */ +) { register RetrievalInfo *retrPtr = (RetrievalInfo *) clientData; char *propInfo; @@ -1532,9 +1544,10 @@ SelRcvIncrProc(clientData, eventPtr) *---------------------------------------------------------------------- */ -void -TkSelPropProc(eventPtr) - register XEvent *eventPtr; /* X PropertyChange event. */ +void +TkSelPropProc ( + register XEvent *eventPtr /* X PropertyChange event. */ +) { register IncrInfo *infoPtr; int i, format; @@ -1625,7 +1638,7 @@ TkSelPropProc(eventPtr) } errorHandler = Tk_CreateErrorHandler( eventPtr->xproperty.display, -1, -1, -1, - (int (*)()) NULL, (ClientData) NULL); + (int (*)(int *, XErrorEvent *)) NULL, (ClientData) NULL); XChangeProperty(eventPtr->xproperty.display, eventPtr->xproperty.window, eventPtr->xproperty.atom, selPtr->format, @@ -1661,13 +1674,14 @@ TkSelPropProc(eventPtr) *---------------------------------------------------------------------- */ -static int -HandleTclCommand(clientData, offset, buffer, maxBytes) - ClientData clientData; /* Information about command to execute. */ - int offset; /* Return selection bytes starting at this +static int +HandleTclCommand ( + ClientData clientData, /* Information about command to execute. */ + int offset, /* Return selection bytes starting at this * offset. */ - char *buffer; /* Place to store converted selection. */ - int maxBytes; /* Maximum # of bytes to store at buffer. */ + char *buffer, /* Place to store converted selection. */ + int maxBytes /* Maximum # of bytes to store at buffer. */ +) { register CommandInfo *cmdInfoPtr = (CommandInfo *) clientData; char *oldResultString; @@ -1746,10 +1760,11 @@ HandleTclCommand(clientData, offset, buffer, maxBytes) *---------------------------------------------------------------------- */ -static void -SelTimeoutProc(clientData) - ClientData clientData; /* Information about retrieval +static void +SelTimeoutProc ( + ClientData clientData /* Information about retrieval * in progress. */ +) { register RetrievalInfo *retrPtr = (RetrievalInfo *) clientData; @@ -1800,11 +1815,12 @@ SelTimeoutProc(clientData) *---------------------------------------------------------------------- */ -static void -IncrTimeoutProc(clientData) - ClientData clientData; /* Information about INCR-mode +static void +IncrTimeoutProc ( + ClientData clientData /* Information about INCR-mode * selection retrieval for which * we are selection owner. */ +) { register IncrInfo *infoPtr = (IncrInfo *) clientData; @@ -1843,14 +1859,15 @@ IncrTimeoutProc(clientData) *---------------------------------------------------------------------- */ -static int -DefaultSelection(winPtr, target, buffer, maxBytes, typePtr) - TkWindow *winPtr; /* Window that owns selection. */ - Atom target; /* Desired form of selection. */ - char *buffer; /* Place to put selection characters. */ - int maxBytes; /* Maximum # of bytes to store at buffer. */ - Atom *typePtr; /* Store here the type of the selection, +static int +DefaultSelection ( + TkWindow *winPtr, /* Window that owns selection. */ + Atom target, /* Desired form of selection. */ + char *buffer, /* Place to put selection characters. */ + int maxBytes, /* Maximum # of bytes to store at buffer. */ + Atom *typePtr /* Store here the type of the selection, * for use in converting to proper X format. */ +) { if (target == winPtr->dispPtr->timestampAtom) { if (maxBytes < 20) { diff --git a/src/tk/tksend.c b/src/tk/tksend.c index c5c1fc1..17ee2a3 100644 --- a/src/tk/tksend.c +++ b/src/tk/tksend.c @@ -165,16 +165,17 @@ static void TimeoutProc _ANSI_ARGS_((ClientData clientData)); *-------------------------------------------------------------- */ -int -Tk_RegisterInterp(interp, name, tkwin) - Tcl_Interp *interp; /* Interpreter associated with name. */ - char *name; /* The name that will be used to +int +Tk_RegisterInterp ( + Tcl_Interp *interp, /* Interpreter associated with name. */ + char *name, /* The name that will be used to * refer to the interpreter in later * "send" commands. Must be globally * unique. */ - Tk_Window tkwin; /* Token for window associated with + Tk_Window tkwin /* Token for window associated with * interp; used to identify display * for communication. */ +) { #define TCL_MAX_NAME_LENGTH 1000 char propInfo[TCL_MAX_NAME_LENGTH + 20]; @@ -287,13 +288,14 @@ Tk_RegisterInterp(interp, name, tkwin) *-------------------------------------------------------------- */ -int -Tk_SendCmd(clientData, interp, argc, argv) - ClientData clientData; /* Information about sender (only +int +Tk_SendCmd ( + ClientData clientData, /* Information about sender (only * dispPtr field is used). */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { RegisteredInterp *senderRiPtr = (RegisteredInterp *) clientData; Window w; @@ -309,7 +311,7 @@ Tk_SendCmd(clientData, interp, argc, argv) register RegisteredInterp *riPtr; char *cmd; int result; - Bool (*prevRestrictProc)(); + Bool (*prevRestrictProc)(Display *, XEvent *, char *); char *prevArg; TkWindow *winPtr = senderRiPtr->winPtr; TkDisplay *dispPtr = senderRiPtr->dispPtr; @@ -511,11 +513,12 @@ Tk_SendCmd(clientData, interp, argc, argv) *---------------------------------------------------------------------- */ -int -TkGetInterpNames(interp, tkwin) - Tcl_Interp *interp; /* Interpreter for returning a result. */ - Tk_Window tkwin; /* Window whose display is to be used +int +TkGetInterpNames ( + Tcl_Interp *interp, /* Interpreter for returning a result. */ + Tk_Window tkwin /* Window whose display is to be used * for the lookup. */ +) { TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr; char *regProp, *separator, *name; @@ -598,11 +601,12 @@ TkGetInterpNames(interp, tkwin) *-------------------------------------------------------------- */ -static int -SendInit(interp, dispPtr) - Tcl_Interp *interp; /* Interpreter to use for error +static int +SendInit ( + Tcl_Interp *interp, /* Interpreter to use for error * reporting. */ - register TkDisplay *dispPtr;/* Display to initialize. */ + register TkDisplay *dispPtr/* Display to initialize. */ +) { XSetWindowAttributes atts; @@ -657,12 +661,12 @@ SendInit(interp, dispPtr) *-------------------------------------------------------------- */ -static Window -LookupName(dispPtr, name, delete) - register TkDisplay *dispPtr; - /* Display whose registry to check. */ - char *name; /* Name of an interpreter. */ - int delete; /* If non-zero, delete info about name. */ +static Window +LookupName ( + register TkDisplay *dispPtr, + char *name, /* Name of an interpreter. */ + int delete /* If non-zero, delete info about name. */ +) { char *regProp, *entry; register char *p; @@ -773,10 +777,11 @@ LookupName(dispPtr, name, delete) *-------------------------------------------------------------- */ -static void -SendEventProc(clientData, eventPtr) - ClientData clientData; /* Display information. */ - XEvent *eventPtr; /* Information about event. */ +static void +SendEventProc ( + ClientData clientData, /* Display information. */ + XEvent *eventPtr /* Information about event. */ +) { TkDisplay *dispPtr = (TkDisplay *) clientData; char *propInfo; @@ -993,18 +998,19 @@ SendEventProc(clientData, eventPtr) *-------------------------------------------------------------- */ -static void -AppendPropCarefully(display, window, property, value, pendingPtr) - Display *display; /* Display on which to operate. */ - Window window; /* Window whose property is to +static void +AppendPropCarefully ( + Display *display, /* Display on which to operate. */ + Window window, /* Window whose property is to * be modified. */ - Atom property; /* Name of property. */ - char *value; /* Characters (null-terminated) to + Atom property, /* Name of property. */ + char *value, /* Characters (null-terminated) to * append to property. */ - PendingCommand *pendingPtr; /* Pending command to mark complete + PendingCommand *pendingPtr /* Pending command to mark complete * if an error occurs during the * property op. NULL means just * ignore the error. */ +) { Tk_ErrorHandler handler; @@ -1021,10 +1027,11 @@ AppendPropCarefully(display, window, property, value, pendingPtr) */ /* ARGSUSED */ -static int -AppendErrorProc(clientData, errorPtr) - ClientData clientData; /* Command to mark complete, or NULL. */ - XErrorEvent *errorPtr; /* Information about error. */ +static int +AppendErrorProc ( + ClientData clientData, /* Command to mark complete, or NULL. */ + XErrorEvent *errorPtr /* Information about error. */ +) { PendingCommand *pendingPtr = (PendingCommand *) clientData; register PendingCommand *pcPtr; @@ -1069,11 +1076,12 @@ AppendErrorProc(clientData, errorPtr) *-------------------------------------------------------------- */ -static void -TimeoutProc(clientData) - ClientData clientData; /* Information about command that +static void +TimeoutProc ( + ClientData clientData /* Information about command that * has been sent but not yet * responded to. */ +) { PendingCommand *pcPtr = (PendingCommand *) clientData; register PendingCommand *pcPtr2; @@ -1115,10 +1123,11 @@ TimeoutProc(clientData) *-------------------------------------------------------------- */ -static void -DeleteProc(clientData) - ClientData clientData; /* Info about registration, passed +static void +DeleteProc ( + ClientData clientData /* Info about registration, passed * as ClientData. */ +) { RegisteredInterp *riPtr = (RegisteredInterp *) clientData; register RegisteredInterp *riPtr2; @@ -1159,12 +1168,13 @@ DeleteProc(clientData) */ /* ARGSUSED */ -static Bool -SendRestrictProc(display, eventPtr, arg) - Display *display; /* Display from which event arrived. */ - register XEvent *eventPtr; /* Event that just arrived. */ - char *arg; /* Comunication window in which +static Bool +SendRestrictProc ( + Display *display, /* Display from which event arrived. */ + register XEvent *eventPtr, /* Event that just arrived. */ + char *arg /* Comunication window in which * we're interested. */ +) { register Tk_Window comm = (Tk_Window) arg; diff --git a/src/tk/tkshare.c b/src/tk/tkshare.c index dd43ab1..5cc0d84 100644 --- a/src/tk/tkshare.c +++ b/src/tk/tkshare.c @@ -92,11 +92,12 @@ static void ShareEventProc _ANSI_ARGS_((ClientData clientData, *---------------------------------------------------------------------- */ -void -Tk_ShareEvents(tkwin, groupId) - Tk_Window tkwin; /* Token for window. */ - Tk_Uid groupId; /* Identifier for group among which +void +Tk_ShareEvents ( + Tk_Window tkwin, /* Token for window. */ + Tk_Uid groupId /* Identifier for group among which * events are to be shared. */ +) { register Group *groupPtr; @@ -165,10 +166,11 @@ Tk_ShareEvents(tkwin, groupId) *---------------------------------------------------------------------- */ -void -Tk_UnshareEvents(tkwin, groupId) - Tk_Window tkwin; /* Token for window. */ - Tk_Uid groupId; /* Identifier for group. */ +void +Tk_UnshareEvents ( + Tk_Window tkwin, /* Token for window. */ + Tk_Uid groupId /* Identifier for group. */ +) { register Group *groupPtr; int i; @@ -219,9 +221,10 @@ Tk_UnshareEvents(tkwin, groupId) *---------------------------------------------------------------------- */ -static void -DeleteGroup(groupPtr) - Group *groupPtr; /* Group to delete. */ +static void +DeleteGroup ( + Group *groupPtr /* Group to delete. */ +) { if (groupList == groupPtr) { groupList = groupPtr->nextPtr; @@ -262,9 +265,10 @@ DeleteGroup(groupPtr) */ static void -ShareEventProc(clientData, eventPtr) - ClientData clientData; /* Information about share group. */ - register XEvent *eventPtr; /* Event that just occurred. */ +ShareEventProc( + ClientData clientData, /* Information about share group. */ + register XEvent *eventPtr /* Event that just occurred. */ +) { register Group *groupPtr = (Group *) clientData; register Tk_Window tkwin; diff --git a/src/tk/tktcp.c b/src/tk/tktcp.c index fa5339c..58b9607 100644 --- a/src/tk/tktcp.c +++ b/src/tk/tktcp.c @@ -503,9 +503,8 @@ simpleCreateFileHandler (fd, mask, proc, clientData) * quiescent, and deletes the handler. */ -void -simpleDeleteFileHandler (fd) - int fd; +void +simpleDeleteFileHandler (int fd) { /* First of all, we have to zero the file's mask to avoid calling the same handler over again if the file is still ready. */ @@ -1633,9 +1632,8 @@ deleteTcpServerObjectCmd (clientData) * deleted. All that remains is to deallocate the server's data structures. */ -static void -tcpDeleteServer (server) - Tcp_ServerData * server; +static void +tcpDeleteServer (Tcp_ServerData *server) { /* Get rid of the server's initial command */ @@ -2302,9 +2300,8 @@ deleteTcpConnectionObjectCmd (clientData) * to the dead client, but we shouldn't have come here in that case. */ -static void -tcpCloseClient (client) - Tcp_ClientData * client; +static void +tcpCloseClient (Tcp_ClientData *client) { if (client -> activeFlag) abort (); @@ -2389,9 +2386,8 @@ tcpServerAcceptConnection (clientData, mask) strcmp ((name1), (name2)) #endif -static int -tcpTrustedHost (hostName) - char * hostName; +static int +tcpTrustedHost (char *hostName) { char localName [128]; struct hostent * hostEnt; @@ -2597,9 +2593,8 @@ tcpWriteResultToClient (clientData, mask) * actual command buffering. */ -static void -tcpPrepareClientForInput (client) - Tcp_ClientData * client; +static void +tcpPrepareClientForInput (Tcp_ClientData *client) { simpleCreateFileHandler (client -> socketfd, TK_READABLE, (Tk_FileProc *) tcpReceiveClientInput, @@ -2702,9 +2697,8 @@ printf("TCP executing: %s\n", buf); * it must define the `tcperror' procedure and process the error. */ -static void -tcpClientReadError (client) - Tcp_ClientData * client; +static void +tcpClientReadError (Tcp_ClientData *client) { Tcp_ServerData * server = client -> server; Tcl_Interp * interp = server -> interp; @@ -2739,9 +2733,8 @@ tcpClientReadError (client) * it must define the `tcperror' procedure to catch the error. */ -static void -tcpClientWriteError (client) - Tcp_ClientData * client; +static void +tcpClientWriteError (Tcp_ClientData *client) { Tcp_ServerData * server = client -> server; Tcl_Interp * interp = server -> interp; diff --git a/src/tk/tktext.c b/src/tk/tktext.c index 3a0dc70..bd2ca89 100644 --- a/src/tk/tktext.c +++ b/src/tk/tktext.c @@ -167,12 +167,13 @@ static int TextWidgetCmd _ANSI_ARGS_((ClientData clientData, */ int -Tk_TextCmd(clientData, interp, argc, argv) - ClientData clientData; /* Main window associated with +Tk_TextCmd( + ClientData clientData, /* Main window associated with * interpreter. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { Tk_Window tkwin = (Tk_Window) clientData; Tk_Window new; @@ -259,7 +260,7 @@ Tk_TextCmd(clientData, interp, argc, argv) Tk_CreateSelHandler(textPtr->tkwin, XA_STRING, TextFetchSelection, (ClientData) textPtr, XA_STRING); Tcl_CreateCommand(interp, Tk_PathName(textPtr->tkwin), - TextWidgetCmd, (ClientData) textPtr, (void (*)()) NULL); + TextWidgetCmd, (ClientData) textPtr, (void (*)(int *)) NULL); if (ConfigureText(interp, textPtr, argc-2, argv+2, 0) != TCL_OK) { Tk_DestroyWindow(textPtr->tkwin); return TCL_ERROR; @@ -289,11 +290,12 @@ Tk_TextCmd(clientData, interp, argc, argv) */ static int -TextWidgetCmd(clientData, interp, argc, argv) - ClientData clientData; /* Information about text widget. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ +TextWidgetCmd( + ClientData clientData, /* Information about text widget. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { register TkText *textPtr = (TkText *) clientData; int result = TCL_OK; @@ -573,8 +575,9 @@ TextWidgetCmd(clientData, interp, argc, argv) */ static void -DestroyText(clientData) - ClientData clientData; /* Info about text widget. */ +DestroyText( + ClientData clientData /* Info about text widget. */ +) { register TkText *textPtr = (TkText *) clientData; Tcl_HashSearch search; @@ -653,14 +656,15 @@ DestroyText(clientData) *---------------------------------------------------------------------- */ -static int -ConfigureText(interp, textPtr, argc, argv, flags) - Tcl_Interp *interp; /* Used for error reporting. */ - register TkText *textPtr; /* Information about widget; may or may +static int +ConfigureText ( + Tcl_Interp *interp, /* Used for error reporting. */ + register TkText *textPtr, /* Information about widget; may or may * not already have values for some fields. */ - int argc; /* Number of valid entries in argv. */ - char **argv; /* Arguments. */ - int flags; /* Flags to pass to Tk_ConfigureWidget. */ + int argc, /* Number of valid entries in argv. */ + char **argv, /* Arguments. */ + int flags /* Flags to pass to Tk_ConfigureWidget. */ +) { int oldExport = textPtr->exportSelection; int charWidth, charHeight; @@ -773,9 +777,10 @@ ConfigureText(interp, textPtr, argc, argv, flags) */ static void -TextEventProc(clientData, eventPtr) - ClientData clientData; /* Information about window. */ - register XEvent *eventPtr; /* Information about event. */ +TextEventProc( + ClientData clientData, /* Information about window. */ + register XEvent *eventPtr /* Information about event. */ +) { register TkText *textPtr = (TkText *) clientData; @@ -813,13 +818,15 @@ TextEventProc(clientData, eventPtr) *---------------------------------------------------------------------- */ -static void -InsertChars(textPtr, line, ch, string) - TkText *textPtr; /* Overall information about text widget. */ - int line, ch; /* Identifies character just before which +static void +InsertChars ( + TkText *textPtr, /* Overall information about text widget. */ + int line, + int ch, /* Identifies character just before which * new information is to be inserted. */ - char *string; /* Null-terminated string containing new + char *string /* Null-terminated string containing new * information to add to text. */ +) { register TkTextLine *linePtr; @@ -870,12 +877,15 @@ InsertChars(textPtr, line, ch, string) *---------------------------------------------------------------------- */ -static void -DeleteChars(textPtr, line1, ch1, line2, ch2) - TkText *textPtr; /* Overall information about text widget. */ - int line1, ch1; /* Position of first character to delete. */ - int line2, ch2; /* Position of character just after last +static void +DeleteChars ( + TkText *textPtr, /* Overall information about text widget. */ + int line1, + int ch1, /* Position of first character to delete. */ + int line2, + int ch2 /* Position of character just after last * one to delete. */ +) { register TkTextLine *line1Ptr, *line2Ptr; int numLines, topLine; @@ -1021,15 +1031,16 @@ DeleteChars(textPtr, line1, ch1, line2, ch2) */ static int -TextFetchSelection(clientData, offset, buffer, maxBytes) - ClientData clientData; /* Information about text widget. */ - int offset; /* Offset within selection of first +TextFetchSelection( + ClientData clientData, /* Information about text widget. */ + int offset, /* Offset within selection of first * character to be returned. */ - char *buffer; /* Location in which to place + char *buffer, /* Location in which to place * selection. */ - int maxBytes; /* Maximum number of bytes to place + int maxBytes /* Maximum number of bytes to place * at buffer, not including terminating * NULL character. */ +) { register TkText *textPtr = (TkText *) clientData; register TkTextLine *linePtr; @@ -1152,8 +1163,9 @@ TextFetchSelection(clientData, offset, buffer, maxBytes) */ void -TkTextLostSelection(clientData) - ClientData clientData; /* Information about text widget. */ +TkTextLostSelection( + ClientData clientData /* Information about text widget. */ +) { register TkText *textPtr = (TkText *) clientData; @@ -1190,14 +1202,15 @@ TkTextLostSelection(clientData) *-------------------------------------------------------------- */ -static int -TextMarkCmd(textPtr, interp, argc, argv) - register TkText *textPtr; /* Information about text widget. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. Someone else has already +static int +TextMarkCmd ( + register TkText *textPtr, /* Information about text widget. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. Someone else has already * parsed this command enough to know that * argv[1] is "mark". */ +) { int length, line, ch, i; char c; @@ -1284,12 +1297,13 @@ TextMarkCmd(textPtr, interp, argc, argv) */ TkAnnotation * -TkTextSetMark(textPtr, name, line, ch) - TkText *textPtr; /* Text widget in which to create mark. */ - char *name; /* Name of mark to set. */ - int line; /* Index of line at which to place mark. */ - int ch; /* Index of character within line at which +TkTextSetMark ( + TkText *textPtr, /* Text widget in which to create mark. */ + char *name, /* Name of mark to set. */ + int line, /* Index of line at which to place mark. */ + int ch /* Index of character within line at which * to place mark. */ +) { Tcl_HashEntry *hPtr; TkAnnotation *markPtr; @@ -1375,8 +1389,9 @@ TkTextSetMark(textPtr, name, line, ch) */ static void -TextBlinkProc(clientData) - ClientData clientData; /* Pointer to record describing text. */ +TextBlinkProc( + ClientData clientData /* Pointer to record describing text. */ +) { register TkText *textPtr = (TkText *) clientData; int lineNum; @@ -1416,10 +1431,11 @@ TextBlinkProc(clientData) */ static void -TextFocusProc(clientData, gotFocus) - ClientData clientData; /* Pointer to structure describing text. */ - int gotFocus; /* 1 means window is getting focus, 0 means +TextFocusProc( + ClientData clientData, /* Pointer to structure describing text. */ + int gotFocus /* 1 means window is getting focus, 0 means * it's losing it. */ +) { register TkText *textPtr = (TkText *) clientData; int lineNum; @@ -1458,14 +1474,15 @@ TextFocusProc(clientData, gotFocus) *-------------------------------------------------------------- */ -static int -TextScanCmd(textPtr, interp, argc, argv) - register TkText *textPtr; /* Information about text widget. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. Someone else has already +static int +TextScanCmd ( + register TkText *textPtr, /* Information about text widget. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. Someone else has already * parsed this command enough to know that * argv[1] is "tag". */ +) { int length, y, line, lastLine; char c; diff --git a/src/tk/tktrig.c b/src/tk/tktrig.c index 88a9cdc..203c3a2 100644 --- a/src/tk/tktrig.c +++ b/src/tk/tktrig.c @@ -49,11 +49,12 @@ static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkTrig.c,v 1.8 92/08/24 0 *-------------------------------------------------------------- */ -double -TkLineToPoint(end1Ptr, end2Ptr, pointPtr) - double end1Ptr[2]; /* Coordinates of first end-point of line. */ - double end2Ptr[2]; /* Coordinates of second end-point of line. */ - double pointPtr[2]; /* Points to coords for point. */ +double +TkLineToPoint ( + double end1Ptr[2], /* Coordinates of first end-point of line. */ + double end2Ptr[2], /* Coordinates of second end-point of line. */ + double pointPtr[2] /* Points to coords for point. */ +) { double x, y; @@ -153,15 +154,16 @@ TkLineToPoint(end1Ptr, end2Ptr, pointPtr) *-------------------------------------------------------------- */ -int -TkLineToArea(end1Ptr, end2Ptr, rectPtr) - double end1Ptr[2]; /* X and y coordinates for one endpoint +int +TkLineToArea ( + double end1Ptr[2], /* X and y coordinates for one endpoint * of line. */ - double end2Ptr[2]; /* X and y coordinates for other endpoint + double end2Ptr[2], /* X and y coordinates for other endpoint * of line. */ - double rectPtr[4]; /* Points to coords for rectangle, in the + double rectPtr[4] /* Points to coords for rectangle, in the * order x1, y1, x2, y2. X1 must be no * larger than x2, and y1 no larger than y2. */ +) { int inside1, inside2; @@ -291,13 +293,14 @@ TkLineToArea(end1Ptr, end2Ptr, rectPtr) *-------------------------------------------------------------- */ -double -TkPolygonToPoint(polyPtr, numPoints, pointPtr) - double *polyPtr; /* Points to an array coordinates for +double +TkPolygonToPoint ( + double *polyPtr, /* Points to an array coordinates for * closed polygon: x0, y0, x1, y1, ... * The polygon may be self-intersecting. */ - int numPoints; /* Total number of points at *polyPtr. */ - double *pointPtr; /* Points to coords for point. */ + int numPoints, /* Total number of points at *polyPtr. */ + double *pointPtr /* Points to coords for point. */ +) { double bestDist; /* Closest distance between point and * any edge in polygon. */ @@ -449,15 +452,16 @@ TkPolygonToPoint(polyPtr, numPoints, pointPtr) *-------------------------------------------------------------- */ -int -TkPolygonToArea(polyPtr, numPoints, rectPtr) - double *polyPtr; /* Points to an array coordinates for +int +TkPolygonToArea ( + double *polyPtr, /* Points to an array coordinates for * closed polygon: x0, y0, x1, y1, ... * The polygon may be self-intersecting. */ - int numPoints; /* Total number of points at *polyPtr. */ - register double *rectPtr; /* Points to coords for rectangle, in the + int numPoints, /* Total number of points at *polyPtr. */ + register double *rectPtr /* Points to coords for rectangle, in the * order x1, y1, x2, y2. X1 and y1 must * be lower-left corner. */ +) { int state; /* State of all edges seen so far (-1 means * outside, 1 means inside, won't ever be @@ -522,15 +526,16 @@ TkPolygonToArea(polyPtr, numPoints, rectPtr) */ /* ARGSUSED */ -double -TkOvalToPoint(ovalPtr, width, filled, pointPtr) - double ovalPtr[4]; /* Pointer to array of four coordinates +double +TkOvalToPoint ( + double ovalPtr[4], /* Pointer to array of four coordinates * (x1, y1, x2, y2) defining oval's bounding * box. */ - double width; /* Width of outline for oval. */ - int filled; /* Non-zero means oval should be treated as + double width, /* Width of outline for oval. */ + int filled, /* Non-zero means oval should be treated as * filled; zero means only consider outline. */ - double pointPtr[2]; /* Coordinates of point. */ + double pointPtr[2] /* Coordinates of point. */ +) { double xDelta, yDelta, scaledDistance, distToOutline, distToCenter; @@ -601,15 +606,16 @@ TkOvalToPoint(ovalPtr, width, filled, pointPtr) *-------------------------------------------------------------- */ -int -TkOvalToArea(ovalPtr, rectPtr) - register double *ovalPtr; /* Points to coordinates definining the +int +TkOvalToArea ( + register double *ovalPtr, /* Points to coordinates definining the * bounding rectangle for the oval: x1, y1, * x2, y2. X1 must be less than x2 and y1 * less than y2. */ - register double *rectPtr; /* Points to coords for rectangle, in the + register double *rectPtr /* Points to coords for rectangle, in the * order x1, y1, x2, y2. X1 and y1 must * be lower-left corner. */ +) { double centerX, centerY, radX, radY, deltaX, deltaY; @@ -721,13 +727,14 @@ TkOvalToArea(ovalPtr, rectPtr) */ /* ARGSUSED */ -void -TkIncludePoint(canvasPtr, itemPtr, pointPtr) - Tk_Canvas *canvasPtr; /* Canvas containing item. */ - register Tk_Item *itemPtr; /* Item whose bounding box is +void +TkIncludePoint ( + Tk_Canvas *canvasPtr, /* Canvas containing item. */ + register Tk_Item *itemPtr, /* Item whose bounding box is * being calculated. */ - double *pointPtr; /* Address of two doubles giving + double *pointPtr /* Address of two doubles giving * x and y coordinates of point. */ +) { int tmp; @@ -768,16 +775,17 @@ TkIncludePoint(canvasPtr, itemPtr, pointPtr) *-------------------------------------------------------------- */ -void -TkBezierScreenPoints(canvasPtr, control, numSteps, xPointPtr) - Tk_Canvas *canvasPtr; /* Canvas in which curve is to be +void +TkBezierScreenPoints ( + Tk_Canvas *canvasPtr, /* Canvas in which curve is to be * drawn. */ - double control[]; /* Array of coordinates for four + double control[], /* Array of coordinates for four * control points: x0, y0, x1, y1, * ... x3 y3. */ - int numSteps; /* Number of curve points to + int numSteps, /* Number of curve points to * generate. */ - register XPoint *xPointPtr; /* Where to put new points. */ + register XPoint *xPointPtr /* Where to put new points. */ +) { int i; double u, u2, u3, t, t2, t3; @@ -817,14 +825,15 @@ TkBezierScreenPoints(canvasPtr, control, numSteps, xPointPtr) *-------------------------------------------------------------- */ -void -TkBezierPoints(control, numSteps, coordPtr) - double control[]; /* Array of coordinates for four +void +TkBezierPoints ( + double control[], /* Array of coordinates for four * control points: x0, y0, x1, y1, * ... x3 y3. */ - int numSteps; /* Number of curve points to + int numSteps, /* Number of curve points to * generate. */ - register double *coordPtr; /* Where to put new points. */ + register double *coordPtr /* Where to put new points. */ +) { int i; double u, u2, u3, t, t2, t3; @@ -865,25 +874,26 @@ TkBezierPoints(control, numSteps, coordPtr) *-------------------------------------------------------------- */ -int -TkMakeBezierCurve(canvasPtr, pointPtr, numPoints, numSteps, xPoints, dblPoints) - Tk_Canvas *canvasPtr; /* Canvas in which curve is to be +int +TkMakeBezierCurve ( + Tk_Canvas *canvasPtr, /* Canvas in which curve is to be * drawn. */ - double *pointPtr; /* Array of input coordinates: x0, + double *pointPtr, /* Array of input coordinates: x0, * y0, x1, y1, etc.. */ - int numPoints; /* Number of points at pointPtr. */ - int numSteps; /* Number of steps to use for each + int numPoints, /* Number of points at pointPtr. */ + int numSteps, /* Number of steps to use for each * spline segments (determines * smoothness of curve). */ - XPoint xPoints[]; /* Array of XPoints to fill in (e.g. + XPoint xPoints[], /* Array of XPoints to fill in (e.g. * for display. NULL means don't * fill in any XPoints. */ - double dblPoints[]; /* Array of points to fill in as + double dblPoints[] /* Array of points to fill in as * doubles, in the form x0, y0, * x1, y1, .... NULL means don't * fill in anything in this form. * Caller must make sure that this * array has enough space. */ +) { int closed, outputPoints, i; int numCoords = numPoints*2; @@ -1037,19 +1047,20 @@ TkMakeBezierCurve(canvasPtr, pointPtr, numPoints, numSteps, xPoints, dblPoints) *-------------------------------------------------------------- */ -int -TkGetMiterPoints(p1, p2, p3, width, m1, m2) - double p1[]; /* Points to x- and y-coordinates of point +int +TkGetMiterPoints ( + double p1[], /* Points to x- and y-coordinates of point * before vertex. */ - double p2[]; /* Points to x- and y-coordinates of vertex + double p2[], /* Points to x- and y-coordinates of vertex * for mitered joint. */ - double p3[]; /* Points to x- and y-coordinates of point + double p3[], /* Points to x- and y-coordinates of point * after vertex. */ - double width; /* Width of line. */ - double m1[]; /* Points to place to put "left" vertex + double width, /* Width of line. */ + double m1[], /* Points to place to put "left" vertex * point (see as you face from p1 to p2). */ - double m2[]; /* Points to place to put "right" vertex + double m2[] /* Points to place to put "right" vertex * point. */ +) { double theta1; /* Angle of segment p2-p1. */ double theta2; /* Angle of segment p2-p3. */ @@ -1146,19 +1157,20 @@ TkGetMiterPoints(p1, p2, p3, width, m1, m2) *-------------------------------------------------------------- */ -void -TkGetButtPoints(p1, p2, width, project, m1, m2) - double p1[]; /* Points to x- and y-coordinates of point +void +TkGetButtPoints ( + double p1[], /* Points to x- and y-coordinates of point * before vertex. */ - double p2[]; /* Points to x- and y-coordinates of vertex + double p2[], /* Points to x- and y-coordinates of vertex * for mitered joint. */ - double width; /* Width of line. */ - int project; /* Non-zero means project p2 by an additional + double width, /* Width of line. */ + int project, /* Non-zero means project p2 by an additional * width/2 before computing m1 and m2. */ - double m1[]; /* Points to place to put "left" result + double m1[], /* Points to place to put "left" result * point, as you face from p1 to p2. */ - double m2[]; /* Points to place to put "right" result + double m2[] /* Points to place to put "right" result * point. */ +) { double length; /* Length of p1-p2 segment. */ double deltaX, deltaY; /* Increments in coords. */ diff --git a/src/tk/tktxbtre.c b/src/tk/tktxbtre.c index d9245cf..66d6314 100644 --- a/src/tk/tktxbtre.c +++ b/src/tk/tktxbtre.c @@ -145,8 +145,8 @@ static void RecomputeNodeCounts _ANSI_ARGS_((Node *nodePtr)); *---------------------------------------------------------------------- */ -TkTextBTree -TkBTreeCreate() +TkTextBTree +TkBTreeCreate (void) { register BTree *treePtr; register Node *rootPtr; @@ -192,9 +192,10 @@ TkBTreeCreate() *---------------------------------------------------------------------- */ -void -TkBTreeDestroy(tree) - TkTextBTree tree; /* Pointer to tree to delete. */ +void +TkBTreeDestroy ( + TkTextBTree tree /* Pointer to tree to delete. */ +) { BTree *treePtr = (BTree *) tree; @@ -219,9 +220,8 @@ TkBTreeDestroy(tree) *---------------------------------------------------------------------- */ -static void -DestroyNode(nodePtr) - register Node *nodePtr; +static void +DestroyNode (register Node *nodePtr) { if (nodePtr->level == 0) { register TkTextLine *curPtr, *nextLinePtr; @@ -269,10 +269,11 @@ DestroyNode(nodePtr) *---------------------------------------------------------------------- */ -static void -DeleteSummaries(summaryPtr) - register Summary *summaryPtr; /* First in list of node's tag +static void +DeleteSummaries ( + register Summary *summaryPtr /* First in list of node's tag * summaries. */ +) { register Summary *nextPtr; while (summaryPtr != NULL) { @@ -300,17 +301,18 @@ DeleteSummaries(summaryPtr) *---------------------------------------------------------------------- */ -void -TkBTreeInsertChars(tree, linePtr, ch, string) - TkTextBTree tree; /* B-tree in which to insert. */ - register TkTextLine *linePtr; /* Pointer to line in which to +void +TkBTreeInsertChars ( + TkTextBTree tree, /* B-tree in which to insert. */ + register TkTextLine *linePtr, /* Pointer to line in which to * insert. */ - int ch; /* Index of character before which + int ch, /* Index of character before which * to insert. Must not be after * last character in line.*/ - char *string; /* Pointer to bytes to insert (may + char *string /* Pointer to bytes to insert (may * contain newlines, must be null- * terminated). */ +) { BTree *treePtr = (BTree *) tree; register Node *nodePtr; @@ -508,17 +510,18 @@ TkBTreeInsertChars(tree, linePtr, ch, string) *---------------------------------------------------------------------- */ -void -TkBTreeDeleteChars(tree, line1Ptr, ch1, line2Ptr, ch2) - TkTextBTree tree; /* B-tree in which to delete. */ - register TkTextLine *line1Ptr; /* Line containing first character +void +TkBTreeDeleteChars ( + TkTextBTree tree, /* B-tree in which to delete. */ + register TkTextLine *line1Ptr, /* Line containing first character * to delete. */ - int ch1; /* Index within linePtr1 of first + int ch1, /* Index within linePtr1 of first * character to delete. */ - register TkTextLine *line2Ptr; /* Line containing character just + register TkTextLine *line2Ptr, /* Line containing character just * after last one to delete. */ - int ch2; /* Index within linePtr2 of character + int ch2 /* Index within linePtr2 of character * just after last one to delete. */ +) { BTree *treePtr = (BTree *) tree; TkTextLine *linePtr, *nextPtr, *prevLinePtr; @@ -778,19 +781,22 @@ TkBTreeDeleteChars(tree, line1Ptr, ch1, line2Ptr, ch2) *---------------------------------------------------------------------- */ -void -TkBTreeTag(tree, line1, ch1, line2, ch2, tagPtr, add) - TkTextBTree tree; /* B-tree in which to add tag +void +TkBTreeTag ( + TkTextBTree tree, /* B-tree in which to add tag * information. */ - int line1, ch1; /* Position of first character to + int line1, + int ch1, /* Position of first character to * tag. */ - int line2, ch2; /* Position of character just after + int line2, + int ch2, /* Position of character just after * last one to tag. */ - TkTextTag *tagPtr; /* Tag to associate with the range + TkTextTag *tagPtr, /* Tag to associate with the range * of characters. */ - int add; /* One means add tag to the given + int add /* One means add tag to the given * range of characters; zero means * remove the tag from the range. */ +) { BTree *treePtr = (BTree *) tree; register TkTextLine *line1Ptr, *line2Ptr; @@ -901,13 +907,14 @@ TkBTreeTag(tree, line1, ch1, line2, ch2, tagPtr, add) */ /* ARGSUSED */ -void -TkBTreeAddAnnotation(annotPtr) - TkAnnotation *annotPtr; /* Pointer to annotation. The caller must +void +TkBTreeAddAnnotation ( + TkAnnotation *annotPtr /* Pointer to annotation. The caller must * have filled in all the fields except the * "nextPtr" field. The type should NOT be * TK_ANNOT_TOGGLE; these annotations are * managed by the TkBTreeTag procedure. */ +) { register TkAnnotation *annotPtr2, *prevPtr; @@ -946,11 +953,12 @@ TkBTreeAddAnnotation(annotPtr) */ /* ARGSUSED */ -void -TkBTreeRemoveAnnotation(annotPtr) - TkAnnotation *annotPtr; /* Pointer to annotation, which must +void +TkBTreeRemoveAnnotation ( + TkAnnotation *annotPtr /* Pointer to annotation, which must * have been linked into tree by a previous * call to TkBTreeAddAnnotation. */ +) { register TkAnnotation *prevPtr; @@ -989,9 +997,10 @@ TkBTreeRemoveAnnotation(annotPtr) */ TkTextLine * -TkBTreeFindLine(tree, line) - TkTextBTree tree; /* B-tree in which to find line. */ - int line; /* Index of desired line. */ +TkBTreeFindLine ( + TkTextBTree tree, /* B-tree in which to find line. */ + int line /* Index of desired line. */ +) { BTree *treePtr = (BTree *) tree; register Node *nodePtr; @@ -1054,9 +1063,10 @@ TkBTreeFindLine(tree, line) */ TkTextLine * -TkBTreeNextLine(linePtr) - register TkTextLine *linePtr; /* Pointer to existing line in +TkBTreeNextLine ( + register TkTextLine *linePtr /* Pointer to existing line in * B-tree. */ +) { register Node *nodePtr; @@ -1103,10 +1113,11 @@ TkBTreeNextLine(linePtr) *---------------------------------------------------------------------- */ -int -TkBTreeLineIndex(linePtr) - TkTextLine *linePtr; /* Pointer to existing line in +int +TkBTreeLineIndex ( + TkTextLine *linePtr /* Pointer to existing line in * B-tree. */ +) { register TkTextLine *linePtr2; register Node *nodePtr, *parentPtr, *nodePtr2; @@ -1166,17 +1177,20 @@ TkBTreeLineIndex(linePtr) *---------------------------------------------------------------------- */ -void -TkBTreeStartSearch(tree, line1, ch1, line2, ch2, tagPtr, searchPtr) - TkTextBTree tree; /* Tree to search. */ - int line1, ch1; /* Character position at which to * start search (tags at this position +void +TkBTreeStartSearch ( + TkTextBTree tree, /* Tree to search. */ + int line1, + int ch1, /* Character position at which to * start search (tags at this position * will be returned). */ - int line2, ch2; /* Character position at which to * stop search (tags at this position + int line2, + int ch2, /* Character position at which to * stop search (tags at this position * will be returned). */ - TkTextTag *tagPtr; /* Tag to search for. NULL means + TkTextTag *tagPtr, /* Tag to search for. NULL means * search for any tag. */ - register TkTextSearch *searchPtr; /* Where to store information about + register TkTextSearch *searchPtr /* Where to store information about * search's progress. */ +) { register TkAnnotation *annotPtr; @@ -1230,11 +1244,12 @@ TkBTreeStartSearch(tree, line1, ch1, line2, ch2, tagPtr, searchPtr) *---------------------------------------------------------------------- */ -int -TkBTreeNextTag(searchPtr) - register TkTextSearch *searchPtr; /* Information about search in +int +TkBTreeNextTag ( + register TkTextSearch *searchPtr /* Information about search in * progress; must have been set up by * call to TkBTreeStartSearch. */ +) { register TkAnnotation *annotPtr; register Node *nodePtr; @@ -1378,9 +1393,10 @@ TkBTreeNextTag(searchPtr) *---------------------------------------------------------------------- */ -void -TkBTreeCheck(tree) - TkTextBTree tree; /* Tree to check. */ +void +TkBTreeCheck ( + TkTextBTree tree /* Tree to check. */ +) { BTree *treePtr = (BTree *) tree; register Summary *summaryPtr; @@ -1423,10 +1439,11 @@ TkBTreeCheck(tree) *---------------------------------------------------------------------- */ -static void -Rebalance(treePtr, nodePtr) - BTree *treePtr; /* Tree that is being rebalanced. */ - register Node *nodePtr; /* Node that may be out of balance. */ +static void +Rebalance ( + BTree *treePtr, /* Tree that is being rebalanced. */ + register Node *nodePtr /* Node that may be out of balance. */ +) { /* * Loop over the entire ancestral chain of the node, working up @@ -1649,10 +1666,11 @@ Rebalance(treePtr, nodePtr) *---------------------------------------------------------------------- */ -static void -RecomputeNodeCounts(nodePtr) - register Node *nodePtr; /* Node whose tag summary information +static void +RecomputeNodeCounts ( + register Node *nodePtr /* Node whose tag summary information * must be recomputed. */ +) { register Summary *summaryPtr, *summaryPtr2; register Node *childPtr; @@ -1775,13 +1793,14 @@ RecomputeNodeCounts(nodePtr) *---------------------------------------------------------------------- */ -static void -AddToggleToLine(linePtr, index, tagPtr) - TkTextLine *linePtr; /* Line within which to add +static void +AddToggleToLine ( + TkTextLine *linePtr, /* Line within which to add * transition. */ - int index; /* Character before which to + int index, /* Character before which to * add transition. */ - TkTextTag *tagPtr; /* Information about tag. */ + TkTextTag *tagPtr /* Information about tag. */ +) { register TkAnnotation *annotPtr, *prevPtr; int delta = 1; @@ -1857,13 +1876,14 @@ AddToggleToLine(linePtr, index, tagPtr) *---------------------------------------------------------------------- */ -static void -ChangeNodeToggleCount(nodePtr, tagPtr, delta) - register Node *nodePtr; /* Node whose toggle count for a tag +static void +ChangeNodeToggleCount ( + register Node *nodePtr, /* Node whose toggle count for a tag * must be changed. */ - TkTextTag *tagPtr; /* Information about tag. */ - int delta; /* Amount to add to current toggle + TkTextTag *tagPtr, /* Information about tag. */ + int delta /* Amount to add to current toggle * count for tag (may be negative). */ +) { register Summary *summaryPtr, *prevPtr; @@ -1939,12 +1959,13 @@ ChangeNodeToggleCount(nodePtr, tagPtr, delta) *---------------------------------------------------------------------- */ -int -TkBTreeCharTagged(linePtr, ch, tagPtr) - TkTextLine *linePtr; /* Line containing character of +int +TkBTreeCharTagged ( + TkTextLine *linePtr, /* Line containing character of * interest. */ - int ch; /* Index of character in linePtr. */ - TkTextTag *tagPtr; /* Tag of interest. */ + int ch, /* Index of character in linePtr. */ + TkTextTag *tagPtr /* Tag of interest. */ +) { register Node *nodePtr; register TkTextLine *siblingLinePtr; @@ -2029,13 +2050,14 @@ TkBTreeCharTagged(linePtr, ch, tagPtr) /* ARGSUSED */ TkTextTag ** -TkBTreeGetTags(tree, linePtr, ch, numTagsPtr) - TkTextBTree tree; /* Tree to check. */ - TkTextLine *linePtr; /* Line containing character of interest. */ - int ch; /* Index within linePtr of character for +TkBTreeGetTags ( + TkTextBTree tree, /* Tree to check. */ + TkTextLine *linePtr, /* Line containing character of interest. */ + int ch, /* Index within linePtr of character for * which tag information is wanted. */ - int *numTagsPtr; /* Store number of tags found at this + int *numTagsPtr /* Store number of tags found at this * location. */ +) { register Node *nodePtr; register TkTextLine *siblingLinePtr; @@ -2132,12 +2154,13 @@ TkBTreeGetTags(tree, linePtr, ch, numTagsPtr) *---------------------------------------------------------------------- */ -static void -IncCount(tagPtr, inc, tagInfoPtr) - TkTextTag *tagPtr; /* Handle for tag. */ - int inc; /* Amount by which to increment tag count. */ - TagInfo *tagInfoPtr; /* Holds cumulative information about tags; +static void +IncCount ( + TkTextTag *tagPtr, /* Handle for tag. */ + int inc, /* Amount by which to increment tag count. */ + TagInfo *tagInfoPtr /* Holds cumulative information about tags; * increment count here. */ +) { register TkTextTag **tagPtrPtr; int count; @@ -2199,10 +2222,11 @@ IncCount(tagPtr, inc, tagInfoPtr) *---------------------------------------------------------------------- */ -static void -CheckNodeConsistency(nodePtr) - register Node *nodePtr; /* Node whose subtree should be +static void +CheckNodeConsistency ( + register Node *nodePtr /* Node whose subtree should be * checked. */ +) { register Node *childNodePtr; register Summary *summaryPtr, *summaryPtr2; @@ -2366,9 +2390,10 @@ CheckNodeConsistency(nodePtr) *---------------------------------------------------------------------- */ -int -TkBTreeNumLines(tree) - TkTextBTree tree; /* Information about tree. */ +int +TkBTreeNumLines ( + TkTextBTree tree /* Information about tree. */ +) { BTree *treePtr = (BTree *) tree; return treePtr->rootPtr->numLines; diff --git a/src/tk/tktxdisp.c b/src/tk/tktxdisp.c index c5f3c2a..a59f57f 100644 --- a/src/tk/tktxdisp.c +++ b/src/tk/tktxdisp.c @@ -247,9 +247,10 @@ static void UpdateDisplayInfo _ANSI_ARGS_((TkText *textPtr)); *---------------------------------------------------------------------- */ -void -TkTextCreateDInfo(textPtr) - TkText *textPtr; /* Overall information for text widget. */ +void +TkTextCreateDInfo ( + TkText *textPtr /* Overall information for text widget. */ +) { register DInfo *dInfoPtr; XGCValues gcValues; @@ -284,9 +285,10 @@ TkTextCreateDInfo(textPtr) *---------------------------------------------------------------------- */ -void -TkTextFreeDInfo(textPtr) - TkText *textPtr; /* Overall information for text widget. */ +void +TkTextFreeDInfo ( + TkText *textPtr /* Overall information for text widget. */ +) { register DInfo *dInfoPtr = textPtr->dInfoPtr; @@ -332,9 +334,10 @@ TkTextFreeDInfo(textPtr) */ static Style * -GetStyle(textPtr, sValuePtr) - TkText *textPtr; /* Overall information about text widget. */ - StyleValues *sValuePtr; /* Information about desired style. */ +GetStyle( + TkText *textPtr, /* Overall information about text widget. */ + StyleValues *sValuePtr /* Information about desired style. */ +) { Style *stylePtr; Tcl_HashEntry *hPtr; @@ -404,9 +407,10 @@ GetStyle(textPtr, sValuePtr) *---------------------------------------------------------------------- */ -static void -FreeStyle(stylePtr) - register Style *stylePtr; /* Information about style to be freed. */ +static void +FreeStyle ( + register Style *stylePtr /* Information about style to be freed. */ +) { stylePtr->refCount--; @@ -440,11 +444,12 @@ FreeStyle(stylePtr) */ static void -ComputeStyleValues(textPtr, numTags, tagPtrPtr, sValuePtr) - TkText *textPtr; /* Overall information for widget. */ - int numTags; /* Number of tags at *tagPtr. */ - register TkTextTag **tagPtrPtr; /* Pointer to array of tag pointers. */ - register StyleValues *sValuePtr; /* Pointer to structure to fill in. */ +ComputeStyleValues( + TkText *textPtr, /* Overall information for widget. */ + int numTags, /* Number of tags at *tagPtr. */ + register TkTextTag **tagPtrPtr, /* Pointer to array of tag pointers. */ + register StyleValues *sValuePtr /* Pointer to structure to fill in. */ +) { register TkTextTag *tagPtr; @@ -522,13 +527,14 @@ ComputeStyleValues(textPtr, numTags, tagPtrPtr, sValuePtr) */ static DLine * -LayoutLine(textPtr, line, linePtr, tInfoPtr) - TkText *textPtr; /* Overall information about text widget. */ - int line; /* Index of line to layout. */ - TkTextLine *linePtr; /* Line to layout (corresponds to line). */ - TagInfo *tInfoPtr; /* Information to help keep track of tags. +LayoutLine ( + TkText *textPtr, /* Overall information about text widget. */ + int line, /* Index of line to layout. */ + TkTextLine *linePtr, /* Line to layout (corresponds to line). */ + TagInfo *tInfoPtr /* Information to help keep track of tags. * Caller must have initialized to correspond * to state just before start of line. */ +) { DLine *firstLinePtr; DLine *lastLinePtr = NULL; /* Initializations needed only to stop */ @@ -767,11 +773,12 @@ LayoutLine(textPtr, line, linePtr, tInfoPtr) *---------------------------------------------------------------------- */ -static void -ToggleTag(tInfoPtr, tagPtr) - register TagInfo *tInfoPtr; /* Tag information to be updated. */ - TkTextTag *tagPtr; /* Tag to be toggled into or out of +static void +ToggleTag ( + register TagInfo *tInfoPtr, /* Tag information to be updated. */ + TkTextTag *tagPtr /* Tag to be toggled into or out of * *tInfoPtr. */ +) { register TkTextTag **tagPtrPtr; int i; @@ -830,9 +837,10 @@ ToggleTag(tInfoPtr, tagPtr) *---------------------------------------------------------------------- */ -static void -UpdateDisplayInfo(textPtr) - TkText *textPtr; /* Text widget to update. */ +static void +UpdateDisplayInfo ( + TkText *textPtr /* Text widget to update. */ +) { register DInfo *dInfoPtr = textPtr->dInfoPtr; register DLine *dlPtr, *prevPtr, *dlPtr2; @@ -980,19 +988,20 @@ UpdateDisplayInfo(textPtr) *---------------------------------------------------------------------- */ -static void -FreeDLines(textPtr, firstPtr, lastPtr, unlink) - TkText *textPtr; /* Information about overall text +static void +FreeDLines ( + TkText *textPtr, /* Information about overall text * widget. */ - register DLine *firstPtr; /* Pointer to first DLine to free up. */ - DLine *lastPtr; /* Pointer to DLine just after last + register DLine *firstPtr, /* Pointer to first DLine to free up. */ + DLine *lastPtr, /* Pointer to DLine just after last * one to free (NULL means everything * starting with firstPtr). */ - int unlink; /* 1 means DLines are currently linked + int unlink /* 1 means DLines are currently linked * into the list rooted at * textPtr->dInfoPtr->dLinePtr and * they have to be unlinked. 0 means * just free without unlinking. */ +) { register Chunk *chunkPtr, *nextChunkPtr; register DLine *nextDLinePtr; @@ -1041,13 +1050,14 @@ FreeDLines(textPtr, firstPtr, lastPtr, unlink) *---------------------------------------------------------------------- */ -static void -DisplayDLine(textPtr, dlPtr, pixmap) - TkText *textPtr; /* Text widget in which to draw line. */ - register DLine *dlPtr; /* Information about line to draw. */ - Pixmap pixmap; /* Pixmap to use for double-buffering. +static void +DisplayDLine ( + TkText *textPtr, /* Text widget in which to draw line. */ + register DLine *dlPtr, /* Information about line to draw. */ + Pixmap pixmap /* Pixmap to use for double-buffering. * Caller must make sure it's large enough * to hold line. */ +) { register Style *stylePtr; register StyleValues *sValuePtr; @@ -1228,9 +1238,10 @@ DisplayDLine(textPtr, dlPtr, pixmap) *---------------------------------------------------------------------- */ -static void -DisplayText(clientData) - ClientData clientData; /* Information about widget. */ +static void +DisplayText ( + ClientData clientData /* Information about widget. */ +) { register TkText *textPtr = (TkText *) clientData; DInfo *dInfoPtr = textPtr->dInfoPtr; @@ -1458,13 +1469,16 @@ DisplayText(clientData) */ /* ARGSUSED */ -void -TkTextRedrawRegion(textPtr, x, y, width, height) - TkText *textPtr; /* Widget record for text widget. */ - int x, y; /* Coordinates of upper-left corner of area +void +TkTextRedrawRegion ( + TkText *textPtr, /* Widget record for text widget. */ + int x, + int y, /* Coordinates of upper-left corner of area * to be redrawn, in pixels relative to * textPtr's window. */ - int width, height; /* Width and height of area to be redrawn. */ + int width, + int height /* Width and height of area to be redrawn. */ +) { register DLine *dlPtr; DInfo *dInfoPtr = textPtr->dInfoPtr; @@ -1531,12 +1545,13 @@ TkTextRedrawRegion(textPtr, x, y, width, height) *---------------------------------------------------------------------- */ -void -TkTextLinesChanged(textPtr, first, last) - TkText *textPtr; /* Widget record for text widget. */ - int first; /* Index of first line that must be +void +TkTextLinesChanged ( + TkText *textPtr, /* Widget record for text widget. */ + int first, /* Index of first line that must be * redisplayed. */ - int last; /* Index of last line to redisplay. */ + int last /* Index of last line to redisplay. */ +) { DInfo *dInfoPtr = textPtr->dInfoPtr; DLine *firstPtr, *lastPtr; @@ -1599,16 +1614,19 @@ TkTextLinesChanged(textPtr, first, last) *---------------------------------------------------------------------- */ -void -TkTextRedrawTag(textPtr, line1, ch1, line2, ch2, tagPtr, withTag) - TkText *textPtr; /* Widget record for text widget. */ - int line1, ch1; /* Index of first character in range of +void +TkTextRedrawTag ( + TkText *textPtr, /* Widget record for text widget. */ + int line1, + int ch1, /* Index of first character in range of * interest. */ - int line2, ch2; /* Index of character just after last one + int line2, + int ch2, /* Index of character just after last one * in range of interest. */ - TkTextTag *tagPtr; /* Information about tag. */ - int withTag; /* 1 means redraw characters that have the + TkTextTag *tagPtr, /* Information about tag. */ + int withTag /* 1 means redraw characters that have the * tag, 0 means redraw those without. */ +) { register DLine *dlPtr; DLine *endPtr; @@ -1732,9 +1750,10 @@ TkTextRedrawTag(textPtr, line1, ch1, line2, ch2, tagPtr, withTag) *---------------------------------------------------------------------- */ -void -TkTextRelayoutWindow(textPtr) - TkText *textPtr; /* Widget record for text widget. */ +void +TkTextRelayoutWindow ( + TkText *textPtr /* Widget record for text widget. */ +) { DInfo *dInfoPtr = textPtr->dInfoPtr; @@ -1788,16 +1807,17 @@ TkTextRelayoutWindow(textPtr) *---------------------------------------------------------------------- */ -void -TkTextSetView(textPtr, line, pickPlace) - TkText *textPtr; /* Widget record for text widget. */ - int line; /* Number of line that is to appear somewhere +void +TkTextSetView ( + TkText *textPtr, /* Widget record for text widget. */ + int line, /* Number of line that is to appear somewhere * in the window. This line number must * be a valid one in the file. */ - int pickPlace; /* 0 means topLine must appear at top of + int pickPlace /* 0 means topLine must appear at top of * screen. 1 means we get to pick where it * appears: minimize screen motion or else * display line at center of screen. */ +) { DInfo *dInfoPtr = textPtr->dInfoPtr; register DLine *dlPtr, *dlPtr2; @@ -1950,10 +1970,11 @@ TkTextSetView(textPtr, line, pickPlace) */ static DLine * -FindDLine(dlPtr, line) - register DLine *dlPtr; /* Pointer to first in list of DLines +FindDLine ( + register DLine *dlPtr, /* Pointer to first in list of DLines * to search. */ - int line; /* Line number in text that is desired. */ + int line /* Line number in text that is desired. */ +) { TkTextLine *linePtr; int thisLine; @@ -2014,12 +2035,14 @@ FindDLine(dlPtr, line) */ TkTextLine * -TkTextCharAtLoc(textPtr, x, y, chPtr) - TkText *textPtr; /* Widget record for text widget. */ - int x, y; /* Pixel coordinates of point in widget's +TkTextCharAtLoc ( + TkText *textPtr, /* Widget record for text widget. */ + int x, + int y, /* Pixel coordinates of point in widget's * window. */ - int *chPtr; /* Place to store index-within-line of + int *chPtr /* Place to store index-within-line of * closest character. */ +) { DInfo *dInfoPtr = textPtr->dInfoPtr; register DLine *dlPtr; diff --git a/src/tk/tktxidx.c b/src/tk/tktxidx.c index 19ecf9d..db96d3b 100644 --- a/src/tk/tktxidx.c +++ b/src/tk/tktxidx.c @@ -58,13 +58,14 @@ static char * StartEnd _ANSI_ARGS_((TkText *textPtr, *---------------------------------------------------------------------- */ -int -TkTextGetIndex(interp, textPtr, string, lineIndexPtr, chPtr) - Tcl_Interp *interp; /* Use this for error reporting. */ - TkText *textPtr; /* Information about text widget. */ - char *string; /* Textual description of position. */ - int *lineIndexPtr; /* Store line number here. */ - int *chPtr; /* Store character position here. */ +int +TkTextGetIndex ( + Tcl_Interp *interp, /* Use this for error reporting. */ + TkText *textPtr, /* Information about text widget. */ + char *string, /* Textual description of position. */ + int *lineIndexPtr, /* Store line number here. */ + int *chPtr /* Store character position here. */ +) { register char *p; char *end, *endOfBase; @@ -263,12 +264,13 @@ TkTextGetIndex(interp, textPtr, string, lineIndexPtr, chPtr) *---------------------------------------------------------------------- */ -void -TkTextPrintIndex(line, ch, string) - int line; /* Line number. */ - int ch; /* Character position within line. */ - char *string; /* Place to store the position. Must have +void +TkTextPrintIndex ( + int line, /* Line number. */ + int ch, /* Character position within line. */ + char *string /* Place to store the position. Must have * at least POS_CHARS characters. */ +) { sprintf(string, "%d.%d", line+1, ch); } @@ -297,14 +299,15 @@ TkTextPrintIndex(line, ch, string) TkTextLine * -TkTextRoundIndex(textPtr, lineIndexPtr, chPtr) - TkText *textPtr; /* Information about text widget. */ - int *lineIndexPtr; /* Points to initial line index, +TkTextRoundIndex ( + TkText *textPtr, /* Information about text widget. */ + int *lineIndexPtr, /* Points to initial line index, * which is overwritten with actual * line index. */ - int *chPtr; /* Points to initial character index, + int *chPtr /* Points to initial character index, * which is overwritten with actual * character index. */ +) { int line, ch, lastLine; TkTextLine *linePtr; @@ -361,17 +364,18 @@ TkTextRoundIndex(textPtr, lineIndexPtr, chPtr) */ static char * -ForwBack(textPtr, string, lineIndexPtr, chPtr) - TkText *textPtr; /* Information about widget that index +ForwBack ( + TkText *textPtr, /* Information about widget that index * refers to. */ - char *string; /* String to parse for additional info + char *string, /* String to parse for additional info * about modifier (count and units). * Points to "+" or "-" that starts * modifier. */ - int *lineIndexPtr; /* Points to current line index, which will + int *lineIndexPtr, /* Points to current line index, which will * be updated to reflect modifier. */ - int *chPtr; /* Points to current character index, which + int *chPtr /* Points to current character index, which * will be updated to reflect modifier. */ +) { register char *p; char *end, *units; @@ -459,19 +463,20 @@ ForwBack(textPtr, string, lineIndexPtr, chPtr) */ /* ARGSUSED */ -static void -ForwardChars(textPtr, linePtr, lineIndexPtr, chPtr, count) - TkText *textPtr; /* Information about text widget. */ - register TkTextLine *linePtr; /* Text line corresponding to +static void +ForwardChars ( + TkText *textPtr, /* Information about text widget. */ + register TkTextLine *linePtr, /* Text line corresponding to * *lineIndexPtr. */ - int *lineIndexPtr; /* Points to initial line index, + int *lineIndexPtr, /* Points to initial line index, * which is overwritten with final * line index. */ - int *chPtr; /* Points to initial character index, + int *chPtr, /* Points to initial character index, * which is overwritten with final * character index. */ - int count; /* How many characters forward to + int count /* How many characters forward to * move. Must not be negative. */ +) { TkTextLine *nextPtr; int bytesInLine; @@ -513,19 +518,20 @@ ForwardChars(textPtr, linePtr, lineIndexPtr, chPtr, count) *---------------------------------------------------------------------- */ -static void -BackwardChars(textPtr, linePtr, lineIndexPtr, chPtr, count) - TkText *textPtr; /* Information about text widget. */ - register TkTextLine *linePtr; /* Text line corresponding to +static void +BackwardChars ( + TkText *textPtr, /* Information about text widget. */ + register TkTextLine *linePtr, /* Text line corresponding to * *lineIndexPtr. */ - int *lineIndexPtr; /* Points to initial line index, + int *lineIndexPtr, /* Points to initial line index, * which is overwritten with final * line index. */ - int *chPtr; /* Points to initial character index, + int *chPtr, /* Points to initial character index, * which is overwritten with final * character index. */ - int count; /* How many characters backward to + int count /* How many characters backward to * move. Must not be negative. */ +) { int bytesInLine; @@ -567,17 +573,18 @@ BackwardChars(textPtr, linePtr, lineIndexPtr, chPtr, count) */ static char * -StartEnd(textPtr, string, lineIndexPtr, chPtr) - TkText *textPtr; /* Information about widget that index +StartEnd ( + TkText *textPtr, /* Information about widget that index * refers to. */ - char *string; /* String to parse for additional info + char *string, /* String to parse for additional info * about modifier (count and units). * Points to first character of modifer * word. */ - int *lineIndexPtr; /* Points to current line index, which will + int *lineIndexPtr, /* Points to current line index, which will * be updated to reflect modifier. */ - int *chPtr; /* Points to current character index, which + int *chPtr /* Points to current character index, which * will be updated to reflect modifier. */ +) { char *p, c; int length; diff --git a/src/tk/tktxtag.c b/src/tk/tktxtag.c index 79b4699..554dc36 100644 --- a/src/tk/tktxtag.c +++ b/src/tk/tktxtag.c @@ -90,14 +90,15 @@ static void TextDoEvent _ANSI_ARGS_((TkText *textPtr, *-------------------------------------------------------------- */ -int -TkTextTagCmd(textPtr, interp, argc, argv) - register TkText *textPtr; /* Information about text widget. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. Someone else has already +int +TkTextTagCmd ( + register TkText *textPtr, /* Information about text widget. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. Someone else has already * parsed this command enough to know that * argv[1] is "tag". */ +) { int length, line1, ch1, line2, ch2, i, addTag; char c; @@ -504,9 +505,10 @@ TkTextTagCmd(textPtr, interp, argc, argv) */ TkTextTag * -TkTextCreateTag(textPtr, tagName) - TkText *textPtr; /* Widget in which tag is being used. */ - char *tagName; /* Name of desired tag. */ +TkTextCreateTag ( + TkText *textPtr, /* Widget in which tag is being used. */ + char *tagName /* Name of desired tag. */ +) { register TkTextTag *tagPtr; Tcl_HashEntry *hPtr; @@ -558,12 +560,13 @@ TkTextCreateTag(textPtr, tagName) */ static TkTextTag * -FindTag(interp, textPtr, tagName) - Tcl_Interp *interp; /* Interpreter to use for error message; +FindTag ( + Tcl_Interp *interp, /* Interpreter to use for error message; * if NULL, then don't record an error * message. */ - TkText *textPtr; /* Widget in which tag is being used. */ - char *tagName; /* Name of desired tag. */ + TkText *textPtr, /* Widget in which tag is being used. */ + char *tagName /* Name of desired tag. */ +) { Tcl_HashEntry *hPtr; @@ -595,9 +598,10 @@ FindTag(interp, textPtr, tagName) *---------------------------------------------------------------------- */ -void -TkTextFreeTag(tagPtr) - register TkTextTag *tagPtr; /* Tag being deleted. */ +void +TkTextFreeTag ( + register TkTextTag *tagPtr /* Tag being deleted. */ +) { if (tagPtr->border != None) { Tk_Free3DBorder(tagPtr->border); @@ -632,10 +636,11 @@ TkTextFreeTag(tagPtr) *---------------------------------------------------------------------- */ -static void -SortTags(numTags, tagArrayPtr) - int numTags; /* Number of tag pointers at *tagArrayPtr. */ - TkTextTag **tagArrayPtr; /* Pointer to array of pointers. */ +static void +SortTags ( + int numTags, /* Number of tag pointers at *tagArrayPtr. */ + TkTextTag **tagArrayPtr /* Pointer to array of pointers. */ +) { int i, j, prio; register TkTextTag **tagPtrPtr; @@ -684,9 +689,11 @@ SortTags(numTags, tagArrayPtr) *---------------------------------------------------------------------- */ -static int -TagSortProc(first, second) - CONST VOID *first, *second; /* Elements to be compared. */ +static int +TagSortProc ( + CONST VOID *first, + CONST VOID *second /* Elements to be compared. */ +) { TkTextTag *tagPtr1, *tagPtr2; @@ -716,12 +723,13 @@ TagSortProc(first, second) *---------------------------------------------------------------------- */ -static void -ChangeTagPriority(textPtr, tagPtr, prio) - TkText *textPtr; /* Information about text widget. */ - TkTextTag *tagPtr; /* Tag whose priority is to be +static void +ChangeTagPriority ( + TkText *textPtr, /* Information about text widget. */ + TkTextTag *tagPtr, /* Tag whose priority is to be * changed. */ - int prio; /* New priority for tag. */ + int prio /* New priority for tag. */ +) { int low, high, delta; register TkTextTag *tagPtr2; @@ -774,10 +782,11 @@ ChangeTagPriority(textPtr, tagPtr, prio) */ void -TkTextBindProc(clientData, eventPtr) - ClientData clientData; /* Pointer to canvas structure. */ - XEvent *eventPtr; /* Pointer to X event that just +TkTextBindProc( + ClientData clientData, /* Pointer to canvas structure. */ + XEvent *eventPtr /* Pointer to X event that just * happened. */ +) { TkText *textPtr = (TkText *) clientData; int repick = 0; @@ -864,14 +873,15 @@ TkTextBindProc(clientData, eventPtr) *-------------------------------------------------------------- */ -void -TkTextPickCurrent(textPtr, eventPtr) - register TkText *textPtr; /* Text widget in which to select +void +TkTextPickCurrent ( + register TkText *textPtr, /* Text widget in which to select * current character. */ - XEvent *eventPtr; /* Event describing location of + XEvent *eventPtr /* Event describing location of * mouse cursor. Must be EnterWindow, * LeaveWindow, ButtonRelease, or * MotionNotify. */ +) { TkTextLine *linePtr; int ch; @@ -984,9 +994,10 @@ TkTextPickCurrent(textPtr, eventPtr) *---------------------------------------------------------------------- */ -void -TkTextUnpickCurrent(textPtr) - TkText *textPtr; /* Text widget information. */ +void +TkTextUnpickCurrent ( + TkText *textPtr /* Text widget information. */ +) { if (textPtr->flags & IN_CURRENT) { XEvent event; @@ -1016,12 +1027,13 @@ TkTextUnpickCurrent(textPtr) *-------------------------------------------------------------- */ -static void -TextDoEvent(textPtr, eventPtr) - TkText *textPtr; /* Text widget in which event +static void +TextDoEvent ( + TkText *textPtr, /* Text widget in which event * occurred. */ - XEvent *eventPtr; /* Real or simulated X event that + XEvent *eventPtr /* Real or simulated X event that * is to be processed. */ +) { TkTextTag **tagArrayPtr, **p1, **p2, *tmp; int numTags; diff --git a/src/tk/tkwindow.c b/src/tk/tkwindow.c index eb6b7fe..c7a7ed2 100644 --- a/src/tk/tkwindow.c +++ b/src/tk/tkwindow.c @@ -158,7 +158,7 @@ TkCmd commands[] = { {"scrollbar", Tk_ScrollbarCmd}, {"text", Tk_TextCmd}, {"toplevel", Tk_FrameCmd}, - {(char *) NULL, (int (*)()) NULL} + {(char *) NULL, (int (*)(int *, Tcl_Interp *, int, char **)) NULL} }; /* @@ -198,20 +198,21 @@ static TkWindow * NewWindow _ANSI_ARGS_((TkDisplay *dispPtr, *---------------------------------------------------------------------- */ -static Tk_Window -CreateTopLevelWindow(interp, parent, name, screenName) - Tcl_Interp *interp; /* Interpreter to use for error reporting. */ - Tk_Window parent; /* Token for logical parent of new window +static Tk_Window +CreateTopLevelWindow ( + Tcl_Interp *interp, /* Interpreter to use for error reporting. */ + Tk_Window parent, /* Token for logical parent of new window * (used for naming, options, etc.). May * be NULL. */ - char *name; /* Name for new window; if parent is + char *name, /* Name for new window; if parent is * non-NULL, must be unique among parent's * children. */ - char *screenName; /* Name of screen on which to create + char *screenName /* Name of screen on which to create * window. NULL means use DISPLAY environment * variable to determine. Empty string means * use parent's screen, or DISPLAY if no * parent. */ +) { register TkWindow *winPtr; register TkDisplay *dispPtr; @@ -288,11 +289,12 @@ CreateTopLevelWindow(interp, parent, name, screenName) */ static TkDisplay * -GetScreen(interp, screenName, screenPtr) - Tcl_Interp *interp; /* Place to leave error message. */ - char *screenName; /* Name for screen. NULL or empty means +GetScreen ( + Tcl_Interp *interp, /* Place to leave error message. */ + char *screenName, /* Name for screen. NULL or empty means * use DISPLAY envariable. */ - int *screenPtr; /* Where to store screen number. */ + int *screenPtr /* Where to store screen number. */ +) { register TkDisplay *dispPtr; char *p; @@ -373,7 +375,7 @@ GetScreen(interp, screenName, screenPtr) dispPtr->focusPtr = NULL; tkDisplayList = dispPtr; Tk_CreateFileHandler(ConnectionNumber(display), - TK_READABLE, (void (*)()) NULL, + TK_READABLE, (void (*)(int *, int)) NULL, (ClientData) display); break; } @@ -408,9 +410,10 @@ GetScreen(interp, screenName, screenPtr) */ static TkWindow * -NewWindow(dispPtr, screenNum) - TkDisplay *dispPtr; /* Display associated with new window. */ - int screenNum; /* Index of screen for new window. */ +NewWindow ( + TkDisplay *dispPtr, /* Display associated with new window. */ + int screenNum /* Index of screen for new window. */ +) { register TkWindow *winPtr; @@ -464,14 +467,15 @@ NewWindow(dispPtr, screenNum) *---------------------------------------------------------------------- */ -static int -NameWindow(interp, winPtr, parentPtr, name) - Tcl_Interp *interp; /* Interpreter to use for error reporting. */ - register TkWindow *winPtr; /* Window that is to be named and inserted. */ - TkWindow *parentPtr; /* Pointer to logical parent for winPtr +static int +NameWindow ( + Tcl_Interp *interp, /* Interpreter to use for error reporting. */ + register TkWindow *winPtr, /* Window that is to be named and inserted. */ + TkWindow *parentPtr, /* Pointer to logical parent for winPtr * (used for naming, options, etc.). */ - char *name; /* Name for winPtr; must be unique among + char *name /* Name for winPtr; must be unique among * parentPtr's children. */ +) { #define FIXED_SIZE 200 char staticSpace[FIXED_SIZE]; @@ -555,14 +559,15 @@ NameWindow(interp, winPtr, parentPtr, name) *---------------------------------------------------------------------- */ -Tk_Window -Tk_CreateMainWindow(interp, screenName, baseName) - Tcl_Interp *interp; /* Interpreter to use for error reporting. */ - char *screenName; /* Name of screen on which to create +Tk_Window +Tk_CreateMainWindow ( + Tcl_Interp *interp, /* Interpreter to use for error reporting. */ + char *screenName, /* Name of screen on which to create * window. Empty or NULL string means * use DISPLAY environment variable. */ - char *baseName; /* Base name for application; usually of the + char *baseName /* Base name for application; usually of the * form "prog instance". */ +) { Tk_Window tkwin; int result, dummy; @@ -636,7 +641,7 @@ Tk_CreateMainWindow(interp, screenName, baseName) for (cmdPtr = commands; cmdPtr->name != NULL; cmdPtr++) { Tcl_CreateCommand(interp, cmdPtr->name, cmdPtr->cmdProc, - (ClientData) tkwin, (void (*)()) NULL); + (ClientData) tkwin, (void (*)(int *)) NULL); } /* @@ -674,19 +679,20 @@ Tk_CreateMainWindow(interp, screenName, baseName) *-------------------------------------------------------------- */ -Tk_Window -Tk_CreateWindow(interp, parent, name, screenName) - Tcl_Interp *interp; /* Interpreter to use for error reporting. +Tk_Window +Tk_CreateWindow ( + Tcl_Interp *interp, /* Interpreter to use for error reporting. * Interp->result is assumed to be * initialized by the caller. */ - Tk_Window parent; /* Token for parent of new window. */ - char *name; /* Name for new window. Must be unique + Tk_Window parent, /* Token for parent of new window. */ + char *name, /* Name for new window. Must be unique * among parent's children. */ - char *screenName; /* If NULL, new window will be internal on + char *screenName /* If NULL, new window will be internal on * same screen as its parent. If non-NULL, * gives name of screen on which to create * new window; window will be a top-level * window. */ +) { TkWindow *parentPtr = (TkWindow *) parent; TkWindow *winPtr; @@ -740,22 +746,23 @@ Tk_CreateWindow(interp, parent, name, screenName) *---------------------------------------------------------------------- */ -Tk_Window -Tk_CreateWindowFromPath(interp, tkwin, pathName, screenName) - Tcl_Interp *interp; /* Interpreter to use for error reporting. +Tk_Window +Tk_CreateWindowFromPath ( + Tcl_Interp *interp, /* Interpreter to use for error reporting. * Interp->result is assumed to be * initialized by the caller. */ - Tk_Window tkwin; /* Token for any window in application + Tk_Window tkwin, /* Token for any window in application * that is to contain new window. */ - char *pathName; /* Path name for new window within the + char *pathName, /* Path name for new window within the * application of tkwin. The parent of * this window must already exist, but * the window itself must not exist. */ - char *screenName; /* If NULL, new window will be on same + char *screenName /* If NULL, new window will be on same * screen as its parent. If non-NULL, * gives name of screen on which to create * new window; window will be a top-level * window. */ +) { #define FIXED_SPACE 5 char fixedSpace[FIXED_SPACE+1]; @@ -844,9 +851,10 @@ Tk_CreateWindowFromPath(interp, tkwin, pathName, screenName) *-------------------------------------------------------------- */ -void -Tk_DestroyWindow(tkwin) - Tk_Window tkwin; /* Window to destroy. */ +void +Tk_DestroyWindow ( + Tk_Window tkwin /* Window to destroy. */ +) { register TkWindow *winPtr = (TkWindow *) tkwin; XEvent event; @@ -946,10 +954,10 @@ Tk_DestroyWindow(tkwin) for (cmdPtr = commands; cmdPtr->name != NULL; cmdPtr++) { Tcl_CreateCommand(winPtr->mainPtr->interp, cmdPtr->name, - TkDeadAppCmd, (ClientData) NULL, (void (*)()) NULL); + TkDeadAppCmd, (ClientData) NULL, (void (*)(int *)) NULL); } Tcl_CreateCommand(winPtr->mainPtr->interp, "send", - TkDeadAppCmd, (ClientData) NULL, (void (*)()) NULL); + TkDeadAppCmd, (ClientData) NULL, (void (*)(int *)) NULL); Tcl_DeleteHashTable(&winPtr->mainPtr->nameTable); Tk_DeleteBindingTable(winPtr->mainPtr->bindingTable); ckfree((char *) winPtr->mainPtr); @@ -977,9 +985,10 @@ Tk_DestroyWindow(tkwin) *-------------------------------------------------------------- */ -void -Tk_MapWindow(tkwin) - Tk_Window tkwin; /* Token for window to map. */ +void +Tk_MapWindow ( + Tk_Window tkwin /* Token for window to map. */ +) { register TkWindow *winPtr = (TkWindow *) tkwin; @@ -1038,9 +1047,10 @@ Tk_MapWindow(tkwin) *-------------------------------------------------------------- */ -void -Tk_MakeWindowExist(tkwin) - Tk_Window tkwin; /* Token for window. */ +void +Tk_MakeWindowExist ( + Tk_Window tkwin /* Token for window. */ +) { register TkWindow *winPtr = (TkWindow *) tkwin; Window parent; @@ -1137,9 +1147,10 @@ Tk_MakeWindowExist(tkwin) *-------------------------------------------------------------- */ -void -Tk_UnmapWindow(tkwin) - Tk_Window tkwin; /* Token for window to unmap. */ +void +Tk_UnmapWindow ( + Tk_Window tkwin /* Token for window to unmap. */ +) { register TkWindow *winPtr = (TkWindow *) tkwin; @@ -1162,12 +1173,13 @@ Tk_UnmapWindow(tkwin) } } -void -Tk_ConfigureWindow(tkwin, valueMask, valuePtr) - Tk_Window tkwin; /* Window to re-configure. */ - unsigned int valueMask; /* Mask indicating which parts of +void +Tk_ConfigureWindow ( + Tk_Window tkwin, /* Window to re-configure. */ + unsigned int valueMask, /* Mask indicating which parts of * *valuePtr are to be used. */ - XWindowChanges *valuePtr; /* New values. */ + XWindowChanges *valuePtr /* New values. */ +) { register TkWindow *winPtr = (TkWindow *) tkwin; @@ -1207,11 +1219,13 @@ Tk_ConfigureWindow(tkwin, valueMask, valuePtr) } } -void -Tk_MoveWindow(tkwin, x, y) - Tk_Window tkwin; /* Window to move. */ - int x, y; /* New location for window (within +void +Tk_MoveWindow ( + Tk_Window tkwin, /* Window to move. */ + int x, + int y /* New location for window (within * parent). */ +) { register TkWindow *winPtr = (TkWindow *) tkwin; @@ -1230,10 +1244,12 @@ Tk_MoveWindow(tkwin, x, y) } } -void -Tk_ResizeWindow(tkwin, width, height) - Tk_Window tkwin; /* Window to resize. */ - unsigned int width, height; /* New dimensions for window. */ +void +Tk_ResizeWindow ( + Tk_Window tkwin, /* Window to resize. */ + unsigned int width, + unsigned int height /* New dimensions for window. */ +) { register TkWindow *winPtr = (TkWindow *) tkwin; @@ -1252,12 +1268,15 @@ Tk_ResizeWindow(tkwin, width, height) } } -void -Tk_MoveResizeWindow(tkwin, x, y, width, height) - Tk_Window tkwin; /* Window to move and resize. */ - int x, y; /* New location for window (within +void +Tk_MoveResizeWindow ( + Tk_Window tkwin, /* Window to move and resize. */ + int x, + int y, /* New location for window (within * parent). */ - unsigned int width, height; /* New dimensions for window. */ + unsigned int width, + unsigned int height /* New dimensions for window. */ +) { register TkWindow *winPtr = (TkWindow *) tkwin; @@ -1281,10 +1300,11 @@ Tk_MoveResizeWindow(tkwin, x, y, width, height) } } -void -Tk_SetWindowBorderWidth(tkwin, width) - Tk_Window tkwin; /* Window to modify. */ - int width; /* New border width for window. */ +void +Tk_SetWindowBorderWidth ( + Tk_Window tkwin, /* Window to modify. */ + int width /* New border width for window. */ +) { register TkWindow *winPtr = (TkWindow *) tkwin; @@ -1300,13 +1320,14 @@ Tk_SetWindowBorderWidth(tkwin, width) } } -void -Tk_ChangeWindowAttributes(tkwin, valueMask, attsPtr) - Tk_Window tkwin; /* Window to manipulate. */ - unsigned long valueMask; /* OR'ed combination of bits, +void +Tk_ChangeWindowAttributes ( + Tk_Window tkwin, /* Window to manipulate. */ + unsigned long valueMask, /* OR'ed combination of bits, * indicating which fields of * *attsPtr are to be used. */ - register XSetWindowAttributes *attsPtr; + register XSetWindowAttributes *attsPtr +) /* New values for some attributes. */ { register TkWindow *winPtr = (TkWindow *) tkwin; @@ -1366,11 +1387,12 @@ Tk_ChangeWindowAttributes(tkwin, valueMask, attsPtr) } } -void -Tk_SetWindowBackground(tkwin, pixel) - Tk_Window tkwin; /* Window to manipulate. */ - unsigned long pixel; /* Pixel value to use for +void +Tk_SetWindowBackground ( + Tk_Window tkwin, /* Window to manipulate. */ + unsigned long pixel /* Pixel value to use for * window's background. */ +) { register TkWindow *winPtr = (TkWindow *) tkwin; @@ -1384,11 +1406,12 @@ Tk_SetWindowBackground(tkwin, pixel) } } -void -Tk_SetWindowBackgroundPixmap(tkwin, pixmap) - Tk_Window tkwin; /* Window to manipulate. */ - Pixmap pixmap; /* Pixmap to use for window's +void +Tk_SetWindowBackgroundPixmap ( + Tk_Window tkwin, /* Window to manipulate. */ + Pixmap pixmap /* Pixmap to use for window's * background. */ +) { register TkWindow *winPtr = (TkWindow *) tkwin; @@ -1403,11 +1426,12 @@ Tk_SetWindowBackgroundPixmap(tkwin, pixmap) } } -void -Tk_SetWindowBorder(tkwin, pixel) - Tk_Window tkwin; /* Window to manipulate. */ - unsigned long pixel; /* Pixel value to use for +void +Tk_SetWindowBorder ( + Tk_Window tkwin, /* Window to manipulate. */ + unsigned long pixel /* Pixel value to use for * window's border. */ +) { register TkWindow *winPtr = (TkWindow *) tkwin; @@ -1421,11 +1445,12 @@ Tk_SetWindowBorder(tkwin, pixel) } } -void -Tk_SetWindowBorderPixmap(tkwin, pixmap) - Tk_Window tkwin; /* Window to manipulate. */ - Pixmap pixmap; /* Pixmap to use for window's +void +Tk_SetWindowBorderPixmap ( + Tk_Window tkwin, /* Window to manipulate. */ + Pixmap pixmap /* Pixmap to use for window's * border. */ +) { register TkWindow *winPtr = (TkWindow *) tkwin; @@ -1440,10 +1465,11 @@ Tk_SetWindowBorderPixmap(tkwin, pixmap) } } -void -Tk_DefineCursor(tkwin, cursor) - Tk_Window tkwin; /* Window to manipulate. */ - Cursor cursor; /* Cursor to use for window (may be None). */ +void +Tk_DefineCursor ( + Tk_Window tkwin, /* Window to manipulate. */ + Cursor cursor /* Cursor to use for window (may be None). */ +) { register TkWindow *winPtr = (TkWindow *) tkwin; @@ -1456,9 +1482,10 @@ Tk_DefineCursor(tkwin, cursor) } } -void -Tk_UndefineCursor(tkwin) - Tk_Window tkwin; /* Window to manipulate. */ +void +Tk_UndefineCursor ( + Tk_Window tkwin /* Window to manipulate. */ +) { Tk_DefineCursor(tkwin, None); } @@ -1480,10 +1507,11 @@ Tk_UndefineCursor(tkwin) *---------------------------------------------------------------------- */ -static void -DoConfigureNotify(winPtr) - register TkWindow *winPtr; /* Window whose configuration +static void +DoConfigureNotify ( + register TkWindow *winPtr /* Window whose configuration * was just changed. */ +) { XEvent event; @@ -1524,10 +1552,11 @@ DoConfigureNotify(winPtr) *---------------------------------------------------------------------- */ -void -Tk_SetClass(tkwin, className) - Tk_Window tkwin; /* Token for window to assign class. */ - char *className; /* New class for tkwin. */ +void +Tk_SetClass ( + Tk_Window tkwin, /* Token for window to assign class. */ + char *className /* New class for tkwin. */ +) { register TkWindow *winPtr = (TkWindow *) tkwin; @@ -1557,12 +1586,13 @@ Tk_SetClass(tkwin, className) *---------------------------------------------------------------------- */ -Tk_Window -Tk_NameToWindow(interp, pathName, tkwin) - Tcl_Interp *interp; /* Where to report errors. */ - char *pathName; /* Path name of window. */ - Tk_Window tkwin; /* Token for window: name is assumed to +Tk_Window +Tk_NameToWindow ( + Tcl_Interp *interp, /* Where to report errors. */ + char *pathName, /* Path name of window. */ + Tk_Window tkwin /* Token for window: name is assumed to * belong to the same main window as tkwin. */ +) { Tcl_HashEntry *hPtr; @@ -1594,8 +1624,9 @@ Tk_NameToWindow(interp, pathName, tkwin) */ char * -Tk_DisplayName(tkwin) - Tk_Window tkwin; /* Window whose display name is desired. */ +Tk_DisplayName ( + Tk_Window tkwin /* Window whose display name is desired. */ +) { return ((TkWindow *) tkwin)->dispPtr->name; } diff --git a/src/tk/tkwm.c b/src/tk/tkwm.c index 6e17f7e..81c6b95 100644 --- a/src/tk/tkwm.c +++ b/src/tk/tkwm.c @@ -238,9 +238,10 @@ static void UpdateSizeHints _ANSI_ARGS_((TkWindow *winPtr)); *-------------------------------------------------------------- */ -void -TkWmNewWindow(winPtr) - TkWindow *winPtr; /* Newly-created top-level window. */ +void +TkWmNewWindow ( + TkWindow *winPtr /* Newly-created top-level window. */ +) { register WmInfo *wmPtr; @@ -330,10 +331,11 @@ TkWmNewWindow(winPtr) *-------------------------------------------------------------- */ -int -TkWmMapWindow(winPtr) - TkWindow *winPtr; /* Top-level window that's about to +int +TkWmMapWindow ( + TkWindow *winPtr /* Top-level window that's about to * be mapped. */ +) { register WmInfo *wmPtr = winPtr->wmInfoPtr; #ifndef X11R3 @@ -407,9 +409,10 @@ TkWmMapWindow(winPtr) *-------------------------------------------------------------- */ -void -TkWmDeadWindow(winPtr) - TkWindow *winPtr; /* Newly-created top-level window. */ +void +TkWmDeadWindow ( + TkWindow *winPtr /* Newly-created top-level window. */ +) { register WmInfo *wmPtr = winPtr->wmInfoPtr; @@ -467,9 +470,10 @@ TkWmDeadWindow(winPtr) *-------------------------------------------------------------- */ -void -TkWmSetClass(winPtr) - TkWindow *winPtr; /* Newly-created top-level window. */ +void +TkWmSetClass ( + TkWindow *winPtr /* Newly-created top-level window. */ +) { if (winPtr->wmInfoPtr->flags & WM_NEVER_MAPPED) { return; @@ -506,13 +510,14 @@ TkWmSetClass(winPtr) */ /* ARGSUSED */ -int -Tk_WmCmd(clientData, interp, argc, argv) - ClientData clientData; /* Main window associated with +int +Tk_WmCmd ( + ClientData clientData, /* Main window associated with * interpreter. */ - Tcl_Interp *interp; /* Current interpreter. */ - int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + Tcl_Interp *interp, /* Current interpreter. */ + int argc, /* Number of arguments. */ + char **argv /* Argument strings. */ +) { Tk_Window tkwin = (Tk_Window) clientData; TkWindow *winPtr; @@ -1216,17 +1221,19 @@ Tk_WmCmd(clientData, interp, argc, argv) *---------------------------------------------------------------------- */ -void -Tk_SetGrid(tkwin, reqWidth, reqHeight, widthInc, heightInc) - Tk_Window tkwin; /* Token for window. New window mgr info +void +Tk_SetGrid ( + Tk_Window tkwin, /* Token for window. New window mgr info * will be posted for the top-level window * associated with this window. */ - int reqWidth; /* Width (in grid units) corresponding to + int reqWidth, /* Width (in grid units) corresponding to * the requested geometry for tkwin. */ - int reqHeight; /* Height (in grid units) corresponding to + int reqHeight, /* Height (in grid units) corresponding to * the requested geometry for tkwin. */ - int widthInc, heightInc; /* Pixel increments corresponding to a + int widthInc, + int heightInc /* Pixel increments corresponding to a * change of one grid unit. */ +) { TkWindow *winPtr = (TkWindow *) tkwin; register WmInfo *wmPtr; @@ -1299,10 +1306,11 @@ Tk_SetGrid(tkwin, reqWidth, reqHeight, widthInc, heightInc) *---------------------------------------------------------------------- */ -static void -TopLevelEventProc(clientData, eventPtr) - ClientData clientData; /* Window for which event occurred. */ - XEvent *eventPtr; /* Event that just happened. */ +static void +TopLevelEventProc ( + ClientData clientData, /* Window for which event occurred. */ + XEvent *eventPtr /* Event that just happened. */ +) { register TkWindow *winPtr = (TkWindow *) clientData; @@ -1619,10 +1627,11 @@ TopLevelEventProc(clientData, eventPtr) */ /* ARGSUSED */ -static void -TopLevelReqProc(dummy, tkwin) - ClientData dummy; /* Not used. */ - Tk_Window tkwin; /* Information about window. */ +static void +TopLevelReqProc ( + ClientData dummy, /* Not used. */ + Tk_Window tkwin /* Information about window. */ +) { TkWindow *winPtr = (TkWindow *) tkwin; WmInfo *wmPtr; @@ -1661,9 +1670,10 @@ TopLevelReqProc(dummy, tkwin) *---------------------------------------------------------------------- */ -static void -UpdateGeometryInfo(clientData) - ClientData clientData; /* Pointer to the window's record. */ +static void +UpdateGeometryInfo ( + ClientData clientData /* Pointer to the window's record. */ +) { register TkWindow *winPtr = (TkWindow *) clientData; register WmInfo *wmPtr = winPtr->wmInfoPtr; @@ -1793,9 +1803,8 @@ UpdateGeometryInfo(clientData) *-------------------------------------------------------------- */ -static void -UpdateSizeHints(winPtr) - TkWindow *winPtr; +static void +UpdateSizeHints (TkWindow *winPtr) { register WmInfo *wmPtr = winPtr->wmInfoPtr; XSizeHints *hintsPtr; @@ -1909,9 +1918,8 @@ UpdateSizeHints(winPtr) *-------------------------------------------------------------- */ -static void -UpdateHints(winPtr) - TkWindow *winPtr; +static void +UpdateHints (TkWindow *winPtr) { WmInfo *wmPtr = winPtr->wmInfoPtr; @@ -1940,13 +1948,14 @@ UpdateHints(winPtr) *-------------------------------------------------------------- */ -static int -ParseGeometry(interp, string, winPtr) - Tcl_Interp *interp; /* Used for error reporting. */ - char *string; /* String containing new geometry. Has the +static int +ParseGeometry ( + Tcl_Interp *interp, /* Used for error reporting. */ + char *string, /* String containing new geometry. Has the * standard form "=wxh+x+y". */ - TkWindow *winPtr; /* Pointer to top-level window whose + TkWindow *winPtr /* Pointer to top-level window whose * geometry is to be changed. */ +) { register WmInfo *wmPtr = winPtr->wmInfoPtr; int x, y, width, height, flags; @@ -2065,11 +2074,12 @@ ParseGeometry(interp, string, winPtr) *---------------------------------------------------------------------- */ -void -Tk_GetRootCoords(tkwin, xPtr, yPtr) - Tk_Window tkwin; /* Token for window. */ - int *xPtr; /* Where to store x-displacement of (0,0). */ - int *yPtr; /* Where to store y-displacement of (0,0). */ +void +Tk_GetRootCoords ( + Tk_Window tkwin, /* Token for window. */ + int *xPtr, /* Where to store x-displacement of (0,0). */ + int *yPtr /* Where to store y-displacement of (0,0). */ +) { int x, y; register TkWindow *winPtr = (TkWindow *) tkwin; @@ -2111,9 +2121,10 @@ Tk_GetRootCoords(tkwin, xPtr, yPtr) *-------------------------------------------------------------- */ -void -TkWmSetWmProtocols(winPtr) - TkWindow *winPtr; /* Newly-created top-level window. */ +void +TkWmSetWmProtocols ( + TkWindow *winPtr /* Newly-created top-level window. */ +) { if (winPtr->wmInfoPtr->flags & WM_NEVER_MAPPED) { return; @@ -2176,10 +2187,8 @@ TkWmSetWmProtocols(winPtr) * * */ -void -TkWmProtocolEventProc(winPtr, eventPtr) -TkWindow *winPtr; -XEvent *eventPtr; +void +TkWmProtocolEventProc (TkWindow *winPtr, XEvent *eventPtr) { if ((Atom)(eventPtr->xclient.data.l)[0] == Tk_InternAtom((Tk_Window) winPtr, "WM_DELETE_WINDOW")) { @@ -2220,12 +2229,8 @@ XEvent *eventPtr; * Kind of artificial, But makes it easier to merge into new * versions of Stock Tk. */ -int -WmProtocolCmd(interp, CmdPtr, argc, argv) -Tcl_Interp *interp; -char **CmdPtr; -int argc; -char **argv; +int +WmProtocolCmd (Tcl_Interp *interp, char **CmdPtr, int argc, char **argv) { #define Cmd (*CmdPtr) @@ -2301,11 +2306,13 @@ char **argv; *---------------------------------------------------------------------- */ -Tk_Window -Tk_CoordsToWindow(rootX, rootY, tkwin) - int rootX, rootY; /* Coordinates of point in root window. */ - Tk_Window tkwin; /* Token for any window in application; +Tk_Window +Tk_CoordsToWindow ( + int rootX, + int rootY, /* Coordinates of point in root window. */ + Tk_Window tkwin /* Token for any window in application; * used to identify the application. */ +) { Window rootChild, dummy3, dummy4; int i, dummy1, dummy2; -- 2.39.5