Commit 1a7bae4d by Ramsay Jones

Fix some "unused parameter" warnings with -Wextra

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
parent e3fe32b6
...@@ -30,6 +30,16 @@ ...@@ -30,6 +30,16 @@
# define GIT_TYPEOF(x) # define GIT_TYPEOF(x)
#endif #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
/* /*
* Does our compiler/platform support the C99 <inttypes.h> and * Does our compiler/platform support the C99 <inttypes.h> and
* <stdint.h> header files. (C99 requires that <inttypes.h> * <stdint.h> header files. (C99 requires that <inttypes.h>
......
...@@ -13,13 +13,13 @@ ...@@ -13,13 +13,13 @@
#include <time.h> #include <time.h>
#ifdef GIT_WIN32 #ifdef GIT_WIN32
GIT_INLINE(int) link(const char *old, const char *new) GIT_INLINE(int) link(const char *GIT_UNUSED(old), const char *GIT_UNUSED(new))
{ {
errno = ENOSYS; errno = ENOSYS;
return -1; return -1;
} }
GIT_INLINE(int) git__mkdir(const char *path, int mode) GIT_INLINE(int) git__mkdir(const char *path, int GIT_UNUSED(mode))
{ {
return mkdir(path); return mkdir(path);
} }
......
...@@ -1110,6 +1110,8 @@ static int read_packed(git_obj *out, git_pack *p, const git_oid *id) ...@@ -1110,6 +1110,8 @@ static int read_packed(git_obj *out, git_pack *p, const git_oid *id)
off_t pos; off_t pos;
int res; int res;
assert(out && p && id);
if (pack_openidx(p)) if (pack_openidx(p))
return GIT_ERROR; return GIT_ERROR;
res = p->idx_search(&pos, p, id); res = p->idx_search(&pos, p, id);
...@@ -1128,6 +1130,12 @@ int git_odb__read_packed(git_obj *out, git_odb *db, const git_oid *id) ...@@ -1128,6 +1130,12 @@ int git_odb__read_packed(git_obj *out, git_odb *db, const git_oid *id)
git_packlist *pl = packlist_get(db); git_packlist *pl = packlist_get(db);
size_t j; size_t j;
assert(out && db && id);
out->data = NULL;
out->len = 0;
out->type = GIT_OBJ_BAD;
if (!pl) if (!pl)
return GIT_ENOTFOUND; return GIT_ENOTFOUND;
......
...@@ -184,7 +184,7 @@ static walk_data empty = { ...@@ -184,7 +184,7 @@ static walk_data empty = {
empty_names empty_names
}; };
static int dont_call_me(void *state, char *path) static int dont_call_me(void *GIT_UNUSED(state), char *GIT_UNUSED(path))
{ {
test_die("dont_call_me: unexpected callback!"); test_die("dont_call_me: unexpected callback!");
} }
......
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