threads / patch / 18195

patchhttp: use strbuf API in quote_ref_url

Subject: [PATCH] http: use strbuf API in quote_ref_url

## tl;dr

2 messages between Mar 7, 2009 and Mar 7, 2009. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Tay Ray Chuan· Mar 7, 2009, 15:40 UTC · lore

In addition, ''quote_ref_url'' inserts a slash between the base URL and remote ref path only if needed. Previously, this insertion wasn't contingent on the lack of a separating slash.

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 http.c |   29 ++++++++++-------------------
 1 files changed, 10 insertions(+), 19 deletions(-)

Show changes to http.c +10 −19

diff --git a/http.c b/http.c
index cdedeb6..9de4130 100644
--- a/http.c
+++ b/http.c
@@ -577,31 +577,22 @@ static inline int hex(int v)

 static char *quote_ref_url(const char *base, const char *ref)
 {
+	struct strbuf buf = STRBUF_INIT;
 	const char *cp;
-	char *dp, *qref;
-	int len, baselen, ch;
+	int ch;
+
+	strbuf_addstr(&buf, base);
+	if (strcmp(base+strlen(base)-1, "/") && strcmp(ref, "/"))
+		strbuf_addstr(&buf, "/");

-	baselen = strlen(base);
-	len = baselen + 2; /* '/' after base and terminating NUL */
-	for (cp = ref; (ch = *cp) != 0; cp++, len++)
-		if (needs_quote(ch))
-			len += 2; /* extra two hex plus replacement % */
-	qref = xmalloc(len);
-	memcpy(qref, base, baselen);
-	dp = qref + baselen;
-	*(dp++) = '/';
 	for (cp = ref; (ch = *cp) != 0; cp++) {
-		if (needs_quote(ch)) {
-			*dp++ = '%';
-			*dp++ = hex((ch >> 4) & 0xF);
-			*dp++ = hex(ch & 0xF);
-		}
+		if (needs_quote(ch))
+			strbuf_addf(&buf, "%%%02x", ch);
 		else
-			*dp++ = ch;
+			strbuf_addch(&buf, *cp);
 	}
-	*dp = 0;

-	return qref;
+	return strbuf_detach(&buf, NULL);
 }

 int http_fetch_ref(const char *base, struct ref *ref)

-- 
1.6.2.rc1

Johannes Schindelin· Mar 7, 2009, 15:57 UTC · re: Tay Ray Chuan · lore

Re: [PATCH] http: use strbuf API in quote_ref_url

Hi,

On Sat, 7 Mar 2009, Tay Ray Chuan wrote:

Show 7 quoted lines

> In addition, ''quote_ref_url'' inserts a slash between the base URL and
> remote ref path only if needed. Previously, this insertion wasn't
> contingent on the lack of a separating slash.
> 
> Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---

I would prefer to give my ACK explicitely... :-)

Show 20 quoted lines

>  http.c |   29 ++++++++++-------------------
>  1 files changed, 10 insertions(+), 19 deletions(-)
> 
> diff --git a/http.c b/http.c
> index cdedeb6..9de4130 100644
> --- a/http.c
> +++ b/http.c
> @@ -577,31 +577,22 @@ static inline int hex(int v)
> 
>  static char *quote_ref_url(const char *base, const char *ref)
>  {
> +	struct strbuf buf = STRBUF_INIT;
>  	const char *cp;
> -	char *dp, *qref;
> -	int len, baselen, ch;
> +	int ch;
> +
> +	strbuf_addstr(&buf, base);
> +	if (strcmp(base+strlen(base)-1, "/") && strcmp(ref, "/"))
> +		strbuf_addstr(&buf, "/");

I would not have scratched my head that much if it read like this:

	if (buf.len && buf.buf[buf.len - 1] != '/' && *ref != '/')
		strbuf_addch(&buf, '/');

Show 12 quoted lines

>  	for (cp = ref; (ch = *cp) != 0; cp++) {
> -		if (needs_quote(ch)) {
> -			*dp++ = '%';
> -			*dp++ = hex((ch >> 4) & 0xF);
> -			*dp++ = hex(ch & 0xF);
> -		}
> +		if (needs_quote(ch))
> +			strbuf_addf(&buf, "%%%02x", ch);
>  		else
> -			*dp++ = ch;
> +			strbuf_addch(&buf, *cp);
>  	}

Seems as if you could remove even the curly brackets here.

Other than that, it indeed looks like an ACK from me...

Ciao, Dscho