Skip to content

Commit 8413c0f

Browse files
committed
util: move git__noop into the util header
The git__noop function is more largely useful; move it into the util header. (And reduce the number of underscores.)
1 parent 87e4597 commit 8413c0f

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
lines changed

src/runtime.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ GIT_INLINE(int) init_unlock(void)
103103
# error unknown threading model
104104
#else
105105

106-
# define init_lock() git___noop()
107-
# define init_unlock() git___noop()
106+
# define init_lock() git__noop()
107+
# define init_unlock() git__noop()
108108

109109
#endif
110110

src/thread-utils.h

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -235,38 +235,36 @@ GIT_INLINE(int64_t) git_atomic64_get(git_atomic64 *a)
235235

236236
#else
237237

238-
GIT_INLINE(int) git___noop(void) { return 0; }
239-
240-
#define git_threads_global_init git___noop
238+
#define git_threads_global_init git__noop
241239

242240
#define git_thread unsigned int
243-
#define git_thread_create(thread, start_routine, arg) git___noop()
244-
#define git_thread_join(id, status) git___noop()
241+
#define git_thread_create(thread, start_routine, arg) git__noop()
242+
#define git_thread_join(id, status) git__noop()
245243

246244
/* Pthreads Mutex */
247245
#define git_mutex unsigned int
248-
#define git_mutex_init(a) git___noop()
249-
#define git_mutex_init(a) git___noop()
250-
#define git_mutex_lock(a) git___noop()
251-
#define git_mutex_unlock(a) git___noop()
252-
#define git_mutex_free(a) git___noop()
246+
#define git_mutex_init(a) git__noop()
247+
#define git_mutex_init(a) git__noop()
248+
#define git_mutex_lock(a) git__noop()
249+
#define git_mutex_unlock(a) git__noop()
250+
#define git_mutex_free(a) git__noop()
253251

254252
/* Pthreads condition vars */
255253
#define git_cond unsigned int
256-
#define git_cond_init(c) git___noop()
257-
#define git_cond_free(c) git___noop()
258-
#define git_cond_wait(c, l) git___noop()
259-
#define git_cond_signal(c) git___noop()
260-
#define git_cond_broadcast(c) git___noop()
254+
#define git_cond_init(c) git__noop()
255+
#define git_cond_free(c) git__noop()
256+
#define git_cond_wait(c, l) git__noop()
257+
#define git_cond_signal(c) git__noop()
258+
#define git_cond_broadcast(c) git__noop()
261259

262260
/* Pthreads rwlock */
263261
#define git_rwlock unsigned int
264-
#define git_rwlock_init(a) git___noop()
265-
#define git_rwlock_rdlock(a) git___noop()
266-
#define git_rwlock_rdunlock(a) git___noop()
267-
#define git_rwlock_wrlock(a) git___noop()
268-
#define git_rwlock_wrunlock(a) git___noop()
269-
#define git_rwlock_free(a) git___noop()
262+
#define git_rwlock_init(a) git__noop()
263+
#define git_rwlock_rdlock(a) git__noop()
264+
#define git_rwlock_rdunlock(a) git__noop()
265+
#define git_rwlock_wrlock(a) git__noop()
266+
#define git_rwlock_wrunlock(a) git__noop()
267+
#define git_rwlock_free(a) git__noop()
270268
#define GIT_RWLOCK_STATIC_INIT 0
271269

272270

src/util.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,8 @@ GIT_INLINE(double) git__timer(void)
414414

415415
extern int git__getenv(git_buf *out, const char *name);
416416

417+
GIT_INLINE(int) git__noop(void) { return 0; }
418+
417419
#include "alloc.h"
418420

419421
#endif

0 commit comments

Comments
 (0)