diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | src/path.c | 4 | ||||
| -rw-r--r-- | tests/checkout/conflict.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 908a0f562..d04ff6dac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,9 +37,9 @@ matrix: OPTIONS="-DBUILD_CLAR=ON -DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Debug" os: linux allow_failures: - - env: + env: - COVERITY=1 - VALGRIND=1 + - VALGRIND=1 install: - ./script/install-deps-${TRAVIS_OS_NAME}.sh diff --git a/src/path.c b/src/path.c index 599e92295..67133f97e 100644 --- a/src/path.c +++ b/src/path.c @@ -980,7 +980,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; @@ -1051,7 +1051,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; |