diff options
| author | Vicent Marti <vicent@github.com> | 2014-09-17 15:26:48 +0200 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-09-17 15:26:48 +0200 |
| commit | 4592b62ee544617d06c38e0c840d604d6d34d1f6 (patch) | |
| tree | f2cf79a62e2f6a727b6a2ef672714283e663cd28 | |
| parent | 1312f87b6838649cca525935656c84c7bd07a9a1 (diff) | |
| parent | c5cf8cade3994463af3a7a09add41181769b8ba5 (diff) | |
| download | libgit2-4592b62ee544617d06c38e0c840d604d6d34d1f6.tar.gz | |
Merge pull request #2572 from cirosantilli/factor-void
Replace void casts with GIT_UNUSED.
| -rw-r--r-- | src/path.c | 4 | ||||
| -rw-r--r-- | tests/checkout/conflict.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/path.c b/src/path.c index 760efec12..11c022812 100644 --- a/src/path.c +++ b/src/path.c @@ -965,7 +965,7 @@ int git_path_direach( path_dirent_data de_data; struct dirent *de, *de_buf = (struct dirent *)&de_data; - (void)flags; + GIT_UNUSED(flags); #ifdef GIT_USE_ICONV git_path_iconv_t ic = GIT_PATH_ICONV_INIT; @@ -1036,7 +1036,7 @@ int git_path_dirload( path_dirent_data de_data; struct dirent *de, *de_buf = (struct dirent *)&de_data; - (void)flags; + GIT_UNUSED(flags); #ifdef GIT_USE_ICONV git_path_iconv_t ic = GIT_PATH_ICONV_INIT; diff --git a/tests/checkout/conflict.c b/tests/checkout/conflict.c index b8ae80576..721c3901e 100644 --- a/tests/checkout/conflict.c +++ b/tests/checkout/conflict.c @@ -1078,8 +1078,8 @@ static void collect_progress( { git_vector *paths = payload; - (void)completed_steps; - (void)total_steps; + GIT_UNUSED(completed_steps); + GIT_UNUSED(total_steps); if (path == NULL) return; |