Commit 2705576bfa90675433be49a4141cfdd867e380cc
2012-01-24T14:06:42
Simplify GIT_UNUSED macros Since casting to void works to eliminate errors with unused parameters on all platforms, avoid the various special cases. Over time, it will make sense to eliminate the GIT_UNUSED macro completely and just have GIT_UNUSED_ARG.
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 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82
diff --git a/src/cc-compat.h b/src/cc-compat.h
index 29cc2ec..bbccd1f 100644
--- a/src/cc-compat.h
+++ b/src/cc-compat.h
@@ -33,21 +33,8 @@
# define GIT_TYPEOF(x)
#endif
-#ifdef __cplusplus
-# define GIT_UNUSED(x)
-#else
-# ifdef __GNUC__
-# define GIT_UNUSED(x) x __attribute__ ((__unused__))
-# else
-# define GIT_UNUSED(x) x
-# endif
-#endif
-
-#if defined(_MSC_VER)
-#define GIT_UNUSED_ARG(x) ((void)(x)); /* note trailing ; */
-#else
-#define GIT_UNUSED_ARG(x)
-#endif
+#define GIT_UNUSED(x) x
+#define GIT_UNUSED_ARG(x) ((void)(x))
/* Define the printf format specifer to use for size_t output */
#if defined(_MSC_VER) || defined(__MINGW32__)
diff --git a/src/win32/posix.h b/src/win32/posix.h
index 8f60365..f4c1c12 100644
--- a/src/win32/posix.h
+++ b/src/win32/posix.h
@@ -13,8 +13,8 @@
GIT_INLINE(int) p_link(const char *GIT_UNUSED(old), const char *GIT_UNUSED(new))
{
- GIT_UNUSED_ARG(old)
- GIT_UNUSED_ARG(new)
+ GIT_UNUSED_ARG(old);
+ GIT_UNUSED_ARG(new);
errno = ENOSYS;
return -1;
}
@@ -24,7 +24,7 @@ GIT_INLINE(int) p_mkdir(const char *path, mode_t GIT_UNUSED(mode))
wchar_t* buf = gitwin_to_utf16(path);
int ret = _wmkdir(buf);
- GIT_UNUSED_ARG(mode)
+ GIT_UNUSED_ARG(mode);
git__free(buf);
return ret;
diff --git a/tests-clar/core/dirent.c b/tests-clar/core/dirent.c
index edd0447..7823709 100644
--- a/tests-clar/core/dirent.c
+++ b/tests-clar/core/dirent.c
@@ -90,8 +90,8 @@ static int one_entry(void *state, git_buf *path)
static int dont_call_me(void *GIT_UNUSED(state), git_buf *GIT_UNUSED(path))
{
- GIT_UNUSED_ARG(state)
- GIT_UNUSED_ARG(path)
+ GIT_UNUSED_ARG(state);
+ GIT_UNUSED_ARG(path);
return GIT_ERROR;
}
diff --git a/tests/t00-core.c b/tests/t00-core.c
index 58f048a..aff48b0 100644
--- a/tests/t00-core.c
+++ b/tests/t00-core.c
@@ -426,8 +426,8 @@ static walk_data empty = {
static int dont_call_me(void *GIT_UNUSED(state), git_buf *GIT_UNUSED(path))
{
- GIT_UNUSED_ARG(state)
- GIT_UNUSED_ARG(path)
+ GIT_UNUSED_ARG(state);
+ GIT_UNUSED_ARG(path);
return GIT_ERROR;
}