Resolving local merge conflicts

diff --cc programs/util.c
index 63e9ef9e9023aeb1cca2a0db1842af0fa27fb9a5,830f2039ef6fb31d7a28da43eac45a35e5f37548..f820795545cd598eb22c92ec24f64874bbb4f20b
--- 1/programs/util.c
--- 2/programs/util.c
+++ b/programs/util.c
@@@ -330,21 -330,22 +330,24 @@@ int UTIL_prepareFileList(const char *di
  YES => Skip the file (return 0)
  NO => return 1
  */
 -int UTIL_isPrecompressedFile(const char *inputName)
++
 +int UTIL_isCompressedFile(const char *inputName)
  {
 -    return compareExtensions(inputName,compressedFileExtensions);
 +    return compareExtensions(inputName,g_compressedFileExtensions);
  }
  
 -int compareExtensions(const char* infilename, const char extensionList[4][10])
 +int compareExtensions(const char* infilename, const char* extensionList[])
  {
 -   int i=0;
 -   //char* ext = strchr(infilename, '.');
 -   for(i=0;i<4;i++)
++  int i=0;
 +   while(*extensionList != NULL)
     {
 -     char* ext = strstr(infilename,extensionList[i]);
 +     const char* ext = strstr(infilename,extensionList[i]);
       if(ext)
 -        return 0;
 +        return 1;
 +      ++extensionList;
++      i++;
     }
 -   return 1;
 +   return 0;
  }
  /*
   * UTIL_createFileList - takes a list of files and directories (params: inputNames, inputNamesNb), scans directories,

diff --cc programs/zstdcli.c
Simple merge

diff --cc tests/playTests.sh
Simple merge