From 19579847f6b4ee6942253f2a6311a936e4ac05ac Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Tue, 8 May 2012 13:23:00 -0700 Subject: [PATCH] Clean up warnings and tests --- src/posix.c | 2 +- tests-clar/object/lookup.c | 10 ++++++---- tests-clar/status/worktree.c | 5 +++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/posix.c b/src/posix.c index cecb538eb..a9a6af984 100644 --- a/src/posix.c +++ b/src/posix.c @@ -21,7 +21,7 @@ int p_open(const char *path, int flags, ...) va_list arg_list; va_start(arg_list, flags); - mode = va_arg(arg_list, mode_t); + mode = (mode_t)va_arg(arg_list, int); va_end(arg_list); } diff --git a/tests-clar/object/lookup.c b/tests-clar/object/lookup.c index 4db2ecfbe..4732865cb 100644 --- a/tests-clar/object/lookup.c +++ b/tests-clar/object/lookup.c @@ -14,22 +14,24 @@ void test_object_lookup__cleanup(void) git_repository_free(g_repo); } -void test_object_lookup__looking_up_an_exisiting_object_by_its_wrong_type_returns_ENOTFOUND(void) +void test_object_lookup__lookup_wrong_type_returns_enotfound(void) { const char *commit = "e90810b8df3e80c413d903f631643c716887138d"; git_oid oid; git_object *object; cl_git_pass(git_oid_fromstr(&oid, commit)); - cl_assert_equal_i(GIT_ENOTFOUND, git_object_lookup(&object, g_repo, &oid, GIT_OBJ_TAG)); + cl_assert_equal_i( + GIT_ENOTFOUND, git_object_lookup(&object, g_repo, &oid, GIT_OBJ_TAG)); } -void test_object_lookup__looking_up_a_non_exisiting_object_returns_ENOTFOUND(void) +void test_object_lookup__lookup_nonexisting_returns_enotfound(void) { const char *unknown = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"; git_oid oid; git_object *object; cl_git_pass(git_oid_fromstr(&oid, unknown)); - cl_assert_equal_i(GIT_ENOTFOUND, git_object_lookup(&object, g_repo, &oid, GIT_OBJ_ANY)); + cl_assert_equal_i( + GIT_ENOTFOUND, git_object_lookup(&object, g_repo, &oid, GIT_OBJ_ANY)); } diff --git a/tests-clar/status/worktree.c b/tests-clar/status/worktree.c index 2a647ffb0..c4c935c0d 100644 --- a/tests-clar/status/worktree.c +++ b/tests-clar/status/worktree.c @@ -389,7 +389,8 @@ void test_status_worktree__issue_592_5(void) void test_status_worktree__cannot_retrieve_the_status_of_a_bare_repository(void) { git_repository *repo; - int error, status = 0; + int error; + unsigned int status = 0; cl_git_pass(git_repository_open(&repo, cl_fixture("testrepo.git"))); @@ -399,4 +400,4 @@ void test_status_worktree__cannot_retrieve_the_status_of_a_bare_repository(void) cl_assert(error != GIT_ENOTFOUND); git_repository_free(repo); -} \ No newline at end of file +}