From: Junio C Hamano <gitster@pobox•com>
To: Ray Chuan <rctay89@gmail•com>
Cc: git@vger•kernel.org, Johannes Schindelin <Johannes.Schindelin@gmx•de>
Subject: Re: [PATCH] http-push: refactor request url creation
Date: Sun, 25 Jan 2009 12:35:04 -0800 [thread overview]
Message-ID: <7vpribdszr.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: be6fef0d0901242208p635264e5jc1f95d784cd51450@mail.gmail.com
Ray Chuan <rctay89@gmail•com> writes:
> Currently, functions that deal with objects on the remote repository
> have to allocate and do strcpys to generate the URL.
>
> This patch saves them this trouble, by providing a function that
> returns a URL: either the object's 2-digit hex directory (eg.
> /objects/a1/) or the complete object location (eg. /objects/a1/b2).
>
> Acked-by: Johannes Schindelin <johannes.schindelin@gmx•de>
> Signed-off-by: Tay Ray Chuan <rctay89@gmail•com>
If you wrote it, and then Johannes vetted it, then these two should be in
the opposite order.
> +static char *get_remote_object_url(const char *url, const char *hex,
> int only_two_digit_prefix) {
Linewrapped.
> + struct strbuf buf = STRBUF_INIT;
> +
> + strbuf_addf(&buf, "%sobjects/%.*s/", url, 2, hex);
> + if(!only_two_digit_prefix)
"if (..."
> @@ -304,17 +312,7 @@ static void start_fetch_loose(struct
> transfer_request *request)
>
> git_SHA1_Init(&request->c);
>
> - url = xmalloc(strlen(remote->url) + 50);
> ...
> - strcpy(request->url, url);
> + request->url = get_remote_object_url(remote->url, hex, 0);
> ...
> - curl_easy_setopt(slot->curl, CURLOPT_URL, url);
> + curl_easy_setopt(slot->curl, CURLOPT_URL, request->url);
The original code gave a separate "url" to setop() but this gives the same
string. Does curl_easy_setop() copies the given string away? IOW is this
change safe?
> @@ -550,21 +540,11 @@ static void start_put(struct transfer_request *request)
>
> request->buffer.buf.len = stream.total_out;
>
> - request->url = xmalloc(strlen(remote->url) +
> ...
> - strcpy(posn, request->lock->token);
> + strbuf_addf(&url_buf, "Destination: %s",
> get_remote_object_url(remote->url, hex, 0));
Linewrapped.
The return value from get_remote_object_url() leaks here.
> + request->dest = strbuf_detach(&url_buf, NULL);
> +
> + strbuf_addf(&url_buf, "%s_%s", get_remote_object_url(remote->url,
> hex, 0), request->lock->token);
The return value from get_remote_object_url() leaks here, too.
next prev parent reply other threads:[~2009-01-25 20:36 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-25 6:08 [PATCH] http-push: refactor request url creation Ray Chuan
2009-01-25 20:35 ` Junio C Hamano [this message]
2009-01-26 1:52 ` Ray Chuan
2009-01-26 8:02 ` Daniel Stenberg
2009-01-26 10:41 ` Johannes Schindelin
2009-01-27 4:58 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2009-01-28 22:19 Tay Ray Chuan
2009-01-28 22:51 ` Junio C Hamano
2009-01-28 23:06 ` Johannes Schindelin
2009-01-29 11:49 ` Tay Ray Chuan
2009-01-30 23:51 Tay Ray Chuan
2009-02-01 0:55 ` Junio C Hamano
2009-02-01 22:45 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vpribdszr.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox$(echo .)com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=rctay89@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox