CHANGES.current
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@6269 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
c3f519f67d
commit
15a5e3976f
15 changed files with 113 additions and 35 deletions
|
|
@ -111,25 +111,25 @@ String_len(DOH *so) {
|
|||
static int
|
||||
String_cmp(DOH *so1, DOH *so2)
|
||||
{
|
||||
String *s1, *s2;
|
||||
char *c1, *c2;
|
||||
int maxlen,i;
|
||||
s1 = (String *) ObjData(so1);
|
||||
s2 = (String *) ObjData(so2);
|
||||
maxlen = s1->len;
|
||||
if (s2->len < maxlen) maxlen = s2->len;
|
||||
String * s1 = (String *) ObjData(so1);
|
||||
String * s2 = (String *) ObjData(so2);
|
||||
register char *c1;
|
||||
register char *c2;
|
||||
register int len = s1->len;
|
||||
if (len != s2->len) return (len < s2->len ) ? -1 : 1;
|
||||
c1 = s1->str;
|
||||
c2 = s2->str;
|
||||
for (i = 0; i < maxlen; i++,c1++,c2++) {
|
||||
if (*c1 != *c2) break;
|
||||
#if 1
|
||||
/* this is better, but it could be not present in all the
|
||||
systems ? */
|
||||
return memcmp(c1, c2, len);
|
||||
#else
|
||||
/* faster loop with nonzero predicates */
|
||||
for (; len ; --len,++c1,++c2) {
|
||||
if (*c1 != *c2) return ((*c1 < *c2) ? -1 : 1);
|
||||
}
|
||||
if (i < maxlen) {
|
||||
if (*c1 < *c2) return -1;
|
||||
else return 1;
|
||||
}
|
||||
if (s1->len == s2->len) return 0;
|
||||
if (s1->len > s2->len) return 1;
|
||||
return -1;
|
||||
return 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
/* -----------------------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue