undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shift end_url_with_slash() from http.[ch] to url.[ch]

Browse Source 
This allows non-http/curl users to access it too (eg. http-backend.c).

Update include headers in end_url_with_slash() users too.

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Tay Ray Chuan 2010-11-25 16:21:04 +08:00 committed by Junio C Hamano
parent 6cfc028641
commit 1966d9f37b
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1879,7 +1879,7 @@ builtin/tar-tree.o archive-tar.o: tar.h
builtin/pack-objects.o: thread-utils.h builtin/pack-objects.o: thread-utils.h
connect.o transport.o http-backend.o: url.h connect.o transport.o http-backend.o: url.h
http-fetch.o http-walker.o remote-curl.o transport.o walker.o: walker.h http-fetch.o http-walker.o remote-curl.o transport.o walker.o: walker.h
http.o http-walker.o http-push.o http-fetch.o remote-curl.o: http.h http.o http-walker.o http-push.o http-fetch.o remote-curl.o: http.h url.h
xdiff-interface.o $(XDIFF_OBJS): \ xdiff-interface.o $(XDIFF_OBJS): \
xdiff/xinclude.h xdiff/xmacros.h xdiff/xdiff.h xdiff/xtypes.h \ xdiff/xinclude.h xdiff/xmacros.h xdiff/xdiff.h xdiff/xtypes.h \

8
http.c
View File

@ -2,6 +2,7 @@
#include "pack.h" #include "pack.h"
#include "sideband.h" #include "sideband.h"
#include "run-command.h" #include "run-command.h"
#include "url.h"
int data_received; int data_received;
int active_requests; int active_requests;
@ -728,13 +729,6 @@ static inline int hex(int v)
return 'A' + v - 10; return 'A' + v - 10;
} }
void end_url_with_slash(struct strbuf *buf, const char *url)
{
strbuf_addstr(buf, url);
if (buf->len && buf->buf[buf->len - 1] != '/')
strbuf_addstr(buf, "/");
}
static char *quote_ref_url(const char *base, const char *ref) static char *quote_ref_url(const char *base, const char *ref)
{ {
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;

2
http.h
View File

@ -8,6 +8,7 @@
#include "strbuf.h" #include "strbuf.h"
#include "remote.h" #include "remote.h"
#include "url.h"
/* /*
* We detect based on the cURL version if multi-transfer is * We detect based on the cURL version if multi-transfer is
@ -117,7 +118,6 @@ extern void append_remote_object_url(struct strbuf *buf, const char *url,
int only_two_digit_prefix); int only_two_digit_prefix);
extern char *get_remote_object_url(const char *url, const char *hex, extern char *get_remote_object_url(const char *url, const char *hex,
int only_two_digit_prefix); int only_two_digit_prefix);
extern void end_url_with_slash(struct strbuf *buf, const char *url);
/* Options for http_request_*() */ /* Options for http_request_*() */
#define HTTP_NO_CACHE 1 #define HTTP_NO_CACHE 1

7
url.c
View File

@ -125,3 +125,10 @@ char *url_decode_parameter_value(const char **query)
struct strbuf out = STRBUF_INIT; struct strbuf out = STRBUF_INIT;
return url_decode_internal(query, "&", &out, 1); return url_decode_internal(query, "&", &out, 1);
} }
void end_url_with_slash(struct strbuf *buf, const char *url)
{
strbuf_addstr(buf, url);
if (buf->len && buf->buf[buf->len - 1] != '/')
strbuf_addstr(buf, "/");
}

2
url.h
View File

@ -7,4 +7,6 @@ extern char *url_decode(const char *url);
extern char *url_decode_parameter_name(const char **query); extern char *url_decode_parameter_name(const char **query);
extern char *url_decode_parameter_value(const char **query); extern char *url_decode_parameter_value(const char **query);
extern void end_url_with_slash(struct strbuf *buf, const char *url);
#endif /* URL_H */ #endif /* URL_H */