Merge branch 'ab/unused-annotation'
Undoes 'jk/unused-annotation' topic and redoes it to work around Coccinelle rules misfiring false positives in unrelated codepaths. * ab/unused-annotation: git-compat-util.h: use "deprecated" for UNUSED variables git-compat-util.h: use "UNUSED", not "UNUSED(var)"
This commit is contained in:
@ -1170,7 +1170,7 @@ static int mark_our_ref(const char *refname, const char *refname_full,
|
||||
}
|
||||
|
||||
static int check_ref(const char *refname_full, const struct object_id *oid,
|
||||
int UNUSED(flag), void *UNUSED(cb_data))
|
||||
int flag UNUSED, void *cb_data UNUSED)
|
||||
{
|
||||
const char *refname = strip_namespace(refname_full);
|
||||
|
||||
@ -1194,7 +1194,7 @@ static void format_session_id(struct strbuf *buf, struct upload_pack_data *d) {
|
||||
}
|
||||
|
||||
static int send_ref(const char *refname, const struct object_id *oid,
|
||||
int UNUSED(flag), void *cb_data)
|
||||
int flag UNUSED, void *cb_data)
|
||||
{
|
||||
static const char *capabilities = "multi_ack thin-pack side-band"
|
||||
" side-band-64k ofs-delta shallow deepen-since deepen-not"
|
||||
@ -1237,7 +1237,7 @@ static int send_ref(const char *refname, const struct object_id *oid,
|
||||
}
|
||||
|
||||
static int find_symref(const char *refname,
|
||||
const struct object_id *UNUSED(oid),
|
||||
const struct object_id *oid UNUSED,
|
||||
int flag, void *cb_data)
|
||||
{
|
||||
const char *symref_target;
|
||||
|
Reference in New Issue
Block a user