summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@github.com>2016-07-22 14:02:00 -0400
committerEdward Thomson <ethomson@github.com>2016-07-24 15:49:19 -0400
commitb118f6479d5ceecbc64868583101c8abd356cf3b (patch)
treeed2f3c15156b3a4ee45ffb9e1d0ef0f40ca92ac9
parent4aaae9354cd12cdd2658696b2506b02fa584e776 (diff)
downloadlibgit2-b118f6479d5ceecbc64868583101c8abd356cf3b.tar.gz
repository: don't cast to `int` for no reason
And give it a default so that some compilers don't (unnecessarily) complain.
-rw-r--r--src/repository.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/repository.c b/src/repository.c
index ecc07806e..cf3d18a2d 100644
--- a/src/repository.c
+++ b/src/repository.c
@@ -264,7 +264,7 @@ cleanup:
* the stack could remove directories name limits, but at the cost of doing
* repeated malloc/frees inside the loop below, so let's not do it now.
*/
-static int find_ceiling_dir_offset(
+static size_t find_ceiling_dir_offset(
const char *path,
const char *ceiling_directories)
{
@@ -278,7 +278,7 @@ static int find_ceiling_dir_offset(
min_len = (size_t)(git_path_root(path) + 1);
if (ceiling_directories == NULL || min_len == 0)
- return (int)min_len;
+ return min_len;
for (sep = ceil = ceiling_directories; *sep; ceil = sep + 1) {
for (sep = ceil; *sep && *sep != GIT_PATH_LIST_SEPARATOR; sep++);
@@ -305,7 +305,7 @@ static int find_ceiling_dir_offset(
}
}
- return (int)(max_len <= min_len ? min_len : max_len);
+ return (max_len <= min_len ? min_len : max_len);
}
/*
@@ -362,7 +362,7 @@ static int find_repo(
dev_t initial_device = 0;
int min_iterations;
bool in_dot_git;
- int ceiling_offset;
+ size_t ceiling_offset = 0;
git_buf_free(repo_path);