From: Tay Ray Chuan <rctay89@gmail.com>
To: "Git Mailing List" <git@vger.kernel.org>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Jonathan Nieder" <jrnieder@gmail.com>,
Gabriel Corona <gabriel.corona@enst-bretagne.fr>
Subject: [PATCH 1/6] shift end_url_with_slash() from http.[ch] to url.[ch]
Date: Fri, 19 Nov 2010 20:46:25 +0800 [thread overview]
Message-ID: <1290170790-2200-2-git-send-email-rctay89@gmail.com> (raw)
In-Reply-To: <1290170790-2200-1-git-send-email-rctay89@gmail.com>
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>
---
Makefile | 2 +-
http.c | 8 +-------
http.h | 1 -
url.c | 7 +++++++
url.h | 2 ++
5 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index ca1d1fe..e02b0f4 100644
--- a/Makefile
+++ b/Makefile
@@ -1922,7 +1922,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
-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 \
diff --git a/http.c b/http.c
index 17bcf19..310dd86 100644
--- a/http.c
+++ b/http.c
@@ -2,6 +2,7 @@
#include "pack.h"
#include "sideband.h"
#include "run-command.h"
+#include "url.h"
int data_received;
int active_requests;
@@ -733,13 +734,6 @@ static inline int hex(int v)
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;
diff --git a/http.h b/http.h
index 173f74c..10de0a5 100644
--- a/http.h
+++ b/http.h
@@ -117,7 +117,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);
-extern void end_url_with_slash(struct strbuf *buf, const char *url);
/* Options for http_request_*() */
#define HTTP_NO_CACHE 1
diff --git a/url.c b/url.c
index cd8f74f..7cebc64 100644
--- 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);
}
+
+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 15817f8..8cb74d4 100644
--- 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 void end_url_with_slash(struct strbuf *buf, const char *url);
+
#endif /* URL_H */
--
1.7.3.67.g2a10b
next prev parent reply other threads:[~2010-11-19 12:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-19 0:06 [PATCH] Normalise directory names when pushing to some WebDAV servers Gabriel Corona
2010-11-19 4:02 ` Tay Ray Chuan
2010-11-19 5:10 ` Jonathan Nieder
2010-11-19 12:46 ` [PATCH 0/6] http (dumb): end urls with slash Tay Ray Chuan
2010-11-19 12:46 ` Tay Ray Chuan [this message]
2010-11-19 12:46 ` [PATCH 2/6] url: add str wrapper for end_url_with_slash() Tay Ray Chuan
2010-11-19 12:46 ` [PATCH 3/6] http-push: Normalise directory names when pushing to some WebDAV servers Tay Ray Chuan
2010-11-19 12:46 ` [PATCH 4/6] http-backend: use end_url_with_slash() Tay Ray Chuan
2010-11-19 12:46 ` [PATCH 5/6] http-push: check path length before using it Tay Ray Chuan
2010-11-19 12:46 ` [PATCH 6/6] http-push: add trailing slash at arg-parse time, instead of later on Tay Ray Chuan
2010-11-19 18:33 ` [PATCH 5/6] http-push: check path length before using it Jonathan Nieder
2010-11-20 4:28 ` Tay Ray Chuan
2010-11-19 19:18 ` [PATCH 0/6] http (dumb): end urls with slash Jonathan Nieder
2010-11-19 22:54 ` Junio C Hamano
2010-11-20 4:32 ` Tay Ray Chuan
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=1290170790-2200-2-git-send-email-rctay89@gmail.com \
--to=rctay89@gmail.com \
--cc=gabriel.corona@enst-bretagne.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).