This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository legacy-imlib2.
View the commit online.
commit 595d0a322d4b0a20a0de90dbfcdaa6ad11880b14
Author: Kim Woelders <k...@woelders.dk>
AuthorDate: Sun Jun 25 22:24:08 2023 +0200
file: Remove a couple of unused functions
__imlib_IsRealFile() and __imlib_FileExists() are not used.
__imlib_FileStat() can now be private.
---
src/lib/file.c | 22 +---------------------
src/lib/file.h | 4 ----
test/test_file.cpp | 50 --------------------------------------------------
3 files changed, 1 insertion(+), 75 deletions(-)
diff --git a/src/lib/file.c b/src/lib/file.c
index 1e366ea..80d006d 100644
--- a/src/lib/file.c
+++ b/src/lib/file.c
@@ -16,16 +16,6 @@
#define DBG_PFX "FILE"
#define DP(fmt...) DC(DBG_FILE, fmt)
-int
-__imlib_IsRealFile(const char *s)
-{
- struct stat st;
-
- DP("%s: '%s'\n", __func__, s);
-
- return (stat(s, &st) != -1) && (S_ISREG(st.st_mode));
-}
-
char *
__imlib_FileKey(const char *file)
{
@@ -110,7 +100,7 @@ __imlib_FileExtension(const char *file)
return *p != '\0' ? p : NULL;
}
-int
+static int
__imlib_FileStat(const char *file, struct stat *st)
{
DP("%s: '%s'\n", __func__, file);
@@ -121,16 +111,6 @@ __imlib_FileStat(const char *file, struct stat *st)
return stat(file, st);
}
-int
-__imlib_FileExists(const char *s)
-{
- struct stat st;
-
- DP("%s: '%s'\n", __func__, s);
-
- return __imlib_FileStat(s, &st) == 0;
-}
-
int
__imlib_FileIsFile(const char *s)
{
diff --git a/src/lib/file.h b/src/lib/file.h
index 44abf11..0108b6a 100644
--- a/src/lib/file.h
+++ b/src/lib/file.h
@@ -4,14 +4,11 @@
#include <time.h>
#include <sys/stat.h>
-int __imlib_IsRealFile(const char *s);
char *__imlib_FileKey(const char *file);
char *__imlib_FileRealFile(const char *file);
const char *__imlib_FileExtension(const char *file);
-int __imlib_FileStat(const char *file, struct stat *st);
-
static inline time_t
__imlib_StatModDate(const struct stat *st)
{
@@ -30,7 +27,6 @@ __imlib_StatIsDir(const struct stat *st)
return S_ISDIR(st->st_mode);
}
-int __imlib_FileExists(const char *s);
int __imlib_FileIsFile(const char *s);
int __imlib_FileIsDir(const char *s);
time_t __imlib_FileModDate(const char *s);
diff --git a/test/test_file.cpp b/test/test_file.cpp
index ce81ff4..fe371b3 100644
--- a/test/test_file.cpp
+++ b/test/test_file.cpp
@@ -48,29 +48,6 @@ TEST(FILE, file_extension)
EXPECT_STREQ(s, "def");
}
-TEST(FILE, file_exists)
-{
- int rc;
-
- rc = __imlib_FileExists("./Makefile");
- EXPECT_EQ(rc, 1);
-
- rc = __imlib_FileExists(".");
- EXPECT_EQ(rc, 1);
-
- rc = __imlib_FileExists("./foob");
- EXPECT_EQ(rc, 0);
-
- rc = __imlib_FileExists("./Makefile:foo");
- EXPECT_EQ(rc, USE_REAL_FILE);
-
- rc = __imlib_FileExists(".:foo");
- EXPECT_EQ(rc, USE_REAL_FILE);
-
- rc = __imlib_FileExists("./foob:foo");
- EXPECT_EQ(rc, 0);
-}
-
TEST(FILE, file_is_file)
{
int rc;
@@ -117,33 +94,6 @@ TEST(FILE, file_is_dir)
EXPECT_EQ(rc, 0);
}
-TEST(FILE, file_is_real_file)
-{
- int rc;
-
- rc = __imlib_IsRealFile("./Makefile");
- EXPECT_EQ(rc, 1);
-
- rc = __imlib_IsRealFile(".");
- EXPECT_EQ(rc, 0);
-
- rc = __imlib_IsRealFile("./foob");
- EXPECT_EQ(rc, 0);
-
- rc = system("touch gylle");
- EXPECT_EQ(rc, 0);
- rc = __imlib_IsRealFile("gylle");
- EXPECT_EQ(rc, 1);
-
- rc = system("chmod 000 gylle");
- EXPECT_EQ(rc, 0);
- rc = __imlib_IsRealFile("gylle");
- EXPECT_EQ(rc, 1);
-
- rc = unlink("gylle");
- EXPECT_EQ(rc, 0);
-}
-
TEST(FILE, file_key)
{
char *key;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
