Commit 4592b62ee544617d06c38e0c840d604d6d34d1f6
2014-09-17T15:26:48
Merge pull request #2572 from cirosantilli/factor-void Replace void casts with GIT_UNUSED.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37
diff --git a/src/path.c b/src/path.c
index 760efec..11c0228 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 b8ae805..721c390 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;