Merge branch 'master' of http://wagner.pp.ru/git/oss/catdoc
authorVictor Wagner <vitus@wagner.pp.ru>
Wed, 27 Apr 2016 12:22:20 +0000 (15:22 +0300)
committerVictor Wagner <vitus@wagner.pp.ru>
Wed, 27 Apr 2016 12:22:20 +0000 (15:22 +0300)
Conflicts:
src/fileutil.c

1  2 
src/charsets.c
src/fileutil.c

diff --cc src/charsets.c
Simple merge
diff --cc src/fileutil.c
index 5ae039f5cd603eb9f57b5338266af4c051b227d8,ce0bdb7b50d3405b0c4b87b4715c297f8284f4ce..fc8e7f7bae850c9a28b328d1dd1c1f598b9fd616
@@@ -111,10 -111,7 +111,7 @@@ int check_charset(char **filename,cons
                        *filename=strdup(charset);
                        free(tmppath);
                        return 1;
-               } else {
-                       free(tmppath);
-               }
--      }
++      } 
        return 0;
  }