diff options
| author | dgp <dgp@users.sourceforge.net> | 2018-11-16 20:44:08 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2018-11-16 20:44:08 (GMT) |
| commit | f1dbfbf21581370d5dad9cbeb4c8ac09f93fb30c (patch) | |
| tree | 23939403aac62529ec29568c072731b9b2a25e6f /generic/tclStringObj.c | |
| parent | d904246bf4e9a50662c96fd30a010175aba29ab1 (diff) | |
| parent | 1fae54c8c004d072d62e3d867ef4e66b238d0bcd (diff) | |
| download | tcl-f1dbfbf21581370d5dad9cbeb4c8ac09f93fb30c.zip tcl-f1dbfbf21581370d5dad9cbeb4c8ac09f93fb30c.tar.gz tcl-f1dbfbf21581370d5dad9cbeb4c8ac09f93fb30c.tar.bz2 | |
merge 8.7
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 d1ada3a..0f2bcae 100644 --- a/generic/tclStringObj.c +++ b/generic/tclStringObj.c @@ -3274,7 +3274,8 @@ TclStringCat( *--------------------------------------------------------------------------- */ -int TclStringCmp( +int +TclStringCmp( Tcl_Obj *value1Ptr, Tcl_Obj *value2Ptr, int checkEq, /* comparison is only for equality */ @@ -3292,7 +3293,6 @@ int TclStringCmp( */ match = 0; } else { - if (!nocase && TclIsPureByteArray(value1Ptr) && TclIsPureByteArray(value2Ptr)) { /* @@ -3333,11 +3333,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); @@ -3347,7 +3347,8 @@ int TclStringCmp( } } } else { - if ((empty = TclCheckEmptyString(value1Ptr)) > 0) { + empty = TclCheckEmptyString(value1Ptr); + if (empty > 0) { switch (TclCheckEmptyString(value2Ptr)) { case -1: s1 = 0; |