Git fork

compat: mark unused parameters in win32/mingw functions

The compat/ directory contains many stub functions, wrappers, and so on
that have to conform to a specific interface, but don't necessarily need
to use all of their parameters. Let's mark them to avoid complaints from
-Wunused-parameter.

This was done mostly via guess-and-check with the Windows build in
GitHub CI. I also confirmed that the win+VS build is similarly happy.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

authored by

Jeff King and committed by
Junio C Hamano
b652382d 14149184

+24 -23
+8 -7
compat/mingw.c
··· 243 243 static char *unset_environment_variables; 244 244 245 245 int mingw_core_config(const char *var, const char *value, 246 - const struct config_context *ctx, void *cb) 246 + const struct config_context *ctx UNUSED, 247 + void *cb UNUSED) 247 248 { 248 249 if (!strcmp(var, "core.hidedotfiles")) { 249 250 if (value && !strcasecmp(value, "dotgitonly")) ··· 453 454 return -1; 454 455 } 455 456 456 - int mingw_mkdir(const char *path, int mode) 457 + int mingw_mkdir(const char *path, int mode UNUSED) 457 458 { 458 459 int ret; 459 460 wchar_t wpath[MAX_PATH]; ··· 597 598 return fd; 598 599 } 599 600 600 - static BOOL WINAPI ctrl_ignore(DWORD type) 601 + static BOOL WINAPI ctrl_ignore(DWORD type UNUSED) 601 602 { 602 603 return TRUE; 603 604 } ··· 1085 1086 return git_mkstemp_mode(template, 0600); 1086 1087 } 1087 1088 1088 - int gettimeofday(struct timeval *tv, void *tz) 1089 + int gettimeofday(struct timeval *tv, void *tz UNUSED) 1089 1090 { 1090 1091 FILETIME ft; 1091 1092 long long hnsec; ··· 2252 2253 return get_extended_user_info(NameUserPrincipal); 2253 2254 } 2254 2255 2255 - struct passwd *getpwuid(int uid) 2256 + struct passwd *getpwuid(int uid UNUSED) 2256 2257 { 2257 2258 static unsigned initialized; 2258 2259 static char user_name[100]; ··· 2304 2305 * length to call the signal handler. 2305 2306 */ 2306 2307 2307 - static unsigned __stdcall ticktack(void *dummy) 2308 + static unsigned __stdcall ticktack(void *dummy UNUSED) 2308 2309 { 2309 2310 while (WaitForSingleObject(timer_event, timer_interval) == WAIT_TIMEOUT) { 2310 2311 mingw_raise(SIGALRM); ··· 2352 2353 return i1->tv_sec == i2->tv_sec && i1->tv_usec == i2->tv_usec; 2353 2354 } 2354 2355 2355 - int setitimer(int type, struct itimerval *in, struct itimerval *out) 2356 + int setitimer(int type UNUSED, struct itimerval *in, struct itimerval *out) 2356 2357 { 2357 2358 static const struct timeval zero; 2358 2359 static int atexit_done;
+9 -9
compat/mingw.h
··· 122 122 * trivial stubs 123 123 */ 124 124 125 - static inline int readlink(const char *path, char *buf, size_t bufsiz) 125 + static inline int readlink(const char *path UNUSED, char *buf UNUSED, size_t bufsiz UNUSED) 126 126 { errno = ENOSYS; return -1; } 127 - static inline int symlink(const char *oldpath, const char *newpath) 127 + static inline int symlink(const char *oldpath UNUSED, const char *newpath UNUSED) 128 128 { errno = ENOSYS; return -1; } 129 - static inline int fchmod(int fildes, mode_t mode) 129 + static inline int fchmod(int fildes UNUSED, mode_t mode UNUSED) 130 130 { errno = ENOSYS; return -1; } 131 131 #ifndef __MINGW64_VERSION_MAJOR 132 132 static inline pid_t fork(void) 133 133 { errno = ENOSYS; return -1; } 134 134 #endif 135 - static inline unsigned int alarm(unsigned int seconds) 135 + static inline unsigned int alarm(unsigned int seconds UNUSED) 136 136 { return 0; } 137 137 static inline int fsync(int fd) 138 138 { return _commit(fd); } ··· 140 140 {} 141 141 static inline uid_t getuid(void) 142 142 { return 1; } 143 - static inline struct passwd *getpwnam(const char *name) 143 + static inline struct passwd *getpwnam(const char *name UNUSED) 144 144 { return NULL; } 145 - static inline int fcntl(int fd, int cmd, ...) 145 + static inline int fcntl(int fd UNUSED, int cmd, ...) 146 146 { 147 147 if (cmd == F_GETFD || cmd == F_SETFD) 148 148 return 0; ··· 151 151 } 152 152 153 153 #define sigemptyset(x) (void)0 154 - static inline int sigaddset(sigset_t *set, int signum) 154 + static inline int sigaddset(sigset_t *set UNUSED, int signum UNUSED) 155 155 { return 0; } 156 156 #define SIG_BLOCK 0 157 157 #define SIG_UNBLOCK 0 158 - static inline int sigprocmask(int how, const sigset_t *set, sigset_t *oldset) 158 + static inline int sigprocmask(int how UNUSED, const sigset_t *set UNUSED, sigset_t *oldset UNUSED) 159 159 { return 0; } 160 160 static inline pid_t getppid(void) 161 161 { return 1; } 162 162 static inline pid_t getpgid(pid_t pid) 163 163 { return pid == 0 ? getpid() : pid; } 164 - static inline pid_t tcgetpgrp(int fd) 164 + static inline pid_t tcgetpgrp(int fd UNUSED) 165 165 { return getpid(); } 166 166 167 167 /*
+1 -1
compat/stub/procinfo.c
··· 6 6 * Stub. See sample implementations in compat/linux/procinfo.c and 7 7 * compat/win32/trace2_win32_process_info.c. 8 8 */ 9 - void trace2_collect_process_info(enum trace2_process_info_reason reason) 9 + void trace2_collect_process_info(enum trace2_process_info_reason reason UNUSED) 10 10 { 11 11 }
+1 -1
compat/win32/pthread.c
··· 21 21 return 0; 22 22 } 23 23 24 - int pthread_create(pthread_t *thread, const void *unused, 24 + int pthread_create(pthread_t *thread, const void *attr UNUSED, 25 25 void *(*start_routine)(void *), void *arg) 26 26 { 27 27 thread->arg = arg;
+2 -2
compat/win32/pthread.h
··· 18 18 */ 19 19 #define pthread_mutex_t CRITICAL_SECTION 20 20 21 - static inline int return_0(int i) { 21 + static inline int return_0(int i UNUSED) { 22 22 return 0; 23 23 } 24 24 #define pthread_mutex_init(a,b) return_0((InitializeCriticalSection((a)), 0)) ··· 70 70 } 71 71 72 72 typedef DWORD pthread_key_t; 73 - static inline int pthread_key_create(pthread_key_t *keyp, void (*destructor)(void *value)) 73 + static inline int pthread_key_create(pthread_key_t *keyp, void (*destructor)(void *value) UNUSED) 74 74 { 75 75 return (*keyp = TlsAlloc()) == TLS_OUT_OF_INDEXES ? EAGAIN : 0; 76 76 }
+1 -1
compat/win32/syslog.c
··· 2 2 3 3 static HANDLE ms_eventlog; 4 4 5 - void openlog(const char *ident, int logopt, int facility) 5 + void openlog(const char *ident, int logopt UNUSED, int facility UNUSED) 6 6 { 7 7 if (ms_eventlog) 8 8 return;
+1 -1
compat/win32mmap.c
··· 40 40 return MAP_FAILED; 41 41 } 42 42 43 - int git_munmap(void *start, size_t length) 43 + int git_munmap(void *start, size_t length UNUSED) 44 44 { 45 45 return !UnmapViewOfFile(start); 46 46 }
+1 -1
compat/winansi.c
··· 340 340 TEXT = 0, ESCAPE = 033, BRACKET = '[' 341 341 }; 342 342 343 - static DWORD WINAPI console_thread(LPVOID unused) 343 + static DWORD WINAPI console_thread(LPVOID data UNUSED) 344 344 { 345 345 unsigned char buffer[BUFFER_SIZE]; 346 346 DWORD bytes;