* [PATCH] http: use strbuf API in quote_ref_url
@ 2009-03-07 15:40 Tay Ray Chuan
2009-03-07 15:57 ` Johannes Schindelin
0 siblings, 1 reply; 2+ messages in thread
From: Tay Ray Chuan @ 2009-03-07 15:40 UTC (permalink / raw)
To: git, Johannes Schindelin
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(-)
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] http: use strbuf API in quote_ref_url
2009-03-07 15:40 [PATCH] http: use strbuf API in quote_ref_url Tay Ray Chuan
@ 2009-03-07 15:57 ` Johannes Schindelin
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Schindelin @ 2009-03-07 15:57 UTC (permalink / raw)
To: Tay Ray Chuan; +Cc: git
Hi,
On Sat, 7 Mar 2009, Tay Ray Chuan wrote:
> 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... :-)
> 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, '/');
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-03-07 15:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-07 15:40 [PATCH] http: use strbuf API in quote_ref_url Tay Ray Chuan
2009-03-07 15:57 ` Johannes Schindelin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox