Resolving local merge conflicts

2019-10-28 15:15:13 -07:00
parent 02433e0b15 55ee7d56e4
commit f422914619
3 changed files with 5 additions and 0 deletions
@@ -330,6 +330,7 @@ int UTIL_prepareFileList(const char *dirName, char** bufStart, size_t* pos, char
 YES => Skip the file (return 0)
 NO => return 1
 */
+
 int UTIL_isCompressedFile(const char *inputName)
 {
    return compareExtensions(inputName,g_compressedFileExtensions);
@@ -337,12 +338,14 @@ int UTIL_isCompressedFile(const char *inputName)

 int compareExtensions(const char* infilename, const char* extensionList[])
 {
+  int i=0;
   while(*extensionList != NULL)
   {
     const char* ext = strstr(infilename,extensionList[i]);
     if(ext)
        return 1;
      ++extensionList;
+      i++;
   }
   return 0;
 }