Skip to content

Commit 4885088

Browse files
author
Edward Thomson
committed
thread: avoid warnings when building without threads
`git__noop` takes no arguments, so a simple `#define func(a) git__noop` will produce warnings about the unused `a`. Introduce `git__noop_args` to swallow arguments and avoid that warning.
1 parent 12832ba commit 4885088

File tree

2 files changed

+21
-19
lines changed

2 files changed

+21
-19
lines changed

src/util/thread.h

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -260,36 +260,37 @@ GIT_INLINE(int64_t) git_atomic64_get(git_atomic64 *a)
260260

261261
#else
262262

263-
#define git_threads_global_init git__noop
263+
#define git_threads_global_init git__noop
264264

265265
#define git_thread unsigned int
266-
#define git_thread_create(thread, start_routine, arg) git__noop()
267-
#define git_thread_join(id, status) git__noop()
266+
#define git_thread_create(t, s, a) git__noop(t, s, a)
267+
#define git_thread_join(i, s) git__noop_args(i, s)
268268

269269
/* Pthreads Mutex */
270270
#define git_mutex unsigned int
271-
#define git_mutex_init(a) git__noop()
272-
#define git_mutex_init(a) git__noop()
273-
#define git_mutex_lock(a) git__noop()
274-
#define git_mutex_unlock(a) git__noop()
275-
#define git_mutex_free(a) git__noop()
271+
#define git_mutex_init(a) git__noop_args(a)
272+
#define git_mutex_init(a) git__noop_args(a)
273+
#define git_mutex_lock(a) git__noop_args(a)
274+
#define git_mutex_unlock(a) git__noop_args(a)
275+
#define git_mutex_free(a) git__noop_args(a)
276276

277277
/* Pthreads condition vars */
278278
#define git_cond unsigned int
279-
#define git_cond_init(c) git__noop()
280-
#define git_cond_free(c) git__noop()
281-
#define git_cond_wait(c, l) git__noop()
282-
#define git_cond_signal(c) git__noop()
283-
#define git_cond_broadcast(c) git__noop()
279+
#define git_cond_init(c) git__noop_args(c)
280+
#define git_cond_free(c) git__noop_args(c)
281+
#define git_cond_wait(c, l) git__noop_args(c, l)
282+
#define git_cond_signal(c) git__noop_args(c)
283+
#define git_cond_broadcast(c) git__noop_args(c)
284284

285285
/* Pthreads rwlock */
286286
#define git_rwlock unsigned int
287-
#define git_rwlock_init(a) git__noop()
288-
#define git_rwlock_rdlock(a) git__noop()
289-
#define git_rwlock_rdunlock(a) git__noop()
290-
#define git_rwlock_wrlock(a) git__noop()
291-
#define git_rwlock_wrunlock(a) git__noop()
292-
#define git_rwlock_free(a) git__noop()
287+
#define git_rwlock_init(a) git__noop_args(a)
288+
#define git_rwlock_rdlock(a) git__noop_args(a)
289+
#define git_rwlock_rdunlock(a) git__noop_args(a)
290+
#define git_rwlock_wrlock(a) git__noop_args(a)
291+
#define git_rwlock_wrunlock(a) git__noop_args(a)
292+
#define git_rwlock_free(a) git__noop_args(a)
293+
293294
#define GIT_RWLOCK_STATIC_INIT 0
294295

295296

src/util/util.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,7 @@ extern int git__getenv(git_str *out, const char *name);
381381
extern int git__online_cpus(void);
382382

383383
GIT_INLINE(int) git__noop(void) { return 0; }
384+
GIT_INLINE(int) git__noop_args(void *a, ...) { GIT_UNUSED(a); return 0; }
384385

385386
#include "alloc.h"
386387

0 commit comments

Comments
 (0)