STR_cmpi returns immediately if the two string are a different length. The

return code in that case indicates which is longer.

Tom


git-svn-id: http://svn.cactuscode.org/flesh/trunk@1018 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 12 insertions, 8 deletions

diff --git a/src/util/SKBinTree.c b/src/util/SKBinTree.c
index fb55d5bf..be21b7dd 100644
--- a/src/util/SKBinTree.c
+++ b/src/util/SKBinTree.c
@@ -291,7 +291,8 @@ t_sktree *SKTreeFindFirst(t_sktree *root)
    @calls     
    @calledby   
    @history 
- 
+   @hdate Wed Oct 13 15:30:57 1999 @hauthor Tom Goodale
+   @hdesc Checks the length of the two string first. 
    @endhistory 
 
 @@*/
@@ -299,16 +300,19 @@ int STR_cmpi(const char *string1, const char *string2)
 {
   int retval;
   int position;
+ 
+  retval = strlen(string1) - strlen(string2);
 
-  retval = 1;
-
-  for(position = 0; 
-      position < strlen(string1)+1 && position < strlen(string2)+1;
-      position++)
+  if(! retval)
   {
-    if((retval = (tolower(string1[position]) - tolower(string2[position]))))
+    for(position = 0; 
+        string1[position] && string2[position];
+        position++)
     {
-      break;
+      if((retval = (tolower(string1[position]) - tolower(string2[position]))))
+      {
+        break;
+      }
     }
   }