Standardize function definition format.

2 files changed, 265 insertions, 265 deletions

diff --git a/generic/tkFont.c b/generic/tkFont.c
index 4a9fa37..217efaa 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkFont.c,v 1.32 2007/01/18 23:56:43 nijtmans Exp $
+ * RCS: @(#) $Id: tkFont.c,v 1.33 2007/04/17 14:32:28 dkf Exp $
  */
 
 #include "tkPort.h"
@@ -502,27 +502,28 @@ Tk_FontObjCmd(
 
     switch ((enum options) index) {
     case FONT_ACTUAL: {
-	int skip, result;
-	int n;
-	const char* s;
+	int skip, result, n;
+	const char *s;
 	Tk_Font tkfont;
-	Tcl_Obj *optPtr;
-	Tcl_Obj *charPtr;
-	Tcl_Obj *resultPtr;
+	Tcl_Obj *optPtr, *charPtr, *resultPtr;
 	Tcl_UniChar uniChar = 0;
 	const TkFontAttributes *faPtr;
 	TkFontAttributes fa;
 
-	/* 
-	 * Params 0 and 1 are 'font actual'.  Param 2 is the
-	 * font name. 3-4 may be '-displayof $window'
+	/*
+	 * Params 0 and 1 are 'font actual'. Param 2 is the font name. 3-4 may
+	 * be '-displayof $window'
 	 */
+
 	skip = TkGetDisplayOf(interp, objc - 3, objv + 3, &tkwin);
 	if (skip < 0) {
 	    return TCL_ERROR;
 	}
 
-	/* Next parameter may be an option */
+	/*
+	 * Next parameter may be an option.
+	 */
+
 	n = skip + 3;
 	optPtr = NULL;
 	charPtr = NULL;
@@ -536,33 +537,45 @@ Tk_FontObjCmd(
 	    }
 	}
 
-	/* Next parameter may be '--' to mark end of options */
+	/*
+	 * Next parameter may be '--' to mark end of options.
+	 */
+
 	if (n < objc) {
 	    if (!strcmp(Tcl_GetString(objv[n]), "--")) {
 		++n;
 	    }
 	}
 
-	/* Next parameter is the character to get font information for */
+	/*
+	 * Next parameter is the character to get font information for.
+	 */
+
 	if (n < objc) {
 	    charPtr = objv[n];
 	    ++n;
 	}
 
-	/* If there were fewer than 3 args, or args remain, that's an error */
+	/*
+	 * If there were fewer than 3 args, or args remain, that's an error.
+	 */
+
 	if (objc < 3 || n < objc) {
 	    Tcl_WrongNumArgs(interp, 2, objv,
 		    "font ?-displayof window? ?option? ?--? ?char?");
 	    return TCL_ERROR;
 	}
 
-	/* The 'charPtr' arg must be a single Unicode */
+	/*
+	 * The 'charPtr' arg must be a single Unicode.
+	 */
+
 	if (charPtr != NULL) {
 	    if (Tcl_GetCharLength(charPtr) != 1) {
-		resultPtr =  Tcl_NewStringObj("expected a single character "
-					      "but got \"", -1);
+		resultPtr = Tcl_NewStringObj(
+			"expected a single character but got \"", -1);
 		Tcl_AppendLimitedToObj(resultPtr, Tcl_GetString(charPtr),
-				       -1, 40, "...");
+			-1, 40, "...");
 		Tcl_AppendToObj(resultPtr, "\"", -1);
 		Tcl_SetObjResult(interp, resultPtr);
 		return TCL_ERROR;
@@ -570,15 +583,21 @@ Tk_FontObjCmd(
 	    uniChar = Tcl_GetUniChar(charPtr, 0);
 	}
 
-	/* Find the font */
+	/*
+	 * Find the font.
+	 */
+
 	tkfont = Tk_AllocFontFromObj(interp, tkwin, objv[2]);
 	if (tkfont == NULL) {
 	    return TCL_ERROR;
 	}
-	
-	/* Determine the font attributes */
+
+	/*
+	 * Determine the font attributes.
+	 */
+
 	if (charPtr == NULL) {
-	faPtr = GetFontAttributes(tkfont);
+	    faPtr = GetFontAttributes(tkfont);
 	} else {
 	    TkpGetFontAttrsForChar(tkwin, tkfont, uniChar, &fa);
 	    faPtr = &fa;
@@ -1391,7 +1410,7 @@ Tk_FreeFont(
     if (prevPtr == fontPtr) {
 	if (fontPtr->nextPtr == NULL) {
 	    Tcl_DeleteHashEntry(fontPtr->cacheHashPtr);
-	} else  {
+	} else {
 	    Tcl_SetHashValue(fontPtr->cacheHashPtr, fontPtr->nextPtr);
 	}
     } else {
@@ -1778,13 +1797,12 @@ Tk_TextWidth(
  *
  * Tk_UnderlineChars, TkUnderlineCharsInContext --
  *
- *	These procedures draw an underline for a given range of
- *	characters in a given string.  They don't draw the characters
- *	(which are assumed to have been displayed previously); they
- *	just draw the underline.  These procedures would mainly be
- *	used to quickly underline a few characters without having to
- *	construct an underlined font.  To produce properly underlined
- *	text, the appropriate underlined font should be constructed
+ *	These procedures draw an underline for a given range of characters in
+ *	a given string. They don't draw the characters (which are assumed to
+ *	have been displayed previously); they just draw the underline. These
+ *	procedures would mainly be used to quickly underline a few characters
+ *	without having to construct an underlined font. To produce properly
+ *	underlined text, the appropriate underlined font should be constructed
  *	and used.
  *
  * Results:
@@ -1822,30 +1840,28 @@ Tk_UnderlineChars(
 }
 
 void
-TkUnderlineCharsInContext(display, drawable, gc, tkfont, string, numBytes,
-	x, y, firstByte, lastByte)
-
-    Display *display;		/* Display on which to draw. */
-    Drawable drawable;		/* Window or pixmap in which to draw. */
-    GC gc;			/* Graphics context for actually drawing
+TkUnderlineCharsInContext(
+    Display *display,		/* Display on which to draw. */
+    Drawable drawable,		/* Window or pixmap in which to draw. */
+    GC gc,			/* Graphics context for actually drawing
 				 * line. */
-    Tk_Font tkfont;		/* Font used in GC;  must have been allocated
-				 * by Tk_GetFont().  Used for character
+    Tk_Font tkfont,		/* Font used in GC; must have been allocated
+				 * by Tk_GetFont(). Used for character
 				 * dimensions, etc. */
-    const char *string;		/* String containing characters to be
+    const char *string,		/* String containing characters to be
 				 * underlined or overstruck. */
-    int numBytes;		/* Number of bytes in string. */
-    int x, y;			/* Coordinates at which the first character
-				 * of the whole string would be drawn. */
-    int firstByte;		/* Index of first byte of first character. */
-    int lastByte;		/* Index of first byte after the last
+    int numBytes,		/* Number of bytes in string. */
+    int x, int y,		/* Coordinates at which the first character of
+				 * the whole string would be drawn. */
+    int firstByte,		/* Index of first byte of first character. */
+    int lastByte)		/* Index of first byte after the last
 				 * character. */
 {
     TkFont *fontPtr;
     int startX, endX;
-  
+
     fontPtr = (TkFont *) tkfont;
-      
+
     TkpMeasureCharsInContext(tkfont, string, numBytes, 0, firstByte, -1, 0,
 	    &startX);
     TkpMeasureCharsInContext(tkfont, string, numBytes, 0, lastByte, -1, 0,
@@ -1906,14 +1922,12 @@ Tk_ComputeTextLayout(
 {
     TkFont *fontPtr;
     const char *start, *end, *special;
-    int n, y, bytesThisChunk, maxChunks;
-    int baseline, height, curX, newX, maxWidth;
+    int n, y, bytesThisChunk, maxChunks, curLine, layoutHeight;
+    int baseline, height, curX, newX, maxWidth, *lineLengths;
     TextLayout *layoutPtr;
     LayoutChunk *chunkPtr;
     const TkFontMetrics *fmPtr;
     Tcl_DString lineBuffer;
-    int *lineLengths;
-    int curLine, layoutHeight;
 
     Tcl_DStringInit(&lineBuffer);
 
@@ -1941,11 +1955,11 @@ Tk_ComputeTextLayout(
 
     maxChunks = 1;
 
-    layoutPtr = (TextLayout *) ckalloc(sizeof(TextLayout)
-	    + (maxChunks - 1) * sizeof(LayoutChunk));
-    layoutPtr->tkfont	    = tkfont;
-    layoutPtr->string	    = string;
-    layoutPtr->numChunks    = 0;
+    layoutPtr = (TextLayout *)
+	    ckalloc(sizeof(TextLayout) + (maxChunks-1) * sizeof(LayoutChunk));
+    layoutPtr->tkfont = tkfont;
+    layoutPtr->string = string;
+    layoutPtr->numChunks = 0;
 
     baseline = fmPtr->ascent;
     maxWidth = 0;
@@ -2010,8 +2024,8 @@ Tk_ComputeTextLayout(
 	    /*
 	     * Handle the special character.
 	     *
-	     * INTL: Special will be pointing at a 7-bit character so we
-	     * can safely treat it as a single byte.
+	     * INTL: Special will be pointing at a 7-bit character so we can
+	     * safely treat it as a single byte.
 	     */
 
 	    chunkPtr = NULL;
@@ -2423,7 +2437,7 @@ Tk_PointToChar(
 	     */
 
 	    lastPtr = chunkPtr;
-	    while ((i < layoutPtr->numChunks) && (chunkPtr->y == baseline))  {
+	    while ((i < layoutPtr->numChunks) && (chunkPtr->y == baseline)) {
 		if (x < chunkPtr->x + chunkPtr->totalWidth) {
 		    /*
 		     * Point falls on one of the characters in this chunk.
@@ -2549,7 +2563,7 @@ Tk_CharBbox(
 	    end = Tcl_UtfAtIndex(chunkPtr->start, index);
 	    if (xPtr != NULL) {
 		Tk_MeasureChars(tkfont, chunkPtr->start,
-			end -  chunkPtr->start, -1, 0, &x);
+			end - chunkPtr->start, -1, 0, &x);
 		x += chunkPtr->x;
 	    }
 	    if (widthPtr != NULL) {
@@ -2561,19 +2575,19 @@ Tk_CharBbox(
 	index -= chunkPtr->numChars;
 	chunkPtr++;
     }
-    if (index == 0) {
-	/*
-	 * Special case to get location just past last char in layout.
-	 */
-
-	chunkPtr--;
-	x = chunkPtr->x + chunkPtr->totalWidth;
-	w = 0;
-    } else {
+    if (index != 0) {
 	return 0;
     }
 
     /*
+     * Special case to get location just past last char in layout.
+     */
+
+    chunkPtr--;
+    x = chunkPtr->x + chunkPtr->totalWidth;
+    w = 0;
+
+    /*
      * Ensure that the bbox lies within the text layout. This forces all chars
      * that extend off the right edge of the text layout to have truncated
      * widths, and all chars that are completely off the right edge of the
@@ -2629,9 +2643,9 @@ int
 Tk_DistanceToTextLayout(
     Tk_TextLayout layout,	/* Layout information, from a previous call
 				 * to Tk_ComputeTextLayout(). */
-    int x, int y)		/* Coordinates of point to check, with
-				 * respect to the upper-left corner of the
-				 * text layout (in pixels). */
+    int x, int y)		/* Coordinates of point to check, with respect
+				 * to the upper-left corner of the text layout
+				 * (in pixels). */
 {
     int i, x1, x2, y1, y2, xDiff, yDiff, dist, minDist, ascent, descent;
     LayoutChunk *chunkPtr;
@@ -2823,15 +2837,12 @@ Tk_TextLayoutToPostscript(
     Tk_TextLayout layout)	/* The layout to be rendered. */
 {
 #define MAXUSE 128
-    char buf[MAXUSE+30];
+    char buf[MAXUSE+30], uindex[5] = "\0\0\0\0", one_char[5];
     LayoutChunk *chunkPtr;
-    int i, j, used, c, baseline;
+    int i, j, used, c, baseline, charsize;
     Tcl_UniChar ch;
-    const char *p, *last_p,*glyphname;
+    const char *p, *last_p, *glyphname;
     TextLayout *layoutPtr;
-    char uindex[5]="\0\0\0\0";
-    char one_char[5];
-    int charsize;
     int bytecount=0;
 
     layoutPtr = (TextLayout *) layout;
@@ -2890,8 +2901,10 @@ Tk_TextLayoutToPostscript(
 		     * This character doesn't belong to system character set.
 		     * So, we must use full glyph name.
 		     */
-		    sprintf(uindex,"%04X",ch); /* endianness? */
-		    if ((glyphname = Tcl_GetVar2(interp , "::tk::psglyphs",uindex,0))) {
+
+		    sprintf(uindex, "%04X", ch);	/* endianness? */
+		    glyphname = Tcl_GetVar2(interp,"::tk::psglyphs",uindex,0);
+		    if (glyphname) {
 			if (used > 0 && buf [used-1] == '(') {
 			    --used;
 			} else {
@@ -3810,7 +3823,7 @@ TkFontGetFirstTextLayout(
     Tk_Font *font,
     char *dst)
 {
-    TextLayout  *layoutPtr;
+    TextLayout *layoutPtr;
     LayoutChunk *chunkPtr;
     int numBytesInChunk;
 
diff --git a/generic/tkListbox.c b/generic/tkListbox.c
index 9e7d575..f5ade9f 100644
--- a/generic/tkListbox.c
+++ b/generic/tkListbox.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkListbox.c,v 1.38 2007/01/12 10:41:23 dkf Exp $
+ * RCS: @(#) $Id: tkListbox.c,v 1.39 2007/04/17 14:32:28 dkf Exp $
  */
 
 #include "tkPort.h"
@@ -340,7 +340,7 @@ static const Tk_OptionSpec itemAttrOptionSpecs[] = {
  * dispatch the listbox widget command.
  */
 
-static CONST char *commandNames[] = {
+static const char *commandNames[] = {
     "activate", "bbox", "cget", "configure", "curselection", "delete", "get",
     "index", "insert", "itemcget", "itemconfigure", "nearest", "scan",
     "see", "selection", "size", "xview", "yview", NULL
@@ -353,21 +353,21 @@ enum command {
     COMMAND_SIZE, COMMAND_XVIEW, COMMAND_YVIEW
 };
 
-static CONST char *selCommandNames[] = {
+static const char *selCommandNames[] = {
     "anchor", "clear", "includes", "set", NULL
 };
 enum selcommand {
     SELECTION_ANCHOR, SELECTION_CLEAR, SELECTION_INCLUDES, SELECTION_SET
 };
 
-static CONST char *scanCommandNames[] = {
+static const char *scanCommandNames[] = {
     "mark", "dragto", NULL
 };
 enum scancommand {
     SCAN_MARK, SCAN_DRAGTO
 };
 
-static CONST char *indexNames[] = {
+static const char *indexNames[] = {
     "active", "anchor", "end", NULL
 };
 enum indices {
@@ -381,10 +381,10 @@ enum indices {
 static void		ChangeListboxOffset(Listbox *listPtr, int offset);
 static void		ChangeListboxView(Listbox *listPtr, int index);
 static int		ConfigureListbox(Tcl_Interp *interp, Listbox *listPtr,
-			    int objc, Tcl_Obj *CONST objv[], int flags);
+			    int objc, Tcl_Obj *const objv[], int flags);
 static int		ConfigureListboxItem(Tcl_Interp *interp,
 			    Listbox *listPtr, ItemAttr *attrs, int objc,
-			    Tcl_Obj *CONST objv[], int index);
+			    Tcl_Obj *const objv[], int index);
 static int		ListboxDeleteSubCmd(Listbox *listPtr,
 			    int first, int last);
 static void		DestroyListbox(char *memPtr);
@@ -394,7 +394,7 @@ static void		DisplayListbox(ClientData clientData);
 static int		GetListboxIndex(Tcl_Interp *interp, Listbox *listPtr,
 			    Tcl_Obj *index, int endIsSize, int *indexPtr);
 static int		ListboxInsertSubCmd(Listbox *listPtr,
-			    int index, int objc, Tcl_Obj *CONST objv[]);
+			    int index, int objc, Tcl_Obj *const objv[]);
 static void		ListboxCmdDeletedProc(ClientData clientData);
 static void		ListboxComputeGeometry(Listbox *listPtr,
 			    int fontChanged, int maxIsStale, int updateGrid);
@@ -412,22 +412,22 @@ static void		ListboxUpdateHScrollbar(Listbox *listPtr);
 static void		ListboxUpdateVScrollbar(Listbox *listPtr);
 static int		ListboxWidgetObjCmd(ClientData clientData,
 			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]);
+			    Tcl_Obj *const objv[]);
 static int		ListboxBboxSubCmd(Tcl_Interp *interp,
 			    Listbox *listPtr, int index);
 static int		ListboxSelectionSubCmd(Tcl_Interp *interp,
-			    Listbox *listPtr, int objc, Tcl_Obj *CONST objv[]);
+			    Listbox *listPtr, int objc, Tcl_Obj *const objv[]);
 static int		ListboxXviewSubCmd(Tcl_Interp *interp,
-			    Listbox *listPtr, int objc, Tcl_Obj *CONST objv[]);
+			    Listbox *listPtr, int objc, Tcl_Obj *const objv[]);
 static int		ListboxYviewSubCmd(Tcl_Interp *interp,
-			    Listbox *listPtr, int objc, Tcl_Obj *CONST objv[]);
+			    Listbox *listPtr, int objc, Tcl_Obj *const objv[]);
 static ItemAttr *	ListboxGetItemAttributes(Tcl_Interp *interp,
 			    Listbox *listPtr, int index);
 static void		ListboxWorldChanged(ClientData instanceData);
 static int		NearestListboxElement(Listbox *listPtr, int y);
 static char *		ListboxListVarProc(ClientData clientData,
-			    Tcl_Interp *interp, CONST char *name1,
-			    CONST char *name2, int flags);
+			    Tcl_Interp *interp, const char *name1,
+			    const char *name2, int flags);
 static void		MigrateHashEntries(Tcl_HashTable *table,
 			    int first, int last, int offset);
 
@@ -459,11 +459,11 @@ static Tk_ClassProcs listboxClass = {
  */
 
 int
-Tk_ListboxObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;	/* NULL. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
+Tk_ListboxObjCmd(
+    ClientData clientData,	/* NULL. */
+    Tcl_Interp *interp,		/* Current interpreter. */
+    int objc,			/* Number of arguments. */
+    Tcl_Obj *const objv[])	/* Argument objects. */
 {
     register Listbox *listPtr;
     Tk_Window tkwin;
@@ -516,7 +516,7 @@ Tk_ListboxObjCmd(clientData, interp, objc, objv)
      */
 
     listPtr			 = (Listbox *) ckalloc(sizeof(Listbox));
-    memset((void *) listPtr, 0, (sizeof(Listbox)));
+    memset(listPtr, 0, (sizeof(Listbox)));
 
     listPtr->tkwin		 = tkwin;
     listPtr->display		 = Tk_Display(tkwin);
@@ -591,11 +591,11 @@ Tk_ListboxObjCmd(clientData, interp, objc, objv)
  */
 
 static int
-ListboxWidgetObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;		/* Information about listbox widget. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int objc;				/* Number of arguments. */
-    Tcl_Obj *CONST objv[];		/* Arguments as Tcl_Obj's. */
+ListboxWidgetObjCmd(
+    ClientData clientData,	/* Information about listbox widget. */
+    Tcl_Interp *interp,		/* Current interpreter. */
+    int objc,			/* Number of arguments. */
+    Tcl_Obj *const objv[])	/* Arguments as Tcl_Obj's. */
 {
     register Listbox *listPtr = (Listbox *) clientData;
     int cmdIndex, index;
@@ -774,9 +774,8 @@ ListboxWidgetObjCmd(clientData, interp, objc, objv)
     }
 
     case COMMAND_GET: {
-	int first, last;
+	int first, last, listLen;
 	Tcl_Obj **elemPtrs;
-	int listLen;
 
 	if (objc != 3 && objc != 4) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "firstIndex ?lastIndex?");
@@ -1071,10 +1070,10 @@ ListboxWidgetObjCmd(clientData, interp, objc, objv)
  */
 
 static int
-ListboxBboxSubCmd(interp, listPtr, index)
-    Tcl_Interp *interp;		/* Pointer to the calling Tcl interpreter */
-    Listbox *listPtr;		/* Information about the listbox */
-    int index;			/* Index of the element to get bbox info on */
+ListboxBboxSubCmd(
+    Tcl_Interp *interp,		/* Pointer to the calling Tcl interpreter */
+    Listbox *listPtr,		/* Information about the listbox */
+    int index)			/* Index of the element to get bbox info on */
 {
     int lastVisibleIndex;
 
@@ -1139,11 +1138,11 @@ ListboxBboxSubCmd(interp, listPtr, index)
  */
 
 static int
-ListboxSelectionSubCmd(interp, listPtr, objc, objv)
-    Tcl_Interp *interp;		/* Pointer to the calling Tcl interpreter */
-    Listbox *listPtr;		/* Information about the listbox */
-    int objc;			/* Number of arguments in the objv array */
-    Tcl_Obj *CONST objv[];	/* Array of arguments to the procedure */
+ListboxSelectionSubCmd(
+    Tcl_Interp *interp,		/* Pointer to the calling Tcl interpreter */
+    Listbox *listPtr,		/* Information about the listbox */
+    int objc,			/* Number of arguments in the objv array */
+    Tcl_Obj *const objv[])	/* Array of arguments to the procedure */
 {
     int selCmdIndex, first, last;
     int result = TCL_OK;
@@ -1230,11 +1229,11 @@ ListboxSelectionSubCmd(interp, listPtr, objc, objv)
  */
 
 static int
-ListboxXviewSubCmd(interp, listPtr, objc, objv)
-    Tcl_Interp *interp;		/* Pointer to the calling Tcl interpreter */
-    Listbox *listPtr;		/* Information about the listbox */
-    int objc;			/* Number of arguments in the objv array */
-    Tcl_Obj *CONST objv[];	/* Array of arguments to the procedure */
+ListboxXviewSubCmd(
+    Tcl_Interp *interp,		/* Pointer to the calling Tcl interpreter */
+    Listbox *listPtr,		/* Information about the listbox */
+    int objc,			/* Number of arguments in the objv array */
+    Tcl_Obj *const objv[])	/* Array of arguments to the procedure */
 {
 
     int index, count, type, windowWidth, windowUnits;
@@ -1306,11 +1305,11 @@ ListboxXviewSubCmd(interp, listPtr, objc, objv)
  */
 
 static int
-ListboxYviewSubCmd(interp, listPtr, objc, objv)
-    Tcl_Interp *interp;		/* Pointer to the calling Tcl interpreter */
-    Listbox *listPtr;		/* Information about the listbox */
-    int objc;			/* Number of arguments in the objv array */
-    Tcl_Obj *CONST objv[];	/* Array of arguments to the procedure */
+ListboxYviewSubCmd(
+    Tcl_Interp *interp,		/* Pointer to the calling Tcl interpreter */
+    Listbox *listPtr,		/* Information about the listbox */
+    int objc,			/* Number of arguments in the objv array */
+    Tcl_Obj *const objv[])	/* Array of arguments to the procedure */
 {
     int index, count, type;
     double fraction, fraction2;
@@ -1377,10 +1376,10 @@ ListboxYviewSubCmd(interp, listPtr, objc, objv)
  */
 
 static ItemAttr *
-ListboxGetItemAttributes(interp, listPtr, index)
-    Tcl_Interp *interp;		/* Pointer to the calling Tcl interpreter */
-    Listbox *listPtr;		/* Information about the listbox */
-    int index;			/* Index of the item to retrieve attributes
+ListboxGetItemAttributes(
+    Tcl_Interp *interp,		/* Pointer to the calling Tcl interpreter */
+    Listbox *listPtr,		/* Information about the listbox */
+    int index)			/* Index of the item to retrieve attributes
 				 * for. */
 {
     int isNew;
@@ -1421,8 +1420,8 @@ ListboxGetItemAttributes(interp, listPtr, index)
  */
 
 static void
-DestroyListbox(memPtr)
-    char *memPtr;	/* Info about listbox widget. */
+DestroyListbox(
+    char *memPtr)	/* Info about listbox widget. */
 {
     register Listbox *listPtr = (Listbox *) memPtr;
     Tcl_HashEntry *entry;
@@ -1502,11 +1501,11 @@ DestroyListbox(memPtr)
  */
 
 static void
-DestroyListboxOptionTables(clientData, interp)
-    ClientData clientData;	/* Pointer to the OptionTables struct */
-    Tcl_Interp *interp;		/* Pointer to the calling interp */
+DestroyListboxOptionTables(
+    ClientData clientData,	/* Pointer to the OptionTables struct */
+    Tcl_Interp *interp)		/* Pointer to the calling interp */
 {
-    ckfree((char *)clientData);
+    ckfree((char *) clientData);
     return;
 }
 
@@ -1531,13 +1530,13 @@ DestroyListboxOptionTables(clientData, interp)
  */
 
 static int
-ConfigureListbox(interp, listPtr, objc, objv, flags)
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    register Listbox *listPtr;	/* Information about widget; may or may not
+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 objc;			/* Number of valid entries in argv. */
-    Tcl_Obj *CONST objv[];	/* Arguments. */
-    int flags;			/* Flags to pass to Tk_ConfigureWidget. */
+    int objc,			/* Number of valid entries in argv. */
+    Tcl_Obj *const objv[],	/* Arguments. */
+    int flags)			/* Flags to pass to Tk_ConfigureWidget. */
 {
     Tk_SavedOptions savedOptions;
     Tcl_Obj *oldListObj = NULL;
@@ -1694,14 +1693,14 @@ ConfigureListbox(interp, listPtr, objc, objv, flags)
  */
 
 static int
-ConfigureListboxItem(interp, listPtr, attrs, objc, objv, index)
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    register Listbox *listPtr;	/* Information about widget; may or may not
+ConfigureListboxItem(
+    Tcl_Interp *interp,		/* Used for error reporting. */
+    register Listbox *listPtr,	/* Information about widget; may or may not
 				 * already have values for some fields. */
-    ItemAttr *attrs;		/* Information about the item to configure */
-    int objc;			/* Number of valid entries in argv. */
-    Tcl_Obj *CONST objv[];	/* Arguments. */
-    int index;			/* Index of the listbox item being configure */
+    ItemAttr *attrs,		/* Information about the item to configure */
+    int objc,			/* Number of valid entries in argv. */
+    Tcl_Obj *const objv[],	/* Arguments. */
+    int index)			/* Index of the listbox item being configure */
 {
     Tk_SavedOptions savedOptions;
 
@@ -1739,8 +1738,8 @@ ConfigureListboxItem(interp, listPtr, attrs, objc, objv, index)
  */
 
 static void
-ListboxWorldChanged(instanceData)
-    ClientData instanceData;	/* Information about widget. */
+ListboxWorldChanged(
+    ClientData instanceData)	/* Information about widget. */
 {
     XGCValues gcValues;
     GC gc;
@@ -1813,18 +1812,17 @@ ListboxWorldChanged(instanceData)
  */
 
 static void
-DisplayListbox(clientData)
-    ClientData clientData;	/* Information about window. */
+DisplayListbox(
+    ClientData clientData)	/* Information about window. */
 {
     register Listbox *listPtr = (Listbox *) clientData;
     register Tk_Window tkwin = listPtr->tkwin;
     GC gc;
-    int i, limit, x, y, prevSelected, freeGC;
+    int i, limit, x, y, prevSelected, freeGC, stringLen;
     Tk_FontMetrics fm;
     Tcl_Obj *curElement;
     Tcl_HashEntry *entry;
     char *stringRep;
-    int stringLen;
     ItemAttr *attrs;
     Tk_3DBorder selectedBg;
     XGCValues gcValues;
@@ -2180,26 +2178,24 @@ DisplayListbox(clientData)
  */
 
 static void
-ListboxComputeGeometry(listPtr, fontChanged, maxIsStale, updateGrid)
-    Listbox *listPtr;		/* Listbox whose geometry is to be
+ListboxComputeGeometry(
+    Listbox *listPtr,		/* Listbox whose geometry is to be
 				 * recomputed. */
-    int fontChanged;		/* Non-zero means the font may have changed so
+    int fontChanged,		/* Non-zero means the font may have changed so
 				 * per-element width information also has to
 				 * be computed. */
-    int maxIsStale;		/* Non-zero means the "maxWidth" field may no
+    int maxIsStale,		/* Non-zero means the "maxWidth" field may no
 				 * longer be up-to-date and must be
 				 * recomputed. If fontChanged is 1 then this
 				 * must be 1. */
-    int updateGrid;		/* Non-zero means call Tk_SetGrid or
+    int updateGrid)		/* Non-zero means call Tk_SetGrid or
 				 * Tk_UnsetGrid to update gridding for the
 				 * window. */
 {
-    int width, height, pixelWidth, pixelHeight;
+    int width, height, pixelWidth, pixelHeight, textLength, i, result;
     Tk_FontMetrics fm;
     Tcl_Obj *element;
-    int textLength;
     char *text;
-    int i, result;
 
     if (fontChanged || maxIsStale) {
 	listPtr->xScrollUnit = Tk_TextWidth(listPtr->tkfont, "0", 1);
@@ -2276,19 +2272,16 @@ ListboxComputeGeometry(listPtr, fontChanged, maxIsStale, updateGrid)
  */
 
 static int
-ListboxInsertSubCmd(listPtr, index, objc, objv)
-    register Listbox *listPtr;	/* Listbox that is to get the new elements. */
-    int index;			/* Add the new elements before this
+ListboxInsertSubCmd(
+    register Listbox *listPtr,	/* Listbox that is to get the new elements. */
+    int index,			/* Add the new elements before this
 				 * element. */
-    int objc;			/* Number of new elements to add. */
-    Tcl_Obj *CONST objv[];	/* New elements (one per entry). */
+    int objc,			/* Number of new elements to add. */
+    Tcl_Obj *const objv[])	/* New elements (one per entry). */
 {
-    int i, oldMaxWidth;
+    int i, oldMaxWidth, pixelWidth, result, length;
     Tcl_Obj *newListObj;
-    int pixelWidth;
-    int result;
     char *stringRep;
-    int length;
 
     oldMaxWidth = listPtr->maxWidth;
     for (i = 0; i < objc; i++) {
@@ -2329,18 +2322,18 @@ ListboxInsertSubCmd(listPtr, index, objc, objv)
     }
 
     /*
-     * Replace the current object and set attached listvar, if any.
-     * This may error if listvar points to a var in a deleted namespace, but
-     * we ignore those errors.  If the namespace is recreated, it will
-     * auto-sync with the current value. [Bug 1424513]
+     * Replace the current object and set attached listvar, if any. This may
+     * error if listvar points to a var in a deleted namespace, but we ignore
+     * those errors. If the namespace is recreated, it will auto-sync with the
+     * current value. [Bug 1424513]
      */
 
     Tcl_IncrRefCount(newListObj);
     Tcl_DecrRefCount(listPtr->listObj);
     listPtr->listObj = newListObj;
     if (listPtr->listVarName != NULL) {
-	Tcl_SetVar2Ex(listPtr->interp, listPtr->listVarName,
-		(char *) NULL, listPtr->listObj, TCL_GLOBAL_ONLY);
+	Tcl_SetVar2Ex(listPtr->interp, listPtr->listVarName, NULL,
+		listPtr->listObj, TCL_GLOBAL_ONLY);
     }
 
     /*
@@ -2395,18 +2388,14 @@ ListboxInsertSubCmd(listPtr, index, objc, objv)
  */
 
 static int
-ListboxDeleteSubCmd(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. */
+ListboxDeleteSubCmd(
+    register Listbox *listPtr,	/* Listbox widget to modify. */
+    int first,			/* Index of first element to delete. */
+    int last)			/* Index of last element to delete. */
 {
-    int count, i, widthChanged;
-    Tcl_Obj *newListObj;
-    Tcl_Obj *element;
-    int length;
+    int count, i, widthChanged, length, result, pixelWidth;
+    Tcl_Obj *newListObj, *element;
     char *stringRep;
-    int result;
-    int pixelWidth;
     Tcl_HashEntry *entry;
 
     /*
@@ -2492,18 +2481,18 @@ ListboxDeleteSubCmd(listPtr, first, last)
     }
 
     /*
-     * Replace the current object and set attached listvar, if any.
-     * This may error if listvar points to a var in a deleted namespace, but
-     * we ignore those errors.  If the namespace is recreated, it will
-     * auto-sync with the current value. [Bug 1424513]
+     * Replace the current object and set attached listvar, if any. This may
+     * error if listvar points to a var in a deleted namespace, but we ignore
+     * those errors. If the namespace is recreated, it will auto-sync with the
+     * current value. [Bug 1424513]
      */
 
     Tcl_IncrRefCount(newListObj);
     Tcl_DecrRefCount(listPtr->listObj);
     listPtr->listObj = newListObj;
     if (listPtr->listVarName != NULL) {
-	Tcl_SetVar2Ex(listPtr->interp, listPtr->listVarName,
-		(char *) NULL, listPtr->listObj, TCL_GLOBAL_ONLY);
+	Tcl_SetVar2Ex(listPtr->interp, listPtr->listVarName, NULL,
+		listPtr->listObj, TCL_GLOBAL_ONLY);
     }
 
     /*
@@ -2573,9 +2562,9 @@ ListboxDeleteSubCmd(listPtr, first, last)
  */
 
 static void
-ListboxEventProc(clientData, eventPtr)
-    ClientData clientData;	/* Information about window. */
-    XEvent *eventPtr;		/* Information about event. */
+ListboxEventProc(
+    ClientData clientData,	/* Information about window. */
+    XEvent *eventPtr)		/* Information about event. */
 {
     Listbox *listPtr = (Listbox *) clientData;
 
@@ -2649,8 +2638,8 @@ ListboxEventProc(clientData, eventPtr)
  */
 
 static void
-ListboxCmdDeletedProc(clientData)
-    ClientData clientData;	/* Pointer to widget record for widget. */
+ListboxCmdDeletedProc(
+    ClientData clientData)	/* Pointer to widget record for widget. */
 {
     Listbox *listPtr = (Listbox *) clientData;
 
@@ -2685,18 +2674,17 @@ ListboxCmdDeletedProc(clientData)
  */
 
 static int
-GetListboxIndex(interp, listPtr, indexObj, endIsSize, indexPtr)
-    Tcl_Interp *interp;		/* For error messages. */
-    Listbox *listPtr;		/* Listbox for which the index is being
+GetListboxIndex(
+    Tcl_Interp *interp,		/* For error messages. */
+    Listbox *listPtr,		/* Listbox for which the index is being
 				 * specified. */
-    Tcl_Obj *indexObj;		/* Specifies an element in the listbox. */
-    int endIsSize;		/* If 1, "end" refers to the number of entries
+    Tcl_Obj *indexObj,		/* Specifies an element in the listbox. */
+    int endIsSize,		/* If 1, "end" refers to the number of entries
 				 * in the listbox. If 0, "end" refers to 1
 				 * less than the number of entries. */
-    int *indexPtr;		/* Where to store converted index. */
+    int *indexPtr)		/* Where to store converted index. */
 {
-    int result;
-    int index;
+    int result, index;
     char *stringRep;
 
     /*
@@ -2795,9 +2783,9 @@ GetListboxIndex(interp, listPtr, indexObj, endIsSize, indexPtr)
  */
 
 static void
-ChangeListboxView(listPtr, index)
-    register Listbox *listPtr;	/* Information about widget. */
-    int index;			/* Index of element in listPtr that should now
+ChangeListboxView(
+    register Listbox *listPtr,	/* Information about widget. */
+    int index)			/* Index of element in listPtr that should now
 				 * appear at the top of the listbox. */
 {
     if (index >= (listPtr->nElements - listPtr->fullLines)) {
@@ -2830,10 +2818,9 @@ ChangeListboxView(listPtr, index)
  */
 
 static void
-ChangeListboxOffset(listPtr, offset)
-    register Listbox *listPtr;		/* Information about widget. */
-    int offset;				/* Desired new "xOffset" for
-					 * listbox. */
+ChangeListboxOffset(
+    register Listbox *listPtr,	/* Information about widget. */
+    int offset)			/* Desired new "xOffset" for listbox. */
 {
     int maxOffset;
 
@@ -2881,10 +2868,10 @@ ChangeListboxOffset(listPtr, offset)
  */
 
 static void
-ListboxScanTo(listPtr, x, y)
-    register Listbox *listPtr;	/* Information about widget. */
-    int x;			/* X-coordinate to use for scan operation. */
-    int y;			/* Y-coordinate to use for scan operation. */
+ListboxScanTo(
+    register Listbox *listPtr,	/* Information about widget. */
+    int x,			/* X-coordinate to use for scan operation. */
+    int y)			/* Y-coordinate to use for scan operation. */
 {
     int newTopIndex, newOffset, maxIndex, maxOffset;
 
@@ -2950,9 +2937,9 @@ ListboxScanTo(listPtr, x, y)
  */
 
 static int
-NearestListboxElement(listPtr, y)
-    register Listbox *listPtr;	/* Information about widget. */
-    int y;			/* Y-coordinate in listPtr's window. */
+NearestListboxElement(
+    register Listbox *listPtr,	/* Information about widget. */
+    int y)			/* Y-coordinate in listPtr's window. */
 {
     int index;
 
@@ -2991,18 +2978,17 @@ NearestListboxElement(listPtr, y)
  */
 
 static int
-ListboxSelect(listPtr, first, last, select)
-    register Listbox *listPtr;	/* Information about widget. */
-    int first;			/* Index of first element to select or
+ListboxSelect(
+    register Listbox *listPtr,	/* Information about widget. */
+    int first,			/* Index of first element to select or
 				 * deselect. */
-    int last;			/* Index of last element to select or
+    int last,			/* Index of last element to select or
 				 * deselect. */
-    int select;			/* 1 means select items, 0 means deselect
+    int select)			/* 1 means select items, 0 means deselect
 				 * them. */
 {
-    int i, firstRedisplay, oldCount;
+    int i, firstRedisplay, oldCount, isNew;
     Tcl_HashEntry *entry;
-    int isNew;
 
     if (last < first) {
 	i = first;
@@ -3084,23 +3070,21 @@ ListboxSelect(listPtr, first, last, select)
  */
 
 static int
-ListboxFetchSelection(clientData, offset, buffer, maxBytes)
-    ClientData clientData;	/* Information about listbox widget. */
-    int offset;			/* Offset within selection of first byte to be
+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 selection. */
-    int maxBytes;		/* Maximum number of bytes to place at buffer,
+    char *buffer,		/* Location in which to place selection. */
+    int maxBytes)		/* Maximum number of bytes to place at buffer,
 				 * not including terminating NULL
 				 * character. */
 {
     register Listbox *listPtr = (Listbox *) clientData;
     Tcl_DString selection;
-    int length, count, needNewline;
+    int length, count, needNewline, stringLen, i;
     Tcl_Obj *curElement;
     char *stringRep;
-    int stringLen;
     Tcl_HashEntry *entry;
-    int i;
 
     if (!listPtr->exportSelection) {
 	return -1;
@@ -3142,9 +3126,7 @@ ListboxFetchSelection(clientData, offset, buffer, maxBytes)
 	if (count > maxBytes) {
 	    count = maxBytes;
 	}
-	memcpy((VOID *) buffer,
-		(VOID *) (Tcl_DStringValue(&selection) + offset),
-		(size_t) count);
+	memcpy(buffer, Tcl_DStringValue(&selection) + offset, (size_t) count);
     }
     buffer[count] = '\0';
     Tcl_DStringFree(&selection);
@@ -3170,8 +3152,8 @@ ListboxFetchSelection(clientData, offset, buffer, maxBytes)
  */
 
 static void
-ListboxLostSelection(clientData)
-    ClientData clientData;		/* Information about listbox widget. */
+ListboxLostSelection(
+    ClientData clientData)	/* Information about listbox widget. */
 {
     register Listbox *listPtr = (Listbox *) clientData;
 
@@ -3198,11 +3180,11 @@ ListboxLostSelection(clientData)
  */
 
 static void
-EventuallyRedrawRange(listPtr, first, last)
-    register Listbox *listPtr;	/* Information about widget. */
-    int first;			/* Index of first element in list that needs
+EventuallyRedrawRange(
+    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 that needs to
+    int last)			/* Index of last element in list that needs to
 				 * be redrawn. May be less than first; these
 				 * just bracket a range. */
 {
@@ -3241,8 +3223,8 @@ EventuallyRedrawRange(listPtr, first, last)
  */
 
 static void
-ListboxUpdateVScrollbar(listPtr)
-    register Listbox *listPtr;		/* Information about widget. */
+ListboxUpdateVScrollbar(
+    register Listbox *listPtr)	/* Information about widget. */
 {
     char string[TCL_DOUBLE_SPACE * 2];
     double first, last;
@@ -3302,8 +3284,8 @@ ListboxUpdateVScrollbar(listPtr)
  */
 
 static void
-ListboxUpdateHScrollbar(listPtr)
-    register Listbox *listPtr;		/* Information about widget. */
+ListboxUpdateHScrollbar(
+    register Listbox *listPtr)	/* Information about widget. */
 {
     char string[TCL_DOUBLE_SPACE * 2];
     int result, windowWidth;
@@ -3361,17 +3343,16 @@ ListboxUpdateHScrollbar(listPtr)
  */
 
 static char *
-ListboxListVarProc(clientData, interp, name1, name2, flags)
-    ClientData clientData;	/* Information about button. */
-    Tcl_Interp *interp;		/* Interpreter containing variable. */
-    CONST char *name1;		/* Not used. */
-    CONST char *name2;		/* Not used. */
-    int flags;			/* Information about what happened. */
+ListboxListVarProc(
+    ClientData clientData,	/* Information about button. */
+    Tcl_Interp *interp,		/* Interpreter containing variable. */
+    const char *name1,		/* Not used. */
+    const char *name2,		/* Not used. */
+    int flags)			/* Information about what happened. */
 {
     Listbox *listPtr = (Listbox *)clientData;
     Tcl_Obj *oldListObj, *varListObj;
-    int oldLength;
-    int i;
+    int oldLength, i;
     Tcl_HashEntry *entry;
 
     /*
@@ -3428,17 +3409,23 @@ ListboxListVarProc(clientData, interp, name1, name2, flags)
     Tcl_ListObjLength(listPtr->interp, listPtr->listObj, &listPtr->nElements);
     if (listPtr->nElements < oldLength) {
 	for (i = listPtr->nElements; i < oldLength; i++) {
-	    /* Clean up selection */
+	    /*
+	     * Clean up selection.
+	     */
+
 	    entry = Tcl_FindHashEntry(listPtr->selection, (char *)i);
 	    if (entry != NULL) {
 		listPtr->numSelected--;
 		Tcl_DeleteHashEntry(entry);
 	    }
 
-	    /* Clean up attributes */
+	    /*
+	     * Clean up attributes.
+	     */
+
 	    entry = Tcl_FindHashEntry(listPtr->itemAttrTable, (char *)i);
 	    if (entry != NULL) {
-		ckfree((char *)Tcl_GetHashValue(entry));
+		ckfree((char *) Tcl_GetHashValue(entry));
 		Tcl_DeleteHashEntry(entry);
 	    }
 	}
@@ -3488,11 +3475,11 @@ ListboxListVarProc(clientData, interp, name1, name2, flags)
  */
 
 static void
-MigrateHashEntries(table, first, last, offset)
-    Tcl_HashTable *table;
-    int first;
-    int last;
-    int offset;
+MigrateHashEntries(
+    Tcl_HashTable *table,
+    int first,
+    int last,
+    int offset)
 {
     int i, isNew;
     Tcl_HashEntry *entry;