diff options
| author | dgp <dgp@users.sourceforge.net> | 2018-11-16 20:37:09 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2018-11-16 20:37:09 (GMT) |
| commit | 1fae54c8c004d072d62e3d867ef4e66b238d0bcd (patch) | |
| tree | 54c9a396d306c15ea15d97c4b9cfc5066bd15c27 /generic/tclStringObj.c | |
| parent | 511765faae09dd5a56da42a2df297514cff7df3e (diff) | |
| parent | 35299947e3250ea5b40f66bf8ee1c78844a9b553 (diff) | |
| download | tcl-1fae54c8c004d072d62e3d867ef4e66b238d0bcd.zip tcl-1fae54c8c004d072d62e3d867ef4e66b238d0bcd.tar.gz tcl-1fae54c8c004d072d62e3d867ef4e66b238d0bcd.tar.bz2 | |
merge 8.6
Diffstat (limited to 'generic/tclStringObj.c')
| -rw-r--r-- | generic/tclStringObj.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c index 7be74ca..f7d287b 100644 --- a/generic/tclStringObj.c +++ b/generic/tclStringObj.c @@ -3360,7 +3360,8 @@ TclStringCat( *--------------------------------------------------------------------------- */ -int TclStringCmp( +int +TclStringCmp( Tcl_Obj *value1Ptr, Tcl_Obj *value2Ptr, int checkEq, /* comparison is only for equality */ @@ -3377,7 +3378,6 @@ int TclStringCmp( */ match = 0; } else { - if (!nocase && TclIsPureByteArray(value1Ptr) && TclIsPureByteArray(value2Ptr)) { /* @@ -3418,11 +3418,11 @@ int TclStringCmp( s2 = (char *) Tcl_GetUnicode(value2Ptr); if ( #ifdef WORDS_BIGENDIAN - 1 + 1 #else - checkEq + checkEq #endif - ) { + ) { memCmpFn = memcmp; s1len *= sizeof(Tcl_UniChar); s2len *= sizeof(Tcl_UniChar); @@ -3432,7 +3432,8 @@ int TclStringCmp( } } } else { - if ((empty = TclCheckEmptyString(value1Ptr)) > 0) { + empty = TclCheckEmptyString(value1Ptr); + if (empty > 0) { switch (TclCheckEmptyString(value2Ptr)) { case -1: s1 = 0; |