Merge pull request #3434 from bparker06/hash_filename2

use const delimiter and remove pointer arithmetic
This commit is contained in:
Twinaphex 2016-08-26 17:40:01 +02:00 committed by GitHub
commit 049679b901

View File

@ -99,7 +99,7 @@ const char *path_get_archive_delim(const char *path)
{ {
#ifdef HAVE_COMPRESSION #ifdef HAVE_COMPRESSION
const char *last = find_last_slash(path); const char *last = find_last_slash(path);
char *delim = NULL; const char *delim = NULL;
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
if (last) if (last)
@ -482,7 +482,7 @@ void path_basedir(char *path)
#ifdef HAVE_COMPRESSION #ifdef HAVE_COMPRESSION
/* We want to find the directory with the zipfile in basedir. */ /* We want to find the directory with the zipfile in basedir. */
last = path + (path_get_archive_delim(path) - path); last = (char*)path_get_archive_delim(path);
if (last) if (last)
*last = '\0'; *last = '\0';
#endif #endif