diff options
Diffstat (limited to 'main/php_scandir.c')
| -rw-r--r-- | main/php_scandir.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/main/php_scandir.c b/main/php_scandir.c index bd87c64aca..67bb25696c 100644 --- a/main/php_scandir.c +++ b/main/php_scandir.c @@ -1,6 +1,6 @@ -/* +/* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2015 The PHP Group | +----------------------------------------------------------------------+ @@ -35,7 +35,7 @@ #ifdef PHP_WIN32 #include "win32/param.h" #include "win32/readdir.h" -#endif +#endif #include <stdlib.h> #ifndef NETWARE @@ -86,7 +86,7 @@ PHPAPI int php_scandir(const char *dirname, struct dirent **namelist[], int (*se struct dirent **newv; if (vector_size == 0) { vector_size = 10; - } else { + } else { vector_size *= 2; } @@ -97,7 +97,7 @@ PHPAPI int php_scandir(const char *dirname, struct dirent **namelist[], int (*se vector = newv; } - dsize = sizeof (struct dirent) + ((strlen(dp->d_name) + 1) * sizeof(char)); + dsize = sizeof (struct dirent) + (((int)strlen(dp->d_name) + 1) * sizeof(char)); newdp = (struct dirent *) malloc(dsize); if (newdp == NULL) { @@ -112,7 +112,7 @@ PHPAPI int php_scandir(const char *dirname, struct dirent **namelist[], int (*se *namelist = vector; if (compare) { - qsort (*namelist, nfiles, sizeof(struct dirent *), compare); + qsort (*namelist, nfiles, sizeof(struct dirent *), (int (*) (const void *, const void *)) compare); } return nfiles; @@ -122,7 +122,7 @@ fail: free(vector[nfiles]); } free(vector); - return -1; + return -1; } #endif |