Commit 2cfa31c4 by Edward Thomson

path: remove unused git_path_topdir

parent 1a724625
...@@ -274,24 +274,6 @@ size_t git_path_basename_offset(git_buf *buffer) ...@@ -274,24 +274,6 @@ size_t git_path_basename_offset(git_buf *buffer)
return 0; 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 git_path_root(const char *path)
{ {
int offset = 0, prefix_len; int offset = 0, prefix_len;
......
...@@ -67,8 +67,6 @@ extern int git_path_basename_r(git_buf *buffer, const char *path); ...@@ -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 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. * Find offset to root of path if path has one.
* *
......
...@@ -32,15 +32,6 @@ check_basename(const char *A, const char *B) ...@@ -32,15 +32,6 @@ check_basename(const char *A, const char *B)
} }
static void 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) check_joinpath(const char *path_a, const char *path_b, const char *expected_path)
{ {
git_buf joined_path = GIT_BUF_INIT; git_buf joined_path = GIT_BUF_INIT;
...@@ -119,23 +110,6 @@ void test_core_path__01_basename(void) ...@@ -119,23 +110,6 @@ void test_core_path__01_basename(void)
check_basename(REP1024("/abc"), "abc"); 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 */ /* properly join path components */
void test_core_path__05_joins(void) void test_core_path__05_joins(void)
{ {
...@@ -285,7 +259,7 @@ void test_core_path__08_self_join(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_git_pass(git_buf_joinpath(&path, path.ptr + 4, "somethinglongenoughtorealloc"));
cl_assert_equal_s(path.ptr, "/baz/somethinglongenoughtorealloc"); cl_assert_equal_s(path.ptr, "/baz/somethinglongenoughtorealloc");
cl_assert(asize < path.asize); cl_assert(asize < path.asize);
git_buf_dispose(&path); git_buf_dispose(&path);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment