summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2008-03-24 03:10:06 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2008-03-24 03:10:06 (GMT)
commite9a30faa89bc4de4179f8fdb52ea44120bf7b525 (patch)
treef0d17d22775bdfea5eeac951f375e2ef1db944e8
parentcb63dde6f333ff6e25312730911757c7468acc5a (diff)
downloadtcl-e9a30faa89bc4de4179f8fdb52ea44120bf7b525.zip
tcl-e9a30faa89bc4de4179f8fdb52ea44120bf7b525.tar.gz
tcl-e9a30faa89bc4de4179f8fdb52ea44120bf7b525.tar.bz2
improved fix keeping short-circuit
-rw-r--r--generic/tclBinary.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index 2045d0f..baea4ba 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.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: tclBinary.c,v 1.40 2008/03/24 02:50:52 patthoyts Exp $
+ * RCS: @(#) $Id: tclBinary.c,v 1.41 2008/03/24 03:10:06 patthoyts Exp $
*/
#include "tclInt.h"
@@ -785,8 +785,10 @@ Tcl_BinaryObjCmd(
if (!GetFormatSpec(&format, &cmd, &count, &flags)) {
break;
}
- if ((count == 0) && !(cmd == '@' || cmd == 'x')) {
- arg++;
+ if ((count == 0) && (cmd != '@')) {
+ if (cmd != 'x') {
+ arg++;
+ }
continue;
}
switch (cmd) {