jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix string cmp old change

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@7098 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2005-03-22 09:51:29 +00:00
commit 508fd65f13
1 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
SWIG/Source/DOH/string.c
View file

@ -113,23 +113,27 @@ String_cmp(DOH *so1, DOH *so2)
{ {
String * s1 = (String *) ObjData(so1); String * s1 = (String *) ObjData(so1);
String * s2 = (String *) ObjData(so2); String * s2 = (String *) ObjData(so2);
register int len = s1->len;
register char *c1 = s1->str; register char *c1 = s1->str;
register char *c2 = s2->str; register char *c2 = s2->str;
#if 1 #if 0
/* this should be faster */ /* this should be faster ? */
if (len != s2->len) { return strcmp(c1, c2);
return (len < s2->len) ? -1 : 1;
} else {
return strncmp(c1, c2, len);
}
#else #else
register char *ce = c1 + len; register int len1 = s1->len;
if (len != s2->len) return (len < s2->len ) ? -1 : 1; register int len2 = s2->len;
if (len1 < len2) {
register char *ce = c1 + len1;
for (; c1 != ce ; ++c1, ++c2) { for (; c1 != ce ; ++c1, ++c2) {
if (*c1 != *c2) return ((*c1 < *c2) ? -1 : 1); if (*c1 != *c2) return ((*c1 < *c2) ? -1 : 1);
} }
return 0; return -1;
} else {
register char *ce = c2 + len2;
for (; c2 != ce ; ++c1, ++c2) {
if (*c1 != *c2) return ((*c1 < *c2) ? -1 : 1);
}
return (len1 == len2) ? 0 : 1;
}
#endif #endif
} }