fix [2021443] inconsistant "wrong # args" messages (follow-up)

6 files changed, 51 insertions, 51 deletions

diff --git a/generic/tclClock.c b/generic/tclClock.c
index 68db1a4..d32e786 100644
--- a/generic/tclClock.c
+++ b/generic/tclClock.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclClock.c,v 1.69 2008/07/13 23:15:22 nijtmans Exp $
+ * RCS: @(#) $Id: tclClock.c,v 1.70 2008/07/21 21:25:21 nijtmans Exp $
  */
 
 #include "tclInt.h"
@@ -60,7 +60,7 @@ static const int daysInPriorMonths[2][13] = {
 typedef enum ClockLiteral {
     LIT__NIL,
     LIT__DEFAULT_FORMAT,
-    LIT_BCE,		LIT_C,			
+    LIT_BCE,		LIT_C,
     LIT_CANNOT_USE_GMT_AND_TIMEZONE,
     LIT_CE,
     LIT_DAYOFMONTH,	LIT_DAYOFWEEK,		LIT_DAYOFYEAR,
@@ -76,7 +76,7 @@ typedef enum ClockLiteral {
 static const char *const literals[] = {
     "",
     "%a %b %d %H:%M:%S %Z %Y",
-    "BCE",		"C",			
+    "BCE",		"C",
     "cannot use -gmt and -timezone in same call",
     "CE",
     "dayOfMonth",	"dayOfWeek",		"dayOfYear",
@@ -225,7 +225,7 @@ static const struct ClockCommand clockCommands[] = {
     { "ParseFormatArgs",	ClockParseformatargsObjCmd },
     { NULL, NULL }
 };
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -280,7 +280,7 @@ TclClockInit(
 		ClockDeleteCmdProc);
     }
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -369,7 +369,7 @@ ClockConvertlocaltoutcObjCmd(
     }
     return status;
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -426,7 +426,7 @@ ClockGetdatefieldsObjCmd(
 	return TCL_ERROR;
     }
 
-    /* 
+    /*
      * fields.seconds could be an unsigned number that overflowed.  Make
      * sure that it isn't.
      */
@@ -492,7 +492,7 @@ ClockGetdatefieldsObjCmd(
 
     return TCL_OK;
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -583,7 +583,7 @@ ClockGetjuliandayfromerayearmonthdayObjCmd (
     }
     return status;
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -676,7 +676,7 @@ ClockGetjuliandayfromerayearweekdayObjCmd (
     }
     return status;
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -724,7 +724,7 @@ ConvertLocalToUTC(
 	return ConvertLocalToUTCUsingTable(interp, fields, rowc, rowv);
     }
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -800,7 +800,7 @@ ConvertLocalToUTCUsingTable(
     fields->seconds = fields->localSeconds - fields->tzOffset;
     return TCL_OK;
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -882,7 +882,7 @@ ConvertLocalToUTCUsingC(
     }
     return TCL_OK;
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -928,7 +928,7 @@ ConvertUTCToLocal(
 	return ConvertUTCToLocalUsingTable(interp, fields, rowc, rowv);
     }
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -979,7 +979,7 @@ ConvertUTCToLocalUsingTable(
     fields->localSeconds = fields->seconds + fields->tzOffset;
     return TCL_OK;
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -1072,7 +1072,7 @@ ConvertUTCToLocalUsingC(
     Tcl_IncrRefCount(fields->tzName);
     return TCL_OK;
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -1138,7 +1138,7 @@ LookupLastTransition(
     }
     return rowv[l];
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -1205,7 +1205,7 @@ GetYearWeekDay(
 	fields->dayOfWeek += 7;
     }
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -1325,7 +1325,7 @@ GetGregorianEraYearDay(
     }
     fields->dayOfYear = day + 1;
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -1356,7 +1356,7 @@ GetMonthDay(
     fields->month = month+1;
     fields->dayOfMonth = day;
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -1407,7 +1407,7 @@ GetJulianDayFromEraYearWeekDay(
     fields->julianDay = firstMonday + 7 * (fields->iso8601Week - 1)
 	    + fields->dayOfWeek - 1;
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -1508,7 +1508,7 @@ GetJulianDayFromEraYearMonthDay(
 	        + ym1o4;
     }
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -1546,7 +1546,7 @@ IsGregorianLeapYear(
 	return 1;
     }
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -1572,7 +1572,7 @@ WeekdayOnOrBefore(
     }
     return julianDay - ((julianDay - k) % 7);
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -1616,7 +1616,7 @@ ClockGetenvObjCmd(
     Tcl_SetObjResult(interp, Tcl_NewStringObj(varValue, -1));
     return TCL_OK;
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -1662,7 +1662,7 @@ ThreadSafeLocalTime(
 #endif
     return tmPtr;
 }
-
+
 /*----------------------------------------------------------------------
  *
  * ClockClicksObjCmd --
@@ -1701,13 +1701,13 @@ ClockClicksObjCmd(
     case 1:
 	break;
     case 2:
-	if (Tcl_GetIndexFromObj(interp, objv[1], clicksSwitches, "option", 0,
+	if (Tcl_GetIndexFromObj(interp, objv[1], clicksSwitches, "switch", 0,
 		&index) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	break;
     default:
-	Tcl_WrongNumArgs(interp, 1, objv, "?-option?");
+	Tcl_WrongNumArgs(interp, 1, objv, "?-switch?");
 	return TCL_ERROR;
     }
 
@@ -1735,7 +1735,7 @@ ClockClicksObjCmd(
 
     return TCL_OK;
 }
-
+
 /*----------------------------------------------------------------------
  *
  * ClockMillisecondsObjCmd -
@@ -1772,7 +1772,7 @@ ClockMillisecondsObjCmd(
 	    now.sec * 1000 + now.usec / 1000));
     return TCL_OK;
 }
-
+
 /*----------------------------------------------------------------------
  *
  * ClockMicrosecondsObjCmd -
@@ -1809,7 +1809,7 @@ ClockMicrosecondsObjCmd(
 	    ((Tcl_WideInt) now.sec * 1000000) + now.usec));
     return TCL_OK;
 }
-
+
 /*
  *-----------------------------------------------------------------------------
  *
@@ -1818,11 +1818,11 @@ ClockMicrosecondsObjCmd(
  *	Parses the arguments for [clock format].
  *
  * Results:
- *	Returns a standard Tcl result, whose value is a four-element 
+ *	Returns a standard Tcl result, whose value is a four-element
  *	list comprising the time format, the locale, and the timezone.
  *
  * This function exists because the loop that parses the [clock format]
- * options is a known performance "hot spot", and is implemented in an 
+ * options is a known performance "hot spot", and is implemented in an
  * effort to speed that particular code up.
  *
  *-----------------------------------------------------------------------------
@@ -1854,7 +1854,7 @@ ClockParseformatargsObjCmd(
 	"-timezone",		NULL };
     enum optionInd {
 	CLOCK_FORMAT_FORMAT,	CLOCK_FORMAT_GMT,	CLOCK_FORMAT_LOCALE,
-	CLOCK_FORMAT_TIMEZONE 
+	CLOCK_FORMAT_TIMEZONE
     };
     int optionIndex;		/* Index of an option */
     int saw = 0;		/* Flag == 1 if option was seen already */
@@ -1927,7 +1927,7 @@ ClockParseformatargsObjCmd(
 #undef formatObj
 
 }
-
+
 /*----------------------------------------------------------------------
  *
  * ClockSecondsObjCmd -
@@ -1963,7 +1963,7 @@ ClockSecondsObjCmd(
     Tcl_SetObjResult(interp, Tcl_NewWideIntObj((Tcl_WideInt) now.sec));
     return TCL_OK;
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -2004,7 +2004,7 @@ TzsetIfNecessary(void)
     }
     Tcl_MutexUnlock(&clockMutex);
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -2035,7 +2035,7 @@ ClockDeleteCmdProc(
 	ckfree((char*) data);
     }
 }
-
+
 /*
  * Local Variables:
  * mode: c
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index c5a1cb6..f1501ff 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -15,7 +15,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclCmdMZ.c,v 1.165 2008/05/30 22:54:27 dkf Exp $
+ * RCS: @(#) $Id: tclCmdMZ.c,v 1.166 2008/07/21 21:25:21 nijtmans Exp $
  */
 
 #include "tclInt.h"
@@ -175,7 +175,7 @@ Tcl_RegexpObjCmd(
   endOfForLoop:
     if ((objc - i) < (2 - about)) {
 	Tcl_WrongNumArgs(interp, 1, objv,
-	    "?switches? exp string ?matchVar? ?subMatchVar subMatchVar ...?");
+	    "?-switch ...? exp string ?matchVar? ?subMatchVar subMatchVar ...?");
 	goto optionError;
     }
     objc -= i;
@@ -515,7 +515,7 @@ Tcl_RegsubObjCmd(
   endOfForLoop:
     if (objc-idx < 3 || objc-idx > 4) {
 	Tcl_WrongNumArgs(interp, 1, objv,
-		"?switches? exp string subSpec ?varName?");
+		"?-switch ...? exp string subSpec ?varName?");
     optionError:
 	if (startIndex) {
 	    Tcl_DecrRefCount(startIndex);
@@ -3539,7 +3539,7 @@ Tcl_SwitchObjCmd(
   finishedOptions:
     if (objc - i < 2) {
 	Tcl_WrongNumArgs(interp, 1, objv,
-		"?switches? string pattern body ... ?default body?");
+		"?-switch ...? string pattern body ?pattern body ...? ?default body?");
 	return TCL_ERROR;
     }
     if (indexVarObj != NULL && mode != OPT_REGEXP) {
@@ -3582,7 +3582,7 @@ Tcl_SwitchObjCmd(
 
 	if (objc < 1) {
 	    Tcl_WrongNumArgs(interp, 1, savedObjv,
-		    "?switches? string {pattern body ... ?default body?}");
+		    "?-switch ...? string {pattern body ?pattern body ...? ?default body?}");
 	    return TCL_ERROR;
 	}
 	objv = listv;
diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index 723b993..ce2ee53 100644
--- a/generic/tclFileName.c
+++ b/generic/tclFileName.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: tclFileName.c,v 1.88 2008/05/02 20:02:39 patthoyts Exp $
+ * RCS: @(#) $Id: tclFileName.c,v 1.89 2008/07/21 21:25:21 nijtmans Exp $
  */
 
 #include "tclInt.h"
@@ -1300,7 +1300,7 @@ Tcl_GlobObjCmd(
 
   endOfForLoop:
     if (objc - i < 1) {
-	Tcl_WrongNumArgs(interp, 1, objv, "?switches? name ?name ...?");
+	Tcl_WrongNumArgs(interp, 1, objv, "?-switch ...? name ?name ...?");
 	return TCL_ERROR;
     }
     if ((globFlags & TCL_GLOBMODE_TAILS) && (pathOrDir == NULL)) {
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index b24b856..57b289b 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclIOCmd.c,v 1.56 2008/07/21 21:02:17 ferrieux Exp $
+ * RCS: @(#) $Id: tclIOCmd.c,v 1.57 2008/07/21 21:25:21 nijtmans Exp $
  */
 
 #include "tclInt.h"
@@ -873,7 +873,7 @@ Tcl_ExecObjCmd(
 	}
     }
     if (objc <= skip) {
-	Tcl_WrongNumArgs(interp, 1, objv, "?switches? arg ?arg ...?");
+	Tcl_WrongNumArgs(interp, 1, objv, "?-switch ...? arg ?arg ...?");
 	return TCL_ERROR;
     }
 
diff --git a/generic/tclLoad.c b/generic/tclLoad.c
index 7ed2ee7..6c1c483 100644
--- a/generic/tclLoad.c
+++ b/generic/tclLoad.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclLoad.c,v 1.17 2008/05/30 22:54:29 dkf Exp $
+ * RCS: @(#) $Id: tclLoad.c,v 1.18 2008/07/21 21:25:21 nijtmans Exp $
  */
 
 #include "tclInt.h"
@@ -549,7 +549,7 @@ Tcl_UnloadObjCmd(
   endOfForLoop:
     if ((objc-i < 1) || (objc-i > 3)) {
 	Tcl_WrongNumArgs(interp, 1, objv,
-		"?switches? fileName ?packageName? ?interp?");
+		"?-switch ...? fileName ?packageName? ?interp?");
 	return TCL_ERROR;
     }
     if (Tcl_FSConvertToPathType(interp, objv[i]) != TCL_OK) {
diff --git a/generic/tclTest.c b/generic/tclTest.c
index ec7eb65..3d6e2fb 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -14,7 +14,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclTest.c,v 1.116 2008/07/19 22:50:41 nijtmans Exp $
+ * RCS: @(#) $Id: tclTest.c,v 1.117 2008/07/21 21:25:21 nijtmans Exp $
  */
 
 #define TCL_TEST
@@ -3672,7 +3672,7 @@ TestregexpObjCmd(
   endOfForLoop:
     if (objc - i < hasxflags + 2 - about) {
 	Tcl_WrongNumArgs(interp, 1, objv,
-		"?switches? exp string ?matchVar? ?subMatchVar subMatchVar ...?");
+		"?-switch ...? exp string ?matchVar? ?subMatchVar ...?");
 	return TCL_ERROR;
     }
     objc -= i;