mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-27 03:53:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

compat: mark unused parameters in win32/mingw functions

Browse Source 
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>
This commit is contained in:
Jeff King 2024-08-28 00:00:16 -04:00 committed by Junio C Hamano
parent 141491840d
commit b652382d76
8 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compat/mingw.c
View File

@ -243,7 +243,8 @@ static enum hide_dotfiles_type hide_dotfiles = HIDE_DOTFILES_DOTGITONLY;
static char *unset_environment_variables; static char *unset_environment_variables;
int mingw_core_config(const char *var, const char *value, int mingw_core_config(const char *var, const char *value,
const struct config_context *ctx, void *cb) const struct config_context *ctx UNUSED,
void *cb UNUSED)
{ {
if (!strcmp(var, "core.hidedotfiles")) { if (!strcmp(var, "core.hidedotfiles")) {
if (value && !strcasecmp(value, "dotgitonly")) if (value && !strcasecmp(value, "dotgitonly"))
@ -453,7 +454,7 @@ static int set_hidden_flag(const wchar_t *path, int set)
return -1; return -1;
} }
int mingw_mkdir(const char *path, int mode) int mingw_mkdir(const char *path, int mode UNUSED)
{ {
int ret; int ret;
wchar_t wpath[MAX_PATH]; wchar_t wpath[MAX_PATH];
@ -597,7 +598,7 @@ int mingw_open (const char *filename, int oflags, ...)
return fd; return fd;
} }
static BOOL WINAPI ctrl_ignore(DWORD type) static BOOL WINAPI ctrl_ignore(DWORD type UNUSED)
{ {
return TRUE; return TRUE;
} }
@ -1085,7 +1086,7 @@ int mkstemp(char *template)
return git_mkstemp_mode(template, 0600); return git_mkstemp_mode(template, 0600);
} }
int gettimeofday(struct timeval *tv, void *tz) int gettimeofday(struct timeval *tv, void *tz UNUSED)
{ {
FILETIME ft; FILETIME ft;
long long hnsec; long long hnsec;
@ -2252,7 +2253,7 @@ char *mingw_query_user_email(void)
return get_extended_user_info(NameUserPrincipal); return get_extended_user_info(NameUserPrincipal);
} }
struct passwd *getpwuid(int uid) struct passwd *getpwuid(int uid UNUSED)
{ {
static unsigned initialized; static unsigned initialized;
static char user_name[100]; static char user_name[100];
@ -2304,7 +2305,7 @@ static sig_handler_t timer_fn = SIG_DFL, sigint_fn = SIG_DFL;
* length to call the signal handler. * length to call the signal handler.
*/ */
static unsigned __stdcall ticktack(void *dummy) static unsigned __stdcall ticktack(void *dummy UNUSED)
{ {
while (WaitForSingleObject(timer_event, timer_interval) == WAIT_TIMEOUT) { while (WaitForSingleObject(timer_event, timer_interval) == WAIT_TIMEOUT) {
mingw_raise(SIGALRM); mingw_raise(SIGALRM);
@ -2352,7 +2353,7 @@ static inline int is_timeval_eq(const struct timeval *i1, const struct timeval *
return i1->tv_sec == i2->tv_sec && i1->tv_usec == i2->tv_usec; return i1->tv_sec == i2->tv_sec && i1->tv_usec == i2->tv_usec;
} }
int setitimer(int type, struct itimerval *in, struct itimerval *out) int setitimer(int type UNUSED, struct itimerval *in, struct itimerval *out)
{ {
static const struct timeval zero; static const struct timeval zero;
static int atexit_done; static int atexit_done;

18
compat/mingw.h
View File

@ -122,17 +122,17 @@ struct utsname {
* trivial stubs * trivial stubs
*/ */
static inline int readlink(const char *path, char *buf, size_t bufsiz) static inline int readlink(const char *path UNUSED, char *buf UNUSED, size_t bufsiz UNUSED)
{ errno = ENOSYS; return -1; } { errno = ENOSYS; return -1; }
static inline int symlink(const char *oldpath, const char *newpath) static inline int symlink(const char *oldpath UNUSED, const char *newpath UNUSED)
{ errno = ENOSYS; return -1; } { errno = ENOSYS; return -1; }
static inline int fchmod(int fildes, mode_t mode) static inline int fchmod(int fildes UNUSED, mode_t mode UNUSED)
{ errno = ENOSYS; return -1; } { errno = ENOSYS; return -1; }
#ifndef __MINGW64_VERSION_MAJOR #ifndef __MINGW64_VERSION_MAJOR
static inline pid_t fork(void) static inline pid_t fork(void)
{ errno = ENOSYS; return -1; } { errno = ENOSYS; return -1; }
#endif #endif
static inline unsigned int alarm(unsigned int seconds) static inline unsigned int alarm(unsigned int seconds UNUSED)
{ return 0; } { return 0; }
static inline int fsync(int fd) static inline int fsync(int fd)
{ return _commit(fd); } { return _commit(fd); }
@ -140,9 +140,9 @@ static inline void sync(void)
{} {}
static inline uid_t getuid(void) static inline uid_t getuid(void)
{ return 1; } { return 1; }
static inline struct passwd *getpwnam(const char *name) static inline struct passwd *getpwnam(const char *name UNUSED)
{ return NULL; } { return NULL; }
static inline int fcntl(int fd, int cmd, ...) static inline int fcntl(int fd UNUSED, int cmd, ...)
{ {
if (cmd == F_GETFD || cmd == F_SETFD) if (cmd == F_GETFD || cmd == F_SETFD)
return 0; return 0;
@ -151,17 +151,17 @@ static inline int fcntl(int fd, int cmd, ...)
} }
#define sigemptyset(x) (void)0 #define sigemptyset(x) (void)0
static inline int sigaddset(sigset_t *set, int signum) static inline int sigaddset(sigset_t *set UNUSED, int signum UNUSED)
{ return 0; } { return 0; }
#define SIG_BLOCK 0 #define SIG_BLOCK 0
#define SIG_UNBLOCK 0 #define SIG_UNBLOCK 0
static inline int sigprocmask(int how, const sigset_t *set, sigset_t *oldset) static inline int sigprocmask(int how UNUSED, const sigset_t *set UNUSED, sigset_t *oldset UNUSED)
{ return 0; } { return 0; }
static inline pid_t getppid(void) static inline pid_t getppid(void)
{ return 1; } { return 1; }
static inline pid_t getpgid(pid_t pid) static inline pid_t getpgid(pid_t pid)
{ return pid == 0 ? getpid() : pid; } { return pid == 0 ? getpid() : pid; }
static inline pid_t tcgetpgrp(int fd) static inline pid_t tcgetpgrp(int fd UNUSED)
{ return getpid(); } { return getpid(); }
/* /*

2
compat/stub/procinfo.c
View File

@ -6,6 +6,6 @@
* Stub. See sample implementations in compat/linux/procinfo.c and * Stub. See sample implementations in compat/linux/procinfo.c and
* compat/win32/trace2_win32_process_info.c. * compat/win32/trace2_win32_process_info.c.
*/ */
void trace2_collect_process_info(enum trace2_process_info_reason reason) void trace2_collect_process_info(enum trace2_process_info_reason reason UNUSED)
{ {
} }

2
compat/win32/pthread.c
View File

@ -21,7 +21,7 @@ static unsigned __stdcall win32_start_routine(void *arg)
return 0; return 0;
} }
int pthread_create(pthread_t *thread, const void *unused, int pthread_create(pthread_t *thread, const void *attr UNUSED,
void *(*start_routine)(void *), void *arg) void *(*start_routine)(void *), void *arg)
{ {
thread->arg = arg; thread->arg = arg;

4
compat/win32/pthread.h
View File

@ -18,7 +18,7 @@
*/ */
#define pthread_mutex_t CRITICAL_SECTION #define pthread_mutex_t CRITICAL_SECTION
static inline int return_0(int i) { static inline int return_0(int i UNUSED) {
return 0; return 0;
} }
#define pthread_mutex_init(a,b) return_0((InitializeCriticalSection((a)), 0)) #define pthread_mutex_init(a,b) return_0((InitializeCriticalSection((a)), 0))
@ -70,7 +70,7 @@ static inline void NORETURN pthread_exit(void *ret)
} }
typedef DWORD pthread_key_t; typedef DWORD pthread_key_t;
static inline int pthread_key_create(pthread_key_t *keyp, void (*destructor)(void *value)) static inline int pthread_key_create(pthread_key_t *keyp, void (*destructor)(void *value) UNUSED)
{ {
return (*keyp = TlsAlloc()) == TLS_OUT_OF_INDEXES ? EAGAIN : 0; return (*keyp = TlsAlloc()) == TLS_OUT_OF_INDEXES ? EAGAIN : 0;
} }

2
compat/win32/syslog.c
View File

@ -2,7 +2,7 @@
static HANDLE ms_eventlog; static HANDLE ms_eventlog;
void openlog(const char *ident, int logopt, int facility) void openlog(const char *ident, int logopt UNUSED, int facility UNUSED)
{ {
if (ms_eventlog) if (ms_eventlog)
return; return;

2
compat/win32mmap.c
View File

@ -40,7 +40,7 @@ void *git_mmap(void *start, size_t length, int prot, int flags, int fd, off_t of
return MAP_FAILED; return MAP_FAILED;
} }
int git_munmap(void *start, size_t length) int git_munmap(void *start, size_t length UNUSED)
{ {
return !UnmapViewOfFile(start); return !UnmapViewOfFile(start);
} }

2
compat/winansi.c
View File

@ -340,7 +340,7 @@ enum {
TEXT = 0, ESCAPE = 033, BRACKET = '[' TEXT = 0, ESCAPE = 033, BRACKET = '['
}; };
static DWORD WINAPI console_thread(LPVOID unused) static DWORD WINAPI console_thread(LPVOID data UNUSED)
{ {
unsigned char buffer[BUFFER_SIZE]; unsigned char buffer[BUFFER_SIZE];
DWORD bytes; DWORD bytes;