(cherry-pick): Fix a lot of comments, regarding argv/argc -> objv/objc

jan.nijtmans · jan.nijtmans · commit 014cec4efea4 · 2025-02-19T13:04:50.000Z
diff --git a/generic/tkBind.c b/generic/tkBind.c
@@ -3824,9 +3824,9 @@ GetAllVirtualEvents(
  *	an XEvent, constructed from information parsed from the event
  *	description string and its optional arguments.
  *
- *	argv[0] contains name of the target window.
- *	argv[1] contains pattern string for one event (e.g, <Control-v>).
- *	argv[2..argc-1] contains -field/option pairs for specifying additional
+ *	objv[0] contains name of the target window.
+ *	objv[1] contains pattern string for one event (e.g, <Control-v>).
+ *	objv[2..objc-1] contains -field/option pairs for specifying additional
  *			detail in the generated event.
  *
  *	Either virtual or physical events can be generated this way. The event
diff --git a/generic/tkCanvText.c b/generic/tkCanvText.c
@@ -223,7 +223,7 @@ static const Tk_ConfigSpec configSpecs[] = {
 
 static void		ComputeTextBbox(Tk_Canvas canvas, TextItem *textPtr);
 static int		ConfigureText(Tcl_Interp *interp,
-			    Tk_Canvas canvas, Tk_Item *itemPtr, Tcl_Size argc,
+			    Tk_Canvas canvas, Tk_Item *itemPtr, Tcl_Size objc,
 			    Tcl_Obj *const objv[], int flags);
 static int		CreateText(Tcl_Interp *interp,
 			    Tk_Canvas canvas, struct Tk_Item *itemPtr,
diff --git a/generic/tkCmds.c b/generic/tkCmds.c
@@ -446,17 +446,17 @@ TkFreeBindingTags(
     TkWindow *winPtr)		/* Window whose tags are to be released. */
 {
     Tcl_Size i;
-    const char *p;
+    char *p;
 
     for (i = 0; i < winPtr->numTags; i++) {
-	p = (const char *)winPtr->tagPtr[i];
+	p = (char *)winPtr->tagPtr[i];
 	if (*p == '.') {
 	    /*
 	     * Names starting with "." are malloced rather than Uids, so they
 	     * have to be freed.
 	     */
 
-	    ckfree((char *)p);
+	    ckfree(p);
 	}
     }
     ckfree(winPtr->tagPtr);
diff --git a/generic/tkEntry.c b/generic/tkEntry.c
@@ -1086,7 +1086,7 @@ DestroyEntry(
  *
  * ConfigureEntry --
  *
- *	This function is called to process an argv/argc list, plus the Tk
+ *	This function is called to process an objv/objc list, plus the Tk
  *	option database, in order to configure (or reconfigure) an entry
  *	widget.
  *
diff --git a/generic/tkFont.c b/generic/tkFont.c
@@ -648,7 +648,7 @@ Tk_FontObjCmd(
 	    return result;
 	}
 	return GetAttributeInfoObj(interp, &nfPtr->fa, objPtr);
-     }
+    }
     case FONT_CREATE: {
 	int skip = 3, i;
 	const char *name;
@@ -3403,7 +3403,7 @@ noMapping:	;
  *
  * Side effects:
  *	The fields of the font attributes structure get filled in with
- *	information from argc/argv. If an error occurs while parsing, the font
+ *	information from objv/objc. If an error occurs while parsing, the font
  *	attributes structure will contain all modifications specified in the
  *	command line options up to the point of the error.
  *
diff --git a/generic/tkImgGIF.c b/generic/tkImgGIF.c
@@ -424,7 +424,7 @@ FileReadGIF(
     int fileWidth, fileHeight, imageWidth, imageHeight;
     unsigned int nBytes;
     int index = 0, result = TCL_ERROR;
-    Tcl_Size argc = 0, i;
+    Tcl_Size objc = 0, i;
     Tcl_Obj **objv;
     unsigned char buf[100];
     unsigned char *trashBuffer = NULL;
@@ -455,16 +455,16 @@ FileReadGIF(
      */
 
     if (format && Tcl_ListObjGetElements(interp, format,
-	    &argc, &objv) != TCL_OK) {
+	    &objc, &objv) != TCL_OK) {
 	return TCL_ERROR;
     }
-    for (i = 1; i < argc; i++) {
+    for (i = 1; i < objc; i++) {
 	int optionIdx;
 	if (Tcl_GetIndexFromObjStruct(interp, objv[i], optionStrings,
 		sizeof(char *), "option name", 0, &optionIdx) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	if (i == (argc-1)) {
+	if (i == (objc-1)) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "no value given for \"%s\" option",
 		    Tcl_GetString(objv[i])));
diff --git a/generic/tkImgListFormat.c b/generic/tkImgListFormat.c
@@ -181,7 +181,7 @@ Tk_PhotoImageFormat tkImgFmtDefault = {
  * Side effects:
  *      The value in *indexPtr is updated to the index of the fist
  *      element in argv[] that does not look like an option/value, or to
- *      argc if parsing reached the end of argv[].
+ *      objc if parsing reached the end of argv[].
  *
  *----------------------------------------------------------------------
  */
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
@@ -167,17 +167,17 @@ static Tcl_ThreadDataKey dataKey;
 
 static const Tk_ConfigSpec configSpecs[] = {
     {TK_CONFIG_STRING, "-data", NULL, NULL,
-	 NULL, TCL_INDEX_NONE, TK_CONFIG_NULL_OK|TK_CONFIG_OBJS, NULL},
+	 NULL, TCL_INDEX_NONE, TK_CONFIG_OBJS|TK_CONFIG_NULL_OK, NULL},
     {TK_CONFIG_STRING, "-file", NULL, NULL,
-	 NULL, offsetof(PhotoModel, fileObj), TK_CONFIG_NULL_OK|TK_CONFIG_OBJS, NULL},
+	 NULL, offsetof(PhotoModel, fileObj), TK_CONFIG_OBJS|TK_CONFIG_NULL_OK, NULL},
     {TK_CONFIG_STRING, "-format", NULL, NULL,
-	 NULL, TCL_INDEX_NONE, TK_CONFIG_NULL_OK|TK_CONFIG_OBJS, NULL},
+	 NULL, TCL_INDEX_NONE, TK_CONFIG_OBJS|TK_CONFIG_NULL_OK, NULL},
     {TK_CONFIG_DOUBLE, "-gamma", NULL, NULL,
 	 DEF_PHOTO_GAMMA, offsetof(PhotoModel, gamma), 0, NULL},
     {TK_CONFIG_INT, "-height", NULL, NULL,
 	 DEF_PHOTO_HEIGHT, offsetof(PhotoModel, userHeight), 0, NULL},
     {TK_CONFIG_STRING, "-metadata", NULL, NULL,
-	 NULL, TCL_INDEX_NONE, TK_CONFIG_NULL_OK|TK_CONFIG_OBJS, NULL},
+	 NULL, TCL_INDEX_NONE, TK_CONFIG_OBJS|TK_CONFIG_NULL_OK, NULL},
     {TK_CONFIG_UID, "-palette", NULL, NULL,
 	 DEF_PHOTO_PALETTE, offsetof(PhotoModel, palette), 0, NULL},
     {TK_CONFIG_INT, "-width", NULL, NULL,
@@ -1650,7 +1650,7 @@ GetExtension(
  * Side effects:
  *	Fields in *optPtr get filled in. The value of optIndexPtr is updated
  *	to contain the index of the first element in argv[] that was not
- *	parsed, or argc if the end of objv[] was reached.
+ *	parsed, or objc if the end of objv[] was reached.
  *
  *----------------------------------------------------------------------
  */
diff --git a/generic/tkMenu.c b/generic/tkMenu.c
@@ -1564,7 +1564,7 @@ MenuWorldChanged(
  *
  * ConfigureMenu --
  *
- *	This function is called to process an argv/argc list, plus the Tk
+ *	This function is called to process an objv/objc list, plus the Tk
  *	option database, in order to configure (or reconfigure) a menu widget.
  *
  * Results:
@@ -1946,7 +1946,7 @@ PostProcessEntry(
  *
  * ConfigureMenuEntry --
  *
- *	This function is called to process an argv/argc list in order to
+ *	This function is called to process an objv/objc list in order to
  *	configure (or reconfigure) one entry in a menu.
  *
  * Results:
diff --git a/generic/tkMenubutton.c b/generic/tkMenubutton.c
@@ -449,7 +449,7 @@ DestroyMenuButton(
  *
  * ConfigureMenuButton --
  *
- *	This function is called to process an argv/argc list, plus the Tk
+ *	This function is called to process an objv/objc list, plus the Tk
  *	option database, in order to configure (or reconfigure) a menubutton
  *	widget.
  *
diff --git a/generic/tkMessage.c b/generic/tkMessage.c
@@ -414,7 +414,7 @@ DestroyMessage(
  *
  * ConfigureMessage --
  *
- *	This function is called to process an argv/argc list, plus the Tk
+ *	This function is called to process an objv/objc list, plus the Tk
  *	option database, in order to configure (or reconfigure) a message
  *	widget.
  *
diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c
@@ -1224,7 +1224,7 @@ PanedWindowSashCommand(
  *
  * ConfigurePanedWindow --
  *
- *	This function is called to process an argv/argc list in conjunction
+ *	This function is called to process an objv/objc list in conjunction
  *	with the Tk option database to configure (or reconfigure) a paned
  *	window widget.
  *
diff --git a/generic/tkPlace.c b/generic/tkPlace.c
@@ -593,7 +593,7 @@ FindContainer(
  *
  * ConfigureContent --
  *
- *	This function is called to process an argv/argc list to reconfigure
+ *	This function is called to process an objv/objc list to reconfigure
  *	the placement of a window.
  *
  * Results:
diff --git a/generic/tkScale.c b/generic/tkScale.c
@@ -569,7 +569,7 @@ DestroyScale(
  *
  * ConfigureScale --
  *
- *	This procedure is called to process an argv/argc list, plus the Tk
+ *	This procedure is called to process an objv/objc list, plus the Tk
  *	option database, in order to configure (or reconfigure) a scale
  *	widget.
  *
diff --git a/generic/tkScrollbar.c b/generic/tkScrollbar.c
@@ -80,7 +80,7 @@ static const Tk_ConfigSpec configSpecs[] = {
 	DEF_SCROLLBAR_REPEAT_INTERVAL, offsetof(TkScrollbar, repeatInterval), 0, NULL},
     {TK_CONFIG_STRING, "-takefocus", "takeFocus", "TakeFocus",
 	DEF_SCROLLBAR_TAKE_FOCUS, offsetof(TkScrollbar, takeFocusObj),
-	TK_CONFIG_NULL_OK|TK_CONFIG_OBJS, NULL},
+	TK_CONFIG_OBJS|TK_CONFIG_NULL_OK, NULL},
     {TK_CONFIG_COLOR, "-troughcolor", "troughColor", "Background",
 	DEF_SCROLLBAR_TROUGH_COLOR, offsetof(TkScrollbar, troughColorPtr),
 	TK_CONFIG_COLOR_ONLY, NULL},
@@ -509,7 +509,7 @@ ScrollbarWidgetObjCmd(
  *
  * ConfigureScrollbar --
  *
- *	This function is called to process an argv/argc list, plus the Tk
+ *	This function is called to process an objv/objc list, plus the Tk
  *	option database, in order to configure (or reconfigure) a scrollbar
  *	widget.
  *
diff --git a/generic/tkSquare.c b/generic/tkSquare.c
@@ -298,7 +298,7 @@ SquareWidgetObjCmd(
  *
  * SquareConfigure --
  *
- *	This procedure is called to process an argv/argc list in conjunction
+ *	This procedure is called to process an objv/objc list in conjunction
  *	with the Tk option database to configure (or reconfigure) a square
  *	widget.
  *

Original file line number	Diff line number	Diff line change
`@@ -3824,9 +3824,9 @@ GetAllVirtualEvents(`
`3824`	`3824`	`* an XEvent, constructed from information parsed from the event`
`3825`	`3825`	`* description string and its optional arguments.`
`3826`	`3826`	`*`
`3827`		`- * argv[0] contains name of the target window.`
`3828`		`- * argv[1] contains pattern string for one event (e.g, <Control-v>).`
`3829`		`- * argv[2..argc-1] contains -field/option pairs for specifying additional`
	`3827`	`+ * objv[0] contains name of the target window.`
	`3828`	`+ * objv[1] contains pattern string for one event (e.g, <Control-v>).`
	`3829`	`+ * objv[2..objc-1] contains -field/option pairs for specifying additional`
`3830`	`3830`	`* detail in the generated event.`
`3831`	`3831`	`*`
`3832`	`3832`	`* Either virtual or physical events can be generated this way. The event`
Original file line number	Diff line number	Diff line change
`@@ -446,17 +446,17 @@ TkFreeBindingTags(`
`446`	`446`	`TkWindow winPtr) / Window whose tags are to be released. */`
`447`	`447`	`{`
`448`	`448`	`Tcl_Size i;`
`449`		`- const char *p;`
	`449`	`+ char *p;`
`450`	`450`
`451`	`451`	`for (i = 0; i < winPtr->numTags; i++) {`
`452`		`- p = (const char *)winPtr->tagPtr[i];`
	`452`	`+ p = (char *)winPtr->tagPtr[i];`
`453`	`453`	`if (*p == '.') {`
`454`	`454`	`/*`
`455`	`455`	`* Names starting with "." are malloced rather than Uids, so they`
`456`	`456`	`* have to be freed.`
`457`	`457`	`*/`
`458`	`458`
`459`		`- ckfree((char *)p);`
	`459`	`+ ckfree(p);`
`460`	`460`	`}`
`461`	`461`	`}`
`462`	`462`	`ckfree(winPtr->tagPtr);`
Original file line number	Diff line number	Diff line change
`@@ -1086,7 +1086,7 @@ DestroyEntry(`
`1086`	`1086`	`*`
`1087`	`1087`	`* ConfigureEntry --`
`1088`	`1088`	`*`
`1089`		`- * This function is called to process an argv/argc list, plus the Tk`
	`1089`	`+ * This function is called to process an objv/objc list, plus the Tk`
`1090`	`1090`	`* option database, in order to configure (or reconfigure) an entry`
`1091`	`1091`	`* widget.`
`1092`	`1092`	`*`
Original file line number	Diff line number	Diff line change
`@@ -648,7 +648,7 @@ Tk_FontObjCmd(`
`648`	`648`	`return result;`
`649`	`649`	`}`
`650`	`650`	`return GetAttributeInfoObj(interp, &nfPtr->fa, objPtr);`
`651`		`- }`
	`651`	`+ }`
`652`	`652`	`case FONT_CREATE: {`
`653`	`653`	`int skip = 3, i;`
`654`	`654`	`const char *name;`
`@@ -3403,7 +3403,7 @@ noMapping: ;`
`3403`	`3403`	`*`
`3404`	`3404`	`* Side effects:`
`3405`	`3405`	`* The fields of the font attributes structure get filled in with`
`3406`		`- * information from argc/argv. If an error occurs while parsing, the font`
	`3406`	`+ * information from objv/objc. If an error occurs while parsing, the font`
`3407`	`3407`	`* attributes structure will contain all modifications specified in the`
`3408`	`3408`	`* command line options up to the point of the error.`
`3409`	`3409`	`*`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ Tk_PhotoImageFormat tkImgFmtDefault = {`
`181`	`181`	`* Side effects:`
`182`	`182`	`* The value in *indexPtr is updated to the index of the fist`
`183`	`183`	`* element in argv[] that does not look like an option/value, or to`
`184`		`- * argc if parsing reached the end of argv[].`
	`184`	`+ * objc if parsing reached the end of argv[].`
`185`	`185`	`*`
`186`	`186`	`*----------------------------------------------------------------------`
`187`	`187`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -1564,7 +1564,7 @@ MenuWorldChanged(`
`1564`	`1564`	`*`
`1565`	`1565`	`* ConfigureMenu --`
`1566`	`1566`	`*`
`1567`		`- * This function is called to process an argv/argc list, plus the Tk`
	`1567`	`+ * This function is called to process an objv/objc list, plus the Tk`
`1568`	`1568`	`* option database, in order to configure (or reconfigure) a menu widget.`
`1569`	`1569`	`*`
`1570`	`1570`	`* Results:`
`@@ -1946,7 +1946,7 @@ PostProcessEntry(`
`1946`	`1946`	`*`
`1947`	`1947`	`* ConfigureMenuEntry --`
`1948`	`1948`	`*`
`1949`		`- * This function is called to process an argv/argc list in order to`
	`1949`	`+ * This function is called to process an objv/objc list in order to`
`1950`	`1950`	`* configure (or reconfigure) one entry in a menu.`
`1951`	`1951`	`*`
`1952`	`1952`	`* Results:`
Original file line number	Diff line number	Diff line change
`@@ -449,7 +449,7 @@ DestroyMenuButton(`
`449`	`449`	`*`
`450`	`450`	`* ConfigureMenuButton --`
`451`	`451`	`*`
`452`		`- * This function is called to process an argv/argc list, plus the Tk`
	`452`	`+ * This function is called to process an objv/objc list, plus the Tk`
`453`	`453`	`* option database, in order to configure (or reconfigure) a menubutton`
`454`	`454`	`* widget.`
`455`	`455`	`*`