Merge branch 'jc/unused-symbols'

gitster · gitster · commit 93a96cced3ff · 2017-04-16T23:29:27.000-07:00
Code cleanup.

* jc/unused-symbols:
  remote.[ch]: parse_push_cas_option() can be static
diff --git a/remote.c b/remote.c
@@ -2279,7 +2279,7 @@ static struct push_cas *add_cas_entry(struct push_cas_option *cas,
 	return entry;
 }
 
-int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
+static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
 {
 	const char *colon;
 	struct push_cas *entry;
diff --git a/remote.h b/remote.h
@@ -290,7 +290,6 @@ struct push_cas_option {
 };
 
 extern int parseopt_push_cas_option(const struct option *, const char *arg, int unset);
-extern int parse_push_cas_option(struct push_cas_option *, const char *arg, int unset);
 
 extern int is_empty_cas(const struct push_cas_option *);
 void apply_push_cas(struct push_cas_option *, struct remote *, struct ref *);

Original file line number	Diff line number	Diff line change
`@@ -2279,7 +2279,7 @@ static struct push_cas add_cas_entry(struct push_cas_option cas,`
`2279`	`2279`	`return entry;`
`2280`	`2280`	`}`
`2281`	`2281`
`2282`		`-int parse_push_cas_option(struct push_cas_option cas, const char arg, int unset)`
	`2282`	`+static int parse_push_cas_option(struct push_cas_option cas, const char arg, int unset)`
`2283`	`2283`	`{`
`2284`	`2284`	`const char *colon;`
`2285`	`2285`	`struct push_cas *entry;`