Bug 562594 - comparison between signed and unsigned integer expressions in ReadStrings. r=rstrong

toolkit/mozapps/readstrings/readstrings.cpp

@@ -154,7 +154,7 @@ find_key(const char *keyList, char* key)
 int
 ReadStrings(const NS_tchar *path,
             const char *keyList,
-            int numStrings,
+            unsigned int numStrings,
             char results[][MAX_TEXT_LEN],
             const char *section)
 {
@@ -188,7 +188,7 @@ ReadStrings(const NS_tchar *path,
   char *buffer = fileContents;
   PRBool inStringsSection = PR_FALSE;
 
-  int read = 0;
+  unsigned int read = 0;
 
   while (char *token = NS_strtok(kNL, &buffer)) {
     if (token[0] == '#' || token[0] == ';') // it's a comment
@@ -233,7 +233,7 @@ ReadStrings(const NS_tchar *path,
       continue;
 
     int keyIndex = find_key(keyList, key);
-    if (keyIndex >= 0 && keyIndex < numStrings)
+    if (keyIndex >= 0 && (unsigned int)keyIndex < numStrings)
     {
       strncpy(results[keyIndex], token, MAX_TEXT_LEN - 1);
       results[keyIndex][MAX_TEXT_LEN - 1] = 0;
@@ -249,7 +249,7 @@ ReadStrings(const NS_tchar *path,
 int
 ReadStrings(const NS_tchar *path, StringTable *results)
 {
-  const int kNumStrings = 2;
+  const unsigned int kNumStrings = 2;
   const char *kUpdaterKeys = "Title\0Info\0";
   char updater_strings[kNumStrings][MAX_TEXT_LEN];
 

toolkit/mozapps/readstrings/readstrings.h

@@ -64,7 +64,7 @@ int ReadStrings(const NS_tchar *path, StringTable *results);
  */
 int ReadStrings(const NS_tchar *path,
                 const char *keyList,
-                int numStrings,
+                unsigned int numStrings,
                 char results[][MAX_TEXT_LEN],
                 const char *section = NULL);