summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--generic/tkArgv.c16
2 files changed, 5 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 084af58..168358c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
2008-04-07 Jeff Hobbs <jeffh@ActiveState.com>
- * generic/tkArgv.c: fix -help mem explosion. [Bug 1936238] (bachmann)
+ * generic/tkArgv.c: fix -help mem explosion. [Bug 1936238] (kenny)
2008-04-03 Pat Thoyts <patthoyts@users.sourceforge.net>
diff --git a/generic/tkArgv.c b/generic/tkArgv.c
index 286f348..1a530b2 100644
--- a/generic/tkArgv.c
+++ b/generic/tkArgv.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: tkArgv.c,v 1.11.2.1 2008/04/07 18:38:01 hobbs Exp $
+ * RCS: @(#) $Id: tkArgv.c,v 1.11.2.2 2008/04/07 22:27:21 hobbs Exp $
*/
#include "tkInt.h"
@@ -337,10 +337,7 @@ PrintUsage(
* for default options. */
{
register Tk_ArgvInfo *infoPtr;
- size_t width, i;
- int numSpaces; /* must be int to allow for negative values */
-#define NUM_SPACES 20
- static char spaces[] = " ";
+ size_t width, i, numSpaces;
char tmp[TCL_DOUBLE_SPACE];
/*
@@ -373,13 +370,8 @@ PrintUsage(
}
Tcl_AppendResult(interp, "\n ", infoPtr->key, ":", NULL);
numSpaces = width + 1 - strlen(infoPtr->key);
- while (numSpaces > 0) {
- if (numSpaces >= NUM_SPACES) {
- Tcl_AppendResult(interp, spaces, NULL);
- } else {
- Tcl_AppendResult(interp, spaces+NUM_SPACES-numSpaces,NULL);
- }
- numSpaces -= NUM_SPACES;
+ while (numSpaces-- > 0) {
+ Tcl_AppendResult(interp, " ", NULL);
}
Tcl_AppendResult(interp, infoPtr->help, NULL);
switch (infoPtr->type) {