kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

fsmonitor/win32: drop unused parameters 

A few helper functions (centered around file-watch events) take extra
fsmonitor state parameters that they don't use. These are static helpers
local to the win32 implementation, and don't need to conform to any
particular interface. We can just drop the extra parameters, which
simplifies the code and silences -Wunused-parameter.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 2023-09-18 18:30:01 -04:00 committed by Junio C Hamano
parent 00df20a7ab
commit 42e862c0b3
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
compat/fsmonitor/fsm-listen-win32.c
View File

@ -289,8 +289,7 @@ void fsm_listen__stop_async(struct fsmonitor_daemon_state *state)
SetEvent(state->listen_data->hListener[LISTENER_SHUTDOWN]); SetEvent(state->listen_data->hListener[LISTENER_SHUTDOWN]);
} }


static struct one_watch *create_watch(struct fsmonitor_daemon_state *state, static struct one_watch *create_watch(const char *path)
const char *path)
{ {
struct one_watch *watch = NULL; struct one_watch *watch = NULL;
DWORD desired_access = FILE_LIST_DIRECTORY; DWORD desired_access = FILE_LIST_DIRECTORY;
@ -361,8 +360,7 @@ static void destroy_watch(struct one_watch *watch)
free(watch); free(watch);
} }


static int start_rdcw_watch(struct fsm_listen_data *data, static int start_rdcw_watch(struct one_watch *watch)
struct one_watch *watch)
{ {
DWORD dwNotifyFilter = DWORD dwNotifyFilter =
FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_FILE_NAME |
@ -735,11 +733,11 @@ void fsm_listen__loop(struct fsmonitor_daemon_state *state)


state->listen_error_code = 0; state->listen_error_code = 0;


if (start_rdcw_watch(data, data->watch_worktree) == -1) if (start_rdcw_watch(data->watch_worktree) == -1)
goto force_error_stop; goto force_error_stop;


if (data->watch_gitdir && if (data->watch_gitdir &&
start_rdcw_watch(data, data->watch_gitdir) == -1) start_rdcw_watch(data->watch_gitdir) == -1)
goto force_error_stop; goto force_error_stop;


for (;;) { for (;;) {
@ -755,7 +753,7 @@ void fsm_listen__loop(struct fsmonitor_daemon_state *state)
} }
if (result == -2) { if (result == -2) {
/* retryable error */ /* retryable error */
if (start_rdcw_watch(data, data->watch_worktree) == -1) if (start_rdcw_watch(data->watch_worktree) == -1)
goto force_error_stop; goto force_error_stop;
continue; continue;
} }
@ -763,7 +761,7 @@ void fsm_listen__loop(struct fsmonitor_daemon_state *state)
/* have data */ /* have data */
if (process_worktree_events(state) == LISTENER_SHUTDOWN) if (process_worktree_events(state) == LISTENER_SHUTDOWN)
goto force_shutdown; goto force_shutdown;
if (start_rdcw_watch(data, data->watch_worktree) == -1) if (start_rdcw_watch(data->watch_worktree) == -1)
goto force_error_stop; goto force_error_stop;
continue; continue;
} }
@ -776,7 +774,7 @@ void fsm_listen__loop(struct fsmonitor_daemon_state *state)
} }
if (result == -2) { if (result == -2) {
/* retryable error */ /* retryable error */
if (start_rdcw_watch(data, data->watch_gitdir) == -1) if (start_rdcw_watch(data->watch_gitdir) == -1)
goto force_error_stop; goto force_error_stop;
continue; continue;
} }
@ -784,7 +782,7 @@ void fsm_listen__loop(struct fsmonitor_daemon_state *state)
/* have data */ /* have data */
if (process_gitdir_events(state) == LISTENER_SHUTDOWN) if (process_gitdir_events(state) == LISTENER_SHUTDOWN)
goto force_shutdown; goto force_shutdown;
if (start_rdcw_watch(data, data->watch_gitdir) == -1) if (start_rdcw_watch(data->watch_gitdir) == -1)
goto force_error_stop; goto force_error_stop;
continue; continue;
} }
@ -821,16 +819,14 @@ int fsm_listen__ctor(struct fsmonitor_daemon_state *state)


data->hEventShutdown = CreateEvent(NULL, TRUE, FALSE, NULL); data->hEventShutdown = CreateEvent(NULL, TRUE, FALSE, NULL);


data->watch_worktree = create_watch(state, data->watch_worktree = create_watch(state->path_worktree_watch.buf);
state->path_worktree_watch.buf);
if (!data->watch_worktree) if (!data->watch_worktree)
goto failed; goto failed;


check_for_shortnames(data->watch_worktree); check_for_shortnames(data->watch_worktree);


if (state->nr_paths_watching > 1) { if (state->nr_paths_watching > 1) {
data->watch_gitdir = create_watch(state, data->watch_gitdir = create_watch(state->path_gitdir_watch.buf);
state->path_gitdir_watch.buf);
if (!data->watch_gitdir) if (!data->watch_gitdir)
goto failed; goto failed;
} }