Git-aware CGI to provide dumb HTTP transport

spearce · gitster · commit 92815b3363c6 · 2009-11-09T09:30:01.000-08:00
http-backend: Fix symbol clash on AIX 5.3

Mike says:

 &gt; &gt; +static void send_file(const char *the_type, const char *name)
 &gt; &gt; +{
 &gt;
 &gt; I think a symbol clash here is responsible for a build breakage in
 &gt; next on AIX 5.3:
 &gt;
 &gt; CC http-backend.o
 &gt; http-backend.c:213: error: conflicting types for `send_file'
 &gt; /usr/include/sys/socket.h:676: error: previous declaration of `send_file'
 &gt; gmake: *** [http-backend.o] Error 1

So we rename the function send_local_file().

Reported-by: Mike Ralphson &lt;mike.ralphson@gmail.com&gt;
Signed-off-by: Shawn O. Pearce &lt;spearce@spearce.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/http-backend.c b/http-backend.c
@@ -209,7 +209,7 @@ static void send_strbuf(const char *type, struct strbuf *buf)
 	safe_write(1, buf->buf, buf->len);
 }
 
-static void send_file(const char *the_type, const char *name)
+static void send_local_file(const char *the_type, const char *name)
 {
 	const char *p = git_path("%s", name);
 	size_t buf_alloc = 8192;
@@ -247,28 +247,28 @@ static void get_text_file(char *name)
 {
 	select_getanyfile();
 	hdr_nocache();
-	send_file("text/plain", name);
+	send_local_file("text/plain", name);
 }
 
 static void get_loose_object(char *name)
 {
 	select_getanyfile();
 	hdr_cache_forever();
-	send_file("application/x-git-loose-object", name);
+	send_local_file("application/x-git-loose-object", name);
 }
 
 static void get_pack_file(char *name)
 {
 	select_getanyfile();
 	hdr_cache_forever();
-	send_file("application/x-git-packed-objects", name);
+	send_local_file("application/x-git-packed-objects", name);
 }
 
 static void get_idx_file(char *name)
 {
 	select_getanyfile();
 	hdr_cache_forever();
-	send_file("application/x-git-packed-objects-toc", name);
+	send_local_file("application/x-git-packed-objects-toc", name);
 }
 
 static int http_config(const char *var, const char *value, void *cb)

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ static void send_strbuf(const char type, struct strbuf buf)`
`209`	`209`	`safe_write(1, buf->buf, buf->len);`
`210`	`210`	`}`
`211`	`211`
`212`		`-static void send_file(const char the_type, const char name)`
	`212`	`+static void send_local_file(const char the_type, const char name)`
`213`	`213`	`{`
`214`	`214`	`const char *p = git_path("%s", name);`
`215`	`215`	`size_t buf_alloc = 8192;`
`@@ -247,28 +247,28 @@ static void get_text_file(char *name)`
`247`	`247`	`{`
`248`	`248`	`select_getanyfile();`
`249`	`249`	`hdr_nocache();`
`250`		`- send_file("text/plain", name);`
	`250`	`+ send_local_file("text/plain", name);`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`static void get_loose_object(char *name)`
`254`	`254`	`{`
`255`	`255`	`select_getanyfile();`
`256`	`256`	`hdr_cache_forever();`
`257`		`- send_file("application/x-git-loose-object", name);`
	`257`	`+ send_local_file("application/x-git-loose-object", name);`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`static void get_pack_file(char *name)`
`261`	`261`	`{`
`262`	`262`	`select_getanyfile();`
`263`	`263`	`hdr_cache_forever();`
`264`		`- send_file("application/x-git-packed-objects", name);`
	`264`	`+ send_local_file("application/x-git-packed-objects", name);`
`265`	`265`	`}`
`266`	`266`
`267`	`267`	`static void get_idx_file(char *name)`
`268`	`268`	`{`
`269`	`269`	`select_getanyfile();`
`270`	`270`	`hdr_cache_forever();`
`271`		`- send_file("application/x-git-packed-objects-toc", name);`
	`271`	`+ send_local_file("application/x-git-packed-objects-toc", name);`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`static int http_config(const char var, const char value, void *cb)`