Merge branch 'jk/fsmonitor-unused-parameter'

gitster · gitster · commit 2affeb3cb57e · 2023-09-29T09:04:14.000-07:00
Unused parameters in fsmonitor related code paths have been marked
as such.

* jk/fsmonitor-unused-parameter:
  run-command: mark unused parameters in start_bg_wait callbacks
  fsmonitor: mark unused hashmap callback parameters
  fsmonitor/darwin: mark unused parameters in system callback
  fsmonitor: mark unused parameters in stub functions
  fsmonitor/win32: mark unused parameter in fsm_os__incompatible()
  fsmonitor: mark some maybe-unused parameters
  fsmonitor/win32: drop unused parameters
  fsmonitor: prefer repo_git_path() to git_pathdup()
diff --git a/builtin/fsmonitor--daemon.c b/builtin/fsmonitor--daemon.c
@@ -129,8 +129,9 @@ struct fsmonitor_cookie_item {
 	enum fsmonitor_cookie_item_result result;
 };
 
-static int cookies_cmp(const void *data, const struct hashmap_entry *he1,
-		     const struct hashmap_entry *he2, const void *keydata)
+static int cookies_cmp(const void *data UNUSED,
+		       const struct hashmap_entry *he1,
+		       const struct hashmap_entry *he2, const void *keydata)
 {
 	const struct fsmonitor_cookie_item *a =
 		container_of(he1, const struct fsmonitor_cookie_item, entry);
@@ -1412,7 +1413,7 @@ static int fsmonitor_run_daemon(void)
 	return err;
 }
 
-static int try_to_run_foreground_daemon(int detach_console)
+static int try_to_run_foreground_daemon(int detach_console MAYBE_UNUSED)
 {
 	/*
 	 * Technically, we don't need to probe for an existing daemon
@@ -1442,7 +1443,8 @@ static int try_to_run_foreground_daemon(int detach_console)
 
 static start_bg_wait_cb bg_wait_cb;
 
-static int bg_wait_cb(const struct child_process *cp, void *cb_data)
+static int bg_wait_cb(const struct child_process *cp UNUSED,
+		      void *cb_data UNUSED)
 {
 	enum ipc_active_state s = fsmonitor_ipc__get_state();
 
diff --git a/compat/fsmonitor/fsm-health-darwin.c b/compat/fsmonitor/fsm-health-darwin.c
@@ -4,21 +4,21 @@
 #include "fsm-health.h"
 #include "fsmonitor--daemon.h"
 
-int fsm_health__ctor(struct fsmonitor_daemon_state *state)
+int fsm_health__ctor(struct fsmonitor_daemon_state *state UNUSED)
 {
 	return 0;
 }
 
-void fsm_health__dtor(struct fsmonitor_daemon_state *state)
+void fsm_health__dtor(struct fsmonitor_daemon_state *state UNUSED)
 {
 	return;
 }
 
-void fsm_health__loop(struct fsmonitor_daemon_state *state)
+void fsm_health__loop(struct fsmonitor_daemon_state *state UNUSED)
 {
 	return;
 }
 
-void fsm_health__stop_async(struct fsmonitor_daemon_state *state)
+void fsm_health__stop_async(struct fsmonitor_daemon_state *state UNUSED)
 {
 }
diff --git a/compat/fsmonitor/fsm-ipc-win32.c b/compat/fsmonitor/fsm-ipc-win32.c
@@ -6,6 +6,6 @@
 const char *fsmonitor_ipc__get_path(struct repository *r) {
 	static char *ret;
 	if (!ret)
-		ret = git_pathdup("fsmonitor--daemon.ipc");
+		ret = repo_git_path(r, "fsmonitor--daemon.ipc");
 	return ret;
 }
diff --git a/compat/fsmonitor/fsm-listen-darwin.c b/compat/fsmonitor/fsm-listen-darwin.c
@@ -191,12 +191,12 @@ static void my_add_path(struct fsmonitor_batch *batch, const char *path)
 }
 
 
-static void fsevent_callback(ConstFSEventStreamRef streamRef,
+static void fsevent_callback(ConstFSEventStreamRef streamRef UNUSED,
 			     void *ctx,
 			     size_t num_of_events,
 			     void *event_paths,
 			     const FSEventStreamEventFlags event_flags[],
-			     const FSEventStreamEventId event_ids[])
+			     const FSEventStreamEventId event_ids[] UNUSED)
 {
 	struct fsmonitor_daemon_state *state = ctx;
 	struct fsm_listen_data *data = state->listen_data;
diff --git a/compat/fsmonitor/fsm-listen-win32.c b/compat/fsmonitor/fsm-listen-win32.c
@@ -289,8 +289,7 @@ void fsm_listen__stop_async(struct fsmonitor_daemon_state *state)
 	SetEvent(state->listen_data->hListener[LISTENER_SHUTDOWN]);
 }
 
-static struct one_watch *create_watch(struct fsmonitor_daemon_state *state,
-				      const char *path)
+static struct one_watch *create_watch(const char *path)
 {
 	struct one_watch *watch = NULL;
 	DWORD desired_access = FILE_LIST_DIRECTORY;
@@ -361,8 +360,7 @@ static void destroy_watch(struct one_watch *watch)
 	free(watch);
 }
 
-static int start_rdcw_watch(struct fsm_listen_data *data,
-			    struct one_watch *watch)
+static int start_rdcw_watch(struct one_watch *watch)
 {
 	DWORD dwNotifyFilter =
 		FILE_NOTIFY_CHANGE_FILE_NAME |
@@ -735,11 +733,11 @@ void fsm_listen__loop(struct fsmonitor_daemon_state *state)
 
 	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;
 
 	if (data->watch_gitdir &&
-	    start_rdcw_watch(data, data->watch_gitdir) == -1)
+	    start_rdcw_watch(data->watch_gitdir) == -1)
 		goto force_error_stop;
 
 	for (;;) {
@@ -755,15 +753,15 @@ void fsm_listen__loop(struct fsmonitor_daemon_state *state)
 			}
 			if (result == -2) {
 				/* retryable error */
-				if (start_rdcw_watch(data, data->watch_worktree) == -1)
+				if (start_rdcw_watch(data->watch_worktree) == -1)
 					goto force_error_stop;
 				continue;
 			}
 
 			/* have data */
 			if (process_worktree_events(state) == LISTENER_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;
 			continue;
 		}
@@ -776,15 +774,15 @@ void fsm_listen__loop(struct fsmonitor_daemon_state *state)
 			}
 			if (result == -2) {
 				/* retryable error */
-				if (start_rdcw_watch(data, data->watch_gitdir) == -1)
+				if (start_rdcw_watch(data->watch_gitdir) == -1)
 					goto force_error_stop;
 				continue;
 			}
 
 			/* have data */
 			if (process_gitdir_events(state) == LISTENER_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;
 			continue;
 		}
@@ -821,16 +819,14 @@ int fsm_listen__ctor(struct fsmonitor_daemon_state *state)
 
 	data->hEventShutdown = CreateEvent(NULL, TRUE, FALSE, NULL);
 
-	data->watch_worktree = create_watch(state,
-					    state->path_worktree_watch.buf);
+	data->watch_worktree = create_watch(state->path_worktree_watch.buf);
 	if (!data->watch_worktree)
 		goto failed;
 
 	check_for_shortnames(data->watch_worktree);
 
 	if (state->nr_paths_watching > 1) {
-		data->watch_gitdir = create_watch(state,
-						  state->path_gitdir_watch.buf);
+		data->watch_gitdir = create_watch(state->path_gitdir_watch.buf);
 		if (!data->watch_gitdir)
 			goto failed;
 	}
diff --git a/compat/fsmonitor/fsm-path-utils-win32.c b/compat/fsmonitor/fsm-path-utils-win32.c
@@ -132,16 +132,17 @@ int fsmonitor__is_fs_remote(const char *path)
 /*
  * No-op for now.
  */
-int fsmonitor__get_alias(const char *path, struct alias_info *info)
+int fsmonitor__get_alias(const char *path UNUSED,
+			 struct alias_info *info UNUSED)
 {
 	return 0;
 }
 
 /*
  * No-op for now.
  */
-char *fsmonitor__resolve_alias(const char *path,
-	const struct alias_info *info)
+char *fsmonitor__resolve_alias(const char *path UNUSED,
+			       const struct alias_info *info UNUSED)
 {
 	return NULL;
 }
diff --git a/compat/fsmonitor/fsm-settings-win32.c b/compat/fsmonitor/fsm-settings-win32.c
@@ -25,7 +25,7 @@ static enum fsmonitor_reason check_vfs4git(struct repository *r)
 	return FSMONITOR_REASON_OK;
 }
 
-enum fsmonitor_reason fsm_os__incompatible(struct repository *r, int ipc)
+enum fsmonitor_reason fsm_os__incompatible(struct repository *r, int ipc UNUSED)
 {
 	enum fsmonitor_reason reason;
 
diff --git a/fsmonitor-ipc.c b/fsmonitor-ipc.c
@@ -20,7 +20,7 @@ int fsmonitor_ipc__is_supported(void)
 	return 0;
 }
 
-const char *fsmonitor_ipc__get_path(struct repository *r)
+const char *fsmonitor_ipc__get_path(struct repository *r UNUSED)
 {
 	return NULL;
 }
@@ -30,14 +30,14 @@ enum ipc_active_state fsmonitor_ipc__get_state(void)
 	return IPC_STATE__OTHER_ERROR;
 }
 
-int fsmonitor_ipc__send_query(const char *since_token,
-			      struct strbuf *answer)
+int fsmonitor_ipc__send_query(const char *since_token UNUSED,
+			      struct strbuf *answer UNUSED)
 {
 	return -1;
 }
 
-int fsmonitor_ipc__send_command(const char *command,
-				struct strbuf *answer)
+int fsmonitor_ipc__send_command(const char *command UNUSED,
+				struct strbuf *answer UNUSED)
 {
 	return -1;
 }
diff --git a/fsmonitor-settings.c b/fsmonitor-settings.c
@@ -62,7 +62,8 @@ static enum fsmonitor_reason check_remote(struct repository *r)
 }
 #endif
 
-static enum fsmonitor_reason check_for_incompatible(struct repository *r, int ipc)
+static enum fsmonitor_reason check_for_incompatible(struct repository *r,
+						    int ipc MAYBE_UNUSED)
 {
 	if (!r->worktree) {
 		/*
diff --git a/t/helper/test-simple-ipc.c b/t/helper/test-simple-ipc.c
@@ -278,7 +278,8 @@ static int daemon__run_server(void)
 
 static start_bg_wait_cb bg_wait_cb;
 
-static int bg_wait_cb(const struct child_process *cp, void *cb_data)
+static int bg_wait_cb(const struct child_process *cp UNUSED,
+		      void *cb_data UNUSED)
 {
 	int s = ipc_get_active_state(cl_args.path);
 

Original file line number	Diff line number	Diff line change
`@@ -129,8 +129,9 @@ struct fsmonitor_cookie_item {`
`129`	`129`	`enum fsmonitor_cookie_item_result result;`
`130`	`130`	`};`
`131`	`131`
`132`		`-static int cookies_cmp(const void data, const struct hashmap_entry he1,`
`133`		`- const struct hashmap_entry he2, const void keydata)`
	`132`	`+static int cookies_cmp(const void *data UNUSED,`
	`133`	`+ const struct hashmap_entry *he1,`
	`134`	`+ const struct hashmap_entry he2, const void keydata)`
`134`	`135`	`{`
`135`	`136`	`const struct fsmonitor_cookie_item *a =`
`136`	`137`	`container_of(he1, const struct fsmonitor_cookie_item, entry);`
`@@ -1412,7 +1413,7 @@ static int fsmonitor_run_daemon(void)`
`1412`	`1413`	`return err;`
`1413`	`1414`	`}`
`1414`	`1415`
`1415`		`-static int try_to_run_foreground_daemon(int detach_console)`
	`1416`	`+static int try_to_run_foreground_daemon(int detach_console MAYBE_UNUSED)`
`1416`	`1417`	`{`
`1417`	`1418`	`/*`
`1418`	`1419`	`* Technically, we don't need to probe for an existing daemon`
`@@ -1442,7 +1443,8 @@ static int try_to_run_foreground_daemon(int detach_console)`
`1442`	`1443`
`1443`	`1444`	`static start_bg_wait_cb bg_wait_cb;`
`1444`	`1445`
`1445`		`-static int bg_wait_cb(const struct child_process cp, void cb_data)`
	`1446`	`+static int bg_wait_cb(const struct child_process *cp UNUSED,`
	`1447`	`+ void *cb_data UNUSED)`
`1446`	`1448`	`{`
`1447`	`1449`	`enum ipc_active_state s = fsmonitor_ipc__get_state();`
`1448`	`1450`
Original file line number	Diff line number	Diff line change
`@@ -4,21 +4,21 @@`
`4`	`4`	`#include "fsm-health.h"`
`5`	`5`	`#include "fsmonitor--daemon.h"`
`6`	`6`
`7`		`-int fsm_health__ctor(struct fsmonitor_daemon_state *state)`
	`7`	`+int fsm_health__ctor(struct fsmonitor_daemon_state *state UNUSED)`
`8`	`8`	`{`
`9`	`9`	`return 0;`
`10`	`10`	`}`
`11`	`11`
`12`		`-void fsm_health__dtor(struct fsmonitor_daemon_state *state)`
	`12`	`+void fsm_health__dtor(struct fsmonitor_daemon_state *state UNUSED)`
`13`	`13`	`{`
`14`	`14`	`return;`
`15`	`15`	`}`
`16`	`16`
`17`		`-void fsm_health__loop(struct fsmonitor_daemon_state *state)`
	`17`	`+void fsm_health__loop(struct fsmonitor_daemon_state *state UNUSED)`
`18`	`18`	`{`
`19`	`19`	`return;`
`20`	`20`	`}`
`21`	`21`
`22`		`-void fsm_health__stop_async(struct fsmonitor_daemon_state *state)`
	`22`	`+void fsm_health__stop_async(struct fsmonitor_daemon_state *state UNUSED)`
`23`	`23`	`{`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@`
`6`	`6`	`const char fsmonitor_ipc__get_path(struct repository r) {`
`7`	`7`	`static char *ret;`
`8`	`8`	`if (!ret)`
`9`		`- ret = git_pathdup("fsmonitor--daemon.ipc");`
	`9`	`+ ret = repo_git_path(r, "fsmonitor--daemon.ipc");`
`10`	`10`	`return ret;`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -191,12 +191,12 @@ static void my_add_path(struct fsmonitor_batch batch, const char path)`
`191`	`191`	`}`
`192`	`192`
`193`	`193`
`194`		`-static void fsevent_callback(ConstFSEventStreamRef streamRef,`
	`194`	`+static void fsevent_callback(ConstFSEventStreamRef streamRef UNUSED,`
`195`	`195`	`void *ctx,`
`196`	`196`	`size_t num_of_events,`
`197`	`197`	`void *event_paths,`
`198`	`198`	`const FSEventStreamEventFlags event_flags[],`
`199`		`- const FSEventStreamEventId event_ids[])`
	`199`	`+ const FSEventStreamEventId event_ids[] UNUSED)`
`200`	`200`	`{`
`201`	`201`	`struct fsmonitor_daemon_state *state = ctx;`
`202`	`202`	`struct fsm_listen_data *data = state->listen_data;`
Original file line number	Diff line number	Diff line change
`@@ -132,16 +132,17 @@ int fsmonitor__is_fs_remote(const char *path)`
`132`	`132`	`/*`
`133`	`133`	`* No-op for now.`
`134`	`134`	`*/`
`135`		`-int fsmonitor__get_alias(const char path, struct alias_info info)`
	`135`	`+int fsmonitor__get_alias(const char *path UNUSED,`
	`136`	`+ struct alias_info *info UNUSED)`
`136`	`137`	`{`
`137`	`138`	`return 0;`
`138`	`139`	`}`
`139`	`140`
`140`	`141`	`/*`
`141`	`142`	`* No-op for now.`
`142`	`143`	`*/`
`143`		`-char fsmonitor__resolve_alias(const char path,`
`144`		`- const struct alias_info *info)`
	`144`	`+char fsmonitor__resolve_alias(const char path UNUSED,`
	`145`	`+ const struct alias_info *info UNUSED)`
`145`	`146`	`{`
`146`	`147`	`return NULL;`
`147`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ static enum fsmonitor_reason check_vfs4git(struct repository *r)`
`25`	`25`	`return FSMONITOR_REASON_OK;`
`26`	`26`	`}`
`27`	`27`
`28`		`-enum fsmonitor_reason fsm_os__incompatible(struct repository *r, int ipc)`
	`28`	`+enum fsmonitor_reason fsm_os__incompatible(struct repository *r, int ipc UNUSED)`
`29`	`29`	`{`
`30`	`30`	`enum fsmonitor_reason reason;`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ int fsmonitor_ipc__is_supported(void)`
`20`	`20`	`return 0;`
`21`	`21`	`}`
`22`	`22`
`23`		`-const char fsmonitor_ipc__get_path(struct repository r)`
	`23`	`+const char fsmonitor_ipc__get_path(struct repository r UNUSED)`
`24`	`24`	`{`
`25`	`25`	`return NULL;`
`26`	`26`	`}`
`@@ -30,14 +30,14 @@ enum ipc_active_state fsmonitor_ipc__get_state(void)`
`30`	`30`	`return IPC_STATE__OTHER_ERROR;`
`31`	`31`	`}`
`32`	`32`
`33`		`-int fsmonitor_ipc__send_query(const char *since_token,`
`34`		`- struct strbuf *answer)`
	`33`	`+int fsmonitor_ipc__send_query(const char *since_token UNUSED,`
	`34`	`+ struct strbuf *answer UNUSED)`
`35`	`35`	`{`
`36`	`36`	`return -1;`
`37`	`37`	`}`
`38`	`38`
`39`		`-int fsmonitor_ipc__send_command(const char *command,`
`40`		`- struct strbuf *answer)`
	`39`	`+int fsmonitor_ipc__send_command(const char *command UNUSED,`
	`40`	`+ struct strbuf *answer UNUSED)`
`41`	`41`	`{`
`42`	`42`	`return -1;`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,8 @@ static enum fsmonitor_reason check_remote(struct repository *r)`
`62`	`62`	`}`
`63`	`63`	`#endif`
`64`	`64`
`65`		`-static enum fsmonitor_reason check_for_incompatible(struct repository *r, int ipc)`
	`65`	`+static enum fsmonitor_reason check_for_incompatible(struct repository *r,`
	`66`	`+ int ipc MAYBE_UNUSED)`
`66`	`67`	`{`
`67`	`68`	`if (!r->worktree) {`
`68`	`69`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,8 @@ static int daemon__run_server(void)`
`278`	`278`
`279`	`279`	`static start_bg_wait_cb bg_wait_cb;`
`280`	`280`
`281`		`-static int bg_wait_cb(const struct child_process cp, void cb_data)`
	`281`	`+static int bg_wait_cb(const struct child_process *cp UNUSED,`
	`282`	`+ void *cb_data UNUSED)`
`282`	`283`	`{`
`283`	`284`	`int s = ipc_get_active_state(cl_args.path);`
`284`	`285`