Rename UTIL_getFileStat() -> UTIL_statFile() and UTIL_getDirectoryStat() -> UTIL_stat...

I want to introduce versions of many of these functions that take pre-
populated `stat_t` objects and use those rather than doing their own redundant
`stat()` internally. These functions will have `...Stat()` suffixes. So this
commit renames these existing functions into the active voice, to avoid
confusion.

diff --git a/programs/fileio.c b/programs/fileio.c
index b8183d89fbd5acbc18e6c4a273b10a9b8d463722..e818614b29249c4d9cf8e3d5434b8ace717cdda3 100644 (file)
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -1478,7 +1478,7 @@ static int FIO_compressFilename_dstFile(FIO_prefs_t* const prefs,
         addHandler(dstFileName);
 
         if ( strcmp (srcFileName, stdinmark)
-          && UTIL_getFileStat(srcFileName, &statbuf))
+          && UTIL_statFile(srcFileName, &statbuf))
             transfer_permissions = 1;
     }
 
@@ -2344,7 +2344,7 @@ static int FIO_decompressDstFile(FIO_prefs_t* const prefs,
         addHandler(dstFileName);
 
         if ( strcmp(srcFileName, stdinmark)   /* special case : don't transfer permissions from stdin */
-          && UTIL_getFileStat(srcFileName, &statbuf) )
+          && UTIL_statFile(srcFileName, &statbuf) )
             transfer_permissions = 1;
     }
 

diff --git a/programs/util.c b/programs/util.c
index 785a37535bfe3b7c51fc951c79783596ed518484..3f91adeb57213de3e16c0816b81d907041344ee6 100644 (file)
--- a/programs/util.c
+++ b/programs/util.c
@@ -119,10 +119,10 @@ int UTIL_fileExist(const char* filename)
 int UTIL_isRegularFile(const char* infilename)
 {
     stat_t statbuf;
-    return UTIL_getFileStat(infilename, &statbuf); /* Only need to know whether it is a regular file */
+    return UTIL_statFile(infilename, &statbuf); /* Only need to know whether it is a regular file */
 }
 
-int UTIL_getFileStat(const char* infilename, stat_t *statbuf)
+int UTIL_statFile(const char* infilename, stat_t *statbuf)
 {
     const int r = UTIL_stat(infilename, statbuf);
 #if defined(_MSC_VER)
@@ -132,7 +132,7 @@ int UTIL_getFileStat(const char* infilename, stat_t *statbuf)
 #endif
 }
 
-int UTIL_getDirectoryStat(const char* infilename, stat_t *statbuf)
+int UTIL_statDir(const char* infilename, stat_t *statbuf)
 {
     const int r = UTIL_stat(infilename, statbuf);
 #if defined(_MSC_VER)
@@ -190,7 +190,7 @@ int UTIL_setFileStat(const char *filename, const stat_t *statbuf)
 int UTIL_isDirectory(const char* infilename)
 {
     stat_t statbuf;
-    return UTIL_getDirectoryStat(infilename, &statbuf);
+    return UTIL_statDir(infilename, &statbuf);
 }
 
 int UTIL_compareStr(const void *p1, const void *p2) {
@@ -647,7 +647,7 @@ static int isFileNameValidForMirroredOutput(const char *filename)
 static mode_t getDirMode(const char *dirName)
 {
     stat_t st;
-    int ret = UTIL_getDirectoryStat(dirName, &st);
+    int ret = UTIL_statDir(dirName, &st);
     if (!ret) {
         UTIL_DISPLAY("zstd: failed to get DIR stats %s: %s\n", dirName, strerror(errno));
         return DIR_DEFAULT_MODE;

diff --git a/programs/util.h b/programs/util.h
index 7618e2489f5741c3f5e3dc275bd920ee62a97838..ed3bd09ec062819eff5430e7d1a5e139541b4945 100644 (file)
--- a/programs/util.h
+++ b/programs/util.h
@@ -120,6 +120,8 @@ extern int g_utilDisplayLevel;
  * Returns success (1) or failure (0).
  */
 int UTIL_stat(const char* filename, stat_t* statbuf);
+int UTIL_statFile(const char* infilename, stat_t* statbuf); /* also check it's a file */
+int UTIL_statDir(const char* infilename, stat_t* statbuf); /* also check it's a directory */
 int UTIL_fileExist(const char* filename);
 int UTIL_isRegularFile(const char* infilename);
 int UTIL_isDirectory(const char* infilename);
@@ -131,9 +133,7 @@ int UTIL_isFIFO(const char* infilename);
 #define UTIL_FILESIZE_UNKNOWN  ((U64)(-1))
 U64 UTIL_getFileSize(const char* infilename);
 U64 UTIL_getTotalFileSize(const char* const * fileNamesTable, unsigned nbFiles);
-int UTIL_getFileStat(const char* infilename, stat_t* statbuf);
 int UTIL_setFileStat(const char* filename, const stat_t* statbuf);
-int UTIL_getDirectoryStat(const char* infilename, stat_t* statbuf);
 int UTIL_chmod(char const* filename, mode_t permissions);   /*< like chmod, but avoid changing permission of /dev/null */
 int UTIL_compareStr(const void *p1, const void *p2);
 const char* UTIL_getFileExtension(const char* infilename);