Commit 1fc375e6 by Ben Straub

Fix Windows build

Pedantic ordering of GIT_UNUSED vs. variable declarations.
parent 1eb8cd7f
...@@ -745,7 +745,7 @@ void git_remote_set_callbacks(git_remote *remote, git_remote_callbacks *callback ...@@ -745,7 +745,7 @@ void git_remote_set_callbacks(git_remote *remote, git_remote_callbacks *callback
} }
} }
inline const git_transfer_progress* git_remote_stats(git_remote *remote) GIT_INLINE(const git_transfer_progress*) git_remote_stats(git_remote *remote)
{ {
assert(remote); assert(remote);
return &remote->stats; return &remote->stats;
......
...@@ -363,8 +363,8 @@ void test_checkout_index__wont_notify_of_expected_line_ending_changes(void) ...@@ -363,8 +363,8 @@ void test_checkout_index__wont_notify_of_expected_line_ending_changes(void)
static void progress(const char *path, size_t cur, size_t tot, void *payload) static void progress(const char *path, size_t cur, size_t tot, void *payload)
{ {
GIT_UNUSED(path); GIT_UNUSED(cur); GIT_UNUSED(tot);
bool *was_called = (bool*)payload; bool *was_called = (bool*)payload;
GIT_UNUSED(path); GIT_UNUSED(cur); GIT_UNUSED(tot);
*was_called = true; *was_called = true;
} }
......
...@@ -66,8 +66,8 @@ void test_checkout_tree__can_checkout_a_subdirectory_from_a_subtree(void) ...@@ -66,8 +66,8 @@ void test_checkout_tree__can_checkout_a_subdirectory_from_a_subtree(void)
static void progress(const char *path, size_t cur, size_t tot, void *payload) static void progress(const char *path, size_t cur, size_t tot, void *payload)
{ {
GIT_UNUSED(path); GIT_UNUSED(cur); GIT_UNUSED(tot);
bool *was_called = (bool*)payload; bool *was_called = (bool*)payload;
GIT_UNUSED(path); GIT_UNUSED(cur); GIT_UNUSED(tot);
*was_called = true; *was_called = true;
} }
......
...@@ -93,15 +93,15 @@ void test_clone_network__can_prevent_the_checkout_of_a_standard_repo(void) ...@@ -93,15 +93,15 @@ void test_clone_network__can_prevent_the_checkout_of_a_standard_repo(void)
static void checkout_progress(const char *path, size_t cur, size_t tot, void *payload) static void checkout_progress(const char *path, size_t cur, size_t tot, void *payload)
{ {
GIT_UNUSED(path); GIT_UNUSED(cur); GIT_UNUSED(tot);
bool *was_called = (bool*)payload; bool *was_called = (bool*)payload;
GIT_UNUSED(path); GIT_UNUSED(cur); GIT_UNUSED(tot);
(*was_called) = true; (*was_called) = true;
} }
static void fetch_progress(const git_transfer_progress *stats, void *payload) static void fetch_progress(const git_transfer_progress *stats, void *payload)
{ {
GIT_UNUSED(stats);
bool *was_called = (bool*)payload; bool *was_called = (bool*)payload;
GIT_UNUSED(stats);
(*was_called) = true; (*was_called) = true;
} }
......
...@@ -30,8 +30,8 @@ static int update_tips(const char *refname, const git_oid *a, const git_oid *b, ...@@ -30,8 +30,8 @@ static int update_tips(const char *refname, const git_oid *a, const git_oid *b,
static void progress(const git_transfer_progress *stats, void *payload) static void progress(const git_transfer_progress *stats, void *payload)
{ {
GIT_UNUSED(stats);
bool *was_called = (bool*)payload; bool *was_called = (bool*)payload;
GIT_UNUSED(stats);
*was_called = true; *was_called = true;
} }
......
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