credential: remove unnecessary forward declarations

Commit Message

Carlo Marcelo Arenas Belón April 24, 2020, 11:23 a.m. UTC

46fd7b3900 (credential: allow wildcard patterns when matching config,
2020-02-20) introduced a forward declaration for credential_describe()
that wasn't needed as well as a forward declaration for a similar
function that was implemented a few lines below.

remove the unnecessary forward declarations by moving the function
to where it is needed instead.

Signed-off-by: Carlo Marcelo Arenas Belón <[e-mail]>
---
 credential.c | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

Comments

Junio C Hamano April 24, 2020, 8:26 p.m. UTC | #1

Carlo Marcelo Arenas Belón  <[e-mail]> writes:

> 46fd7b3900 (credential: allow wildcard patterns when matching config,
> 2020-02-20) introduced a forward declaration for credential_describe()
> that wasn't needed as well as a forward declaration for a similar
> function that was implemented a few lines below.
>
> remove the unnecessary forward declarations by moving the function
> to where it is needed instead.
>
> Signed-off-by: Carlo Marcelo Arenas Belón <[e-mail]>
> ---
>  credential.c | 37 +++++++++++++++++--------------------
>  1 file changed, 17 insertions(+), 20 deletions(-)

I would rather not to see this kind of code churn for "this way it
is cleaner" (as opposed to "this is broken and needs fixing") in the
area of code that were _very_ actively touched and across _wide_
range of versions.  Maybe long after the dust from 2.17.4 and
friends settles, but not now.

Thanks.

Patch

diff --git a/credential.c b/credential.c
index 064e25e5d5..24eabe8929 100644
--- a/credential.c
+++ b/credential.c
@@ -73,15 +73,29 @@  static int proto_is_http(const char *s)
 	return !strcmp(s, "https") || !strcmp(s, "http");
 }
 
-static void credential_describe(struct credential *c, struct strbuf *out);
-static void credential_format(struct credential *c, struct strbuf *out);
-
 static int select_all(const struct urlmatch_item *a,
 		      const struct urlmatch_item *b)
 {
 	return 0;
 }
 
+static void credential_format(struct credential *c, struct strbuf *out)
+{
+	if (!c->protocol)
+		return;
+	strbuf_addf(out, "%s://", c->protocol);
+	if (c->username && *c->username) {
+		strbuf_add_percentencode(out, c->username);
+		strbuf_addch(out, '@');
+	}
+	if (c->host)
+		strbuf_addstr(out, c->host);
+	if (c->path) {
+		strbuf_addch(out, '/');
+		strbuf_add_percentencode(out, c->path);
+	}
+}
+
 static void credential_apply_config(struct credential *c)
 {
 	char *normalized_url;
@@ -130,23 +144,6 @@  static void credential_describe(struct credential *c, struct strbuf *out)
 		strbuf_addf(out, "/%s", c->path);
 }
 
-static void credential_format(struct credential *c, struct strbuf *out)
-{
-	if (!c->protocol)
-		return;
-	strbuf_addf(out, "%s://", c->protocol);
-	if (c->username && *c->username) {
-		strbuf_add_percentencode(out, c->username);
-		strbuf_addch(out, '@');
-	}
-	if (c->host)
-		strbuf_addstr(out, c->host);
-	if (c->path) {
-		strbuf_addch(out, '/');
-		strbuf_add_percentencode(out, c->path);
-	}
-}
-
 static char *credential_ask_one(const char *what, struct credential *c,
 				int flags)
 {