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

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>

diff --git a/Makefile b/Makefile
index d3dcfb18a7a4dffddb8e8cc742b7c151e639549e..90aaa30e7f4cc5c614c4d7d14dbd437412af5a2d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1879,7 +1879,7 @@ builtin/tar-tree.o archive-tar.o: tar.h
 builtin/pack-objects.o: thread-utils.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
 builtin/pack-objects.o: thread-utils.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.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/xinclude.h xdiff/xmacros.h xdiff/xdiff.h xdiff/xtypes.h \
 
 xdiff-interface.o $(XDIFF_OBJS): \
        xdiff/xinclude.h xdiff/xmacros.h xdiff/xdiff.h xdiff/xtypes.h \

diff --git a/http.c b/http.c
index 0a5011f615bdfade0b69682b177dc97471ac20a3..3b3da12e0fb732438fcb7438160e6001afc189fa 100644 (file)
--- a/http.c
+++ b/http.c
@@ -2,6 +2,7 @@
 #include "pack.h"
 #include "sideband.h"
 #include "run-command.h"
 #include "pack.h"
 #include "sideband.h"
 #include "run-command.h"

+#include "url.h"

 
 int data_received;
 int active_requests;
 
 int data_received;
 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)
 {
        struct strbuf buf = STRBUF_INIT;
 static char *quote_ref_url(const char *base, const char *ref)
 {
        struct strbuf buf = STRBUF_INIT;

diff --git a/http.h b/http.h
index 173f74c8298c3fa3989f88b06e2085127fe96db8..5c6e243dde3c654a3c0a705146fb15395c27fb95 100644 (file)
--- a/http.h
+++ b/http.h
@@ -8,6 +8,7 @@
 
 #include "strbuf.h"
 #include "remote.h"
 
 #include "strbuf.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);
 extern char *get_remote_object_url(const char *url, const char *hex,
                                   int only_two_digit_prefix);
                                     int only_two_digit_prefix);
 extern char *get_remote_object_url(const char *url, const char *hex,
                                   int only_two_digit_prefix);

-extern void end_url_with_slash(struct strbuf *buf, const char *url);

 
 /* Options for http_request_*() */
 #define HTTP_NO_CACHE          1
 
 /* Options for http_request_*() */
 #define HTTP_NO_CACHE          1

diff --git a/url.c b/url.c
index cd8f74f00c345294f94cb25e4e00849a0618168b..7cebc6471b1aea9b001cb44e57a5d0c9a4d8757a 100644 (file)
--- a/url.c
+++ b/url.c
@@ -125,3 +125,10 @@ char *url_decode_parameter_value(const char **query)
        struct strbuf out = STRBUF_INIT;
        return url_decode_internal(query, "&", &out, 1);
 }
        struct strbuf out = STRBUF_INIT;
        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, "/");
+}

diff --git a/url.h b/url.h
index 15817f8f9385c217b22706df64117fcc53c8a87f..8cb74d4a0a8b30afcbf03650cd511cad27e8e4d1 100644 (file)
--- a/url.h
+++ b/url.h
@@ -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_value(const char **query);
 
 extern char *url_decode_parameter_name(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 */