report_path_error(): drop unused prefix parameter

peff · gitster · commit c5c33504c906 · 2019-03-20T18:34:09.000+09:00
This hasn't been used since 17ddc66 (convert report_path_error to take struct pathspec, 2013-07-14), as the names in the struct will have already been prefixed when they were parsed. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/builtin/checkout.c b/builtin/checkout.c
@@ -376,7 +376,7 @@ static int checkout_paths(const struct checkout_opts *opts,
 							ps_matched,
 							opts);
 
-	if (report_path_error(ps_matched, &opts->pathspec, opts->prefix)) {
+	if (report_path_error(ps_matched, &opts->pathspec)) {
 		free(ps_matched);
 		return 1;
 	}
diff --git a/builtin/commit.c b/builtin/commit.c
@@ -235,7 +235,7 @@ static int commit_index_files(void)
  * and return the paths that match the given pattern in list.
  */
 static int list_paths(struct string_list *list, const char *with_tree,
-		      const char *prefix, const struct pathspec *pattern)
+		      const struct pathspec *pattern)
 {
 	int i, ret;
 	char *m;
@@ -264,7 +264,7 @@ static int list_paths(struct string_list *list, const char *with_tree,
 			item->util = item; /* better a valid pointer than a fake one */
 	}
 
-	ret = report_path_error(m, pattern, prefix);
+	ret = report_path_error(m, pattern);
 	free(m);
 	return ret;
 }
@@ -454,7 +454,7 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
 			die(_("cannot do a partial commit during a cherry-pick."));
 	}
 
-	if (list_paths(&partial, !current_head ? NULL : "HEAD", prefix, &pathspec))
+	if (list_paths(&partial, !current_head ? NULL : "HEAD", &pathspec))
 		exit(1);
 
 	discard_cache();
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
@@ -680,7 +680,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
 
 	if (ps_matched) {
 		int bad;
-		bad = report_path_error(ps_matched, &pathspec, prefix);
+		bad = report_path_error(ps_matched, &pathspec);
 		if (bad)
 			fprintf(stderr, "Did you forget to 'git add'?\n");
 
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
@@ -348,7 +348,7 @@ static int module_list_compute(int argc, const char **argv,
 			i++;
 	}
 
-	if (ps_matched && report_path_error(ps_matched, pathspec, prefix))
+	if (ps_matched && report_path_error(ps_matched, pathspec))
 		result = -1;
 
 	free(ps_matched);
diff --git a/dir.c b/dir.c
@@ -502,8 +502,7 @@ int submodule_path_match(const struct index_state *istate,
 }
 
 int report_path_error(const char *ps_matched,
-		      const struct pathspec *pathspec,
-		      const char *prefix)
+		      const struct pathspec *pathspec)
 {
 	/*
 	 * Make sure all pathspec matched; otherwise it is an error.
diff --git a/dir.h b/dir.h
@@ -220,7 +220,7 @@ extern int match_pathspec(const struct index_state *istate,
 			  const struct pathspec *pathspec,
 			  const char *name, int namelen,
 			  int prefix, char *seen, int is_dir);
-extern int report_path_error(const char *ps_matched, const struct pathspec *pathspec, const char *prefix);
+extern int report_path_error(const char *ps_matched, const struct pathspec *pathspec);
 extern int within_depth(const char *name, int namelen, int depth, int max_depth);
 
 extern int fill_directory(struct dir_struct *dir,

Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,7 @@ static int checkout_paths(const struct checkout_opts *opts,`
`376`	`376`	`ps_matched,`
`377`	`377`	`opts);`
`378`	`378`
`379`		`- if (report_path_error(ps_matched, &opts->pathspec, opts->prefix)) {`
	`379`	`+ if (report_path_error(ps_matched, &opts->pathspec)) {`
`380`	`380`	`free(ps_matched);`
`381`	`381`	`return 1;`
`382`	`382`	`}`
Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ static int commit_index_files(void)`
`235`	`235`	`* and return the paths that match the given pattern in list.`
`236`	`236`	`*/`
`237`	`237`	`static int list_paths(struct string_list list, const char with_tree,`
`238`		`- const char prefix, const struct pathspec pattern)`
	`238`	`+ const struct pathspec *pattern)`
`239`	`239`	`{`
`240`	`240`	`int i, ret;`
`241`	`241`	`char *m;`
`@@ -264,7 +264,7 @@ static int list_paths(struct string_list list, const char with_tree,`
`264`	`264`	`item->util = item; /* better a valid pointer than a fake one */`
`265`	`265`	`}`
`266`	`266`
`267`		`- ret = report_path_error(m, pattern, prefix);`
	`267`	`+ ret = report_path_error(m, pattern);`
`268`	`268`	`free(m);`
`269`	`269`	`return ret;`
`270`	`270`	`}`
`@@ -454,7 +454,7 @@ static const char prepare_index(int argc, const char argv, const char prefix`
`454`	`454`	`die(_("cannot do a partial commit during a cherry-pick."));`
`455`	`455`	`}`
`456`	`456`
`457`		`- if (list_paths(&partial, !current_head ? NULL : "HEAD", prefix, &pathspec))`
	`457`	`+ if (list_paths(&partial, !current_head ? NULL : "HEAD", &pathspec))`
`458`	`458`	`exit(1);`
`459`	`459`
`460`	`460`	`discard_cache();`
Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,7 @@ static int module_list_compute(int argc, const char **argv,`
`348`	`348`	`i++;`
`349`	`349`	`}`
`350`	`350`
`351`		`- if (ps_matched && report_path_error(ps_matched, pathspec, prefix))`
	`351`	`+ if (ps_matched && report_path_error(ps_matched, pathspec))`
`352`	`352`	`result = -1;`
`353`	`353`
`354`	`354`	`free(ps_matched);`
Original file line number	Diff line number	Diff line change
`@@ -502,8 +502,7 @@ int submodule_path_match(const struct index_state *istate,`
`502`	`502`	`}`
`503`	`503`
`504`	`504`	`int report_path_error(const char *ps_matched,`
`505`		`- const struct pathspec *pathspec,`
`506`		`- const char *prefix)`
	`505`	`+ const struct pathspec *pathspec)`
`507`	`506`	`{`
`508`	`507`	`/*`
`509`	`508`	`* Make sure all pathspec matched; otherwise it is an error.`