summaryrefslogtreecommitdiffstats
path: root/generic/tclIndexObj.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2006-04-05 15:16:46 (GMT)
committerdgp <dgp@users.sourceforge.net>2006-04-05 15:16:46 (GMT)
commit729b47be45a702ff78180857ffeaa1e7ce2c0de5 (patch)
tree667b3d1bc8a2e6c36298009343029b89ddd38dfd /generic/tclIndexObj.c
parent1fbc814589c815aba033653af3694fc122ce1538 (diff)
downloadtcl-729b47be45a702ff78180857ffeaa1e7ce2c0de5.zip
tcl-729b47be45a702ff78180857ffeaa1e7ce2c0de5.tar.gz
tcl-729b47be45a702ff78180857ffeaa1e7ce2c0de5.tar.bz2
* generic/tclIndexObj.c (Tcl_GetIndexFromObjStruct): Allow empty
strings to be matched by the Tcl_GetIndexFromObj machinery, in the same manner as any other key. [Bug 1464039]
Diffstat (limited to 'generic/tclIndexObj.c')
-rw-r--r--generic/tclIndexObj.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/generic/tclIndexObj.c b/generic/tclIndexObj.c
index 7bc046d..f22e7d4 100644
--- a/generic/tclIndexObj.c
+++ b/generic/tclIndexObj.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: tclIndexObj.c,v 1.16.2.3 2006/04/05 13:20:09 dkf Exp $
+ * RCS: @(#) $Id: tclIndexObj.c,v 1.16.2.4 2006/04/05 15:17:05 dgp Exp $
*/
#include "tclInt.h"
@@ -227,13 +227,9 @@ Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags,
}
}
/*
- * Check if we were instructed to disallow abbreviations. Note that we do
- * not allow the empty string as an abbreviation of anything; it is only
- * processed by this function as a non-error case if the table of strings
- * has an entry in it that is itself an empty string. This only matters in
- * the case where the table has a singleton entry.
+ * Check if we were instructed to disallow abbreviations.
*/
- if ((flags & TCL_EXACT) || (key[0] == '\0') || (numAbbrev != 1)) {
+ if ((flags & TCL_EXACT) || (numAbbrev != 1)) {
goto error;
}