summaryrefslogtreecommitdiff
path: root/http.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-20 14:37:25 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-20 14:37:25 -0800
commit56eb8b43ebdb38683ff5ce395d7b5e080d402b5b (patch)
tree759ed075b90f29999e504654e3d92a470e9ab3c0 /http.c
parentc216830f3828ae54c956a06fa6e4fdf212eecec1 (diff)
parent23418ea95f83177df19bfe18af33650b87ec2a8a (diff)
downloadgit-56eb8b43ebdb38683ff5ce395d7b5e080d402b5b.tar.gz
Merge branch 'jc/symbol-static'
* jc/symbol-static: date.c: mark file-local function static Replace parse_blob() with an explanatory comment symlinks.c: remove unused functions object.c: remove unused functions strbuf.c: remove unused function sha1_file.c: remove unused function mailmap.c: remove unused function utf8.c: mark file-local function static submodule.c: mark file-local function static quote.c: mark file-local function static remote-curl.c: mark file-local function static read-cache.c: mark file-local functions static parse-options.c: mark file-local function static entry.c: mark file-local function static http.c: mark file-local functions static pretty.c: mark file-local function static builtin-rev-list.c: mark file-local function static bisect.c: mark file-local function static
Diffstat (limited to 'http.c')
-rw-r--r--http.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/http.c b/http.c
index 5c3efb96d9..deab59551d 100644
--- a/http.c
+++ b/http.c
@@ -651,7 +651,7 @@ static void closedown_active_slot(struct active_request_slot *slot)
slot->in_use = 0;
}
-void release_active_slot(struct active_request_slot *slot)
+static void release_active_slot(struct active_request_slot *slot)
{
closedown_active_slot(slot);
if (slot->curl && curl_session_count > min_curl_sessions) {
@@ -834,7 +834,13 @@ int http_get_strbuf(const char *url, struct strbuf *result, int options)
return http_request(url, result, HTTP_REQUEST_STRBUF, options);
}
-int http_get_file(const char *url, const char *filename, int options)
+/*
+ * Downloads an url and stores the result in the given file.
+ *
+ * If a previous interrupted download is detected (i.e. a previous temporary
+ * file is still around) the download is resumed.
+ */
+static int http_get_file(const char *url, const char *filename, int options)
{
int ret;
struct strbuf tmpfile = STRBUF_INIT;