diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2020-04-05 18:30:07 +0100 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2020-11-27 11:09:20 +0000 |
| commit | 2cfa31c4179ea6722bbf85043428068aa8a0e58f (patch) | |
| tree | ae7022a8156505759833ba21261c860203a9a443 | |
| parent | 1a724625e76d9127cf03fb780a924650345f7f60 (diff) | |
| download | libgit2-2cfa31c4179ea6722bbf85043428068aa8a0e58f.tar.gz | |
path: remove unused git_path_topdir
| -rw-r--r-- | src/path.c | 18 | ||||
| -rw-r--r-- | src/path.h | 2 | ||||
| -rw-r--r-- | tests/core/path.c | 28 |
3 files changed, 1 insertions, 47 deletions
diff --git a/src/path.c b/src/path.c index f271c532c..a456fefc8 100644 --- a/src/path.c +++ b/src/path.c @@ -274,24 +274,6 @@ size_t git_path_basename_offset(git_buf *buffer) return 0; } -const char *git_path_topdir(const char *path) -{ - size_t len; - ssize_t i; - - assert(path); - len = strlen(path); - - if (!len || path[len - 1] != '/') - return NULL; - - for (i = (ssize_t)len - 2; i >= 0; --i) - if (path[i] == '/') - break; - - return &path[i + 1]; -} - int git_path_root(const char *path) { int offset = 0, prefix_len; diff --git a/src/path.h b/src/path.h index ed6b93574..bfef1b8a8 100644 --- a/src/path.h +++ b/src/path.h @@ -67,8 +67,6 @@ extern int git_path_basename_r(git_buf *buffer, const char *path); */ extern size_t git_path_basename_offset(git_buf *buffer); -extern const char *git_path_topdir(const char *path); - /** * Find offset to root of path if path has one. * diff --git a/tests/core/path.c b/tests/core/path.c index 2e5a4ab24..eac3573fe 100644 --- a/tests/core/path.c +++ b/tests/core/path.c @@ -32,15 +32,6 @@ check_basename(const char *A, const char *B) } static void -check_topdir(const char *A, const char *B) -{ - const char *dir; - - cl_assert((dir = git_path_topdir(A)) != NULL); - cl_assert_equal_s(B, dir); -} - -static void check_joinpath(const char *path_a, const char *path_b, const char *expected_path) { git_buf joined_path = GIT_BUF_INIT; @@ -119,23 +110,6 @@ void test_core_path__01_basename(void) check_basename(REP1024("/abc"), "abc"); } -/* get the latest component in a path */ -void test_core_path__02_topdir(void) -{ - check_topdir(".git/", ".git/"); - check_topdir("/.git/", ".git/"); - check_topdir("usr/local/.git/", ".git/"); - check_topdir("./.git/", ".git/"); - check_topdir("/usr/.git/", ".git/"); - check_topdir("/", "/"); - check_topdir("a/", "a/"); - - cl_assert(git_path_topdir("/usr/.git") == NULL); - cl_assert(git_path_topdir(".") == NULL); - cl_assert(git_path_topdir("") == NULL); - cl_assert(git_path_topdir("a") == NULL); -} - /* properly join path components */ void test_core_path__05_joins(void) { @@ -285,7 +259,7 @@ void test_core_path__08_self_join(void) cl_git_pass(git_buf_joinpath(&path, path.ptr + 4, "somethinglongenoughtorealloc")); cl_assert_equal_s(path.ptr, "/baz/somethinglongenoughtorealloc"); cl_assert(asize < path.asize); - + git_buf_dispose(&path); } |
