lib/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-07-29 11:21:22 +03:00
Code Activity

minor coding style changes

Browse Source
This commit is contained in:
Yann Collet
2016-12-12 01:03:23 +01:00
parent c3a5c4bef8
commit fda539f50b
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
programs/util.h
View File

@ -25,7 +25,7 @@ extern "C" {
# define _CRT_SECURE_NO_DEPRECATE /* VS2005 */ # define _CRT_SECURE_NO_DEPRECATE /* VS2005 */
# pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */ # pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */
#if _MSC_VER <= 1800 /* (1800 = Visual Studio 2013) */ #if _MSC_VER <= 1800 /* (1800 = Visual Studio 2013) */
#define snprintf sprintf_s /* snprintf unsupported by Visual <= 2013 */ # define snprintf sprintf_s /* snprintf unsupported by Visual <= 2013 */
#endif #endif
#endif #endif
@ -49,11 +49,11 @@ extern "C" {
#include <sys/types.h> /* stat, utime */ #include <sys/types.h> /* stat, utime */
#include <sys/stat.h> /* stat */ #include <sys/stat.h> /* stat */
#if defined(_MSC_VER) #if defined(_MSC_VER)
#include <sys/utime.h> /* utime */ # include <sys/utime.h> /* utime */
#include <io.h> /* _chmod */ # include <io.h> /* _chmod */
#else #else
#include <unistd.h> /* chown, stat */ # include <unistd.h> /* chown, stat */
#include <utime.h> /* utime */ # include <utime.h> /* utime */
#endif #endif
#include <time.h> /* time */ #include <time.h> /* time */
#include <errno.h> #include <errno.h>
@ -406,16 +406,15 @@ UTIL_STATIC const char** UTIL_createFileList(const char **inputNames, unsigned i
{ {
size_t pos; size_t pos;
unsigned i, nbFiles; unsigned i, nbFiles;
char *bufend, *buf; char* buf = (char*)malloc(LIST_SIZE_INCREASE);
char* bufend = buf + LIST_SIZE_INCREASE;
const char** fileTable; const char** fileTable;
buf = (char*)malloc(LIST_SIZE_INCREASE);
if (!buf) return NULL; if (!buf) return NULL;
bufend = buf + LIST_SIZE_INCREASE;
for (i=0, pos=0, nbFiles=0; i<inputNamesNb; i++) { for (i=0, pos=0, nbFiles=0; i<inputNamesNb; i++) {
if (!UTIL_isDirectory(inputNames[i])) { if (!UTIL_isDirectory(inputNames[i])) {
size_t len = strlen(inputNames[i]); size_t const len = strlen(inputNames[i]);
if (buf + pos + len >= bufend) { if (buf + pos + len >= bufend) {
ptrdiff_t newListSize = (bufend - buf) + LIST_SIZE_INCREASE; ptrdiff_t newListSize = (bufend - buf) + LIST_SIZE_INCREASE;
buf = (char*)UTIL_realloc(buf, newListSize); buf = (char*)UTIL_realloc(buf, newListSize);
@ -437,8 +436,7 @@ UTIL_STATIC const char** UTIL_createFileList(const char **inputNames, unsigned i
fileTable = (const char**)malloc((nbFiles+1) * sizeof(const char*)); fileTable = (const char**)malloc((nbFiles+1) * sizeof(const char*));
if (!fileTable) { free(buf); return NULL; } if (!fileTable) { free(buf); return NULL; }
for (i=0, pos=0; i<nbFiles; i++) for (i=0, pos=0; i<nbFiles; i++) {
{
fileTable[i] = buf + pos; fileTable[i] = buf + pos;
pos += strlen(fileTable[i]) + 1; pos += strlen(fileTable[i]) + 1;
} }