[svn] GnuPG - r4947 - branches/STABLE-BRANCH-1-4/util

[svn author dshaw]

Author: dshaw
Date: 2009-03-13 18:27:35 +0100 (Fri, 13 Mar 2009)
New Revision: 4947

Modified:
   branches/STABLE-BRANCH-1-4/util/ChangeLog
   branches/STABLE-BRANCH-1-4/util/Makefile.am
   branches/STABLE-BRANCH-1-4/util/http.c
Log:
* Makefile.am, http.c (start_server): Minor tweaks to get http-test
compiling again.


Modified: branches/STABLE-BRANCH-1-4/util/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/util/ChangeLog	2009-03-10 16:10:35 UTC (rev 4946)
+++ branches/STABLE-BRANCH-1-4/util/ChangeLog	2009-03-13 17:27:35 UTC (rev 4947)
@@ -1,3 +1,8 @@
+2009-03-13  David Shaw  <dshaw at jabberwocky.com>
+
+	* Makefile.am, http.c (start_server): Minor tweaks to get
+	http-test compiling again.
+
 2008-09-05  David Shaw  <dshaw at jabberwocky.com>
 
 	* Makefile.am: Use $(CC) instead of "cc" to compile, as the user

Modified: branches/STABLE-BRANCH-1-4/util/Makefile.am
===================================================================
--- branches/STABLE-BRANCH-1-4/util/Makefile.am	2009-03-10 16:10:35 UTC (rev 4946)
+++ branches/STABLE-BRANCH-1-4/util/Makefile.am	2009-03-13 17:27:35 UTC (rev 4947)
@@ -1,4 +1,5 @@
-# Copyright (C) 1998, 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2000, 2001, 2005, 2006, 2008
+#               2009 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
 #
@@ -64,17 +65,17 @@
 libcompat_a_LIBADD = @LIBOBJS@
 
 http-test:  http.c
-	$(CC) -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) $(LDFLAGS) -g -Wall \
+	$(CC) -DHAVE_CONFIG_H $(CFLAGS) -I. $(INCLUDES) $(LDFLAGS) -g -Wall \
 	    -DTEST -o http-test http.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@
 
 srv-test:  srv.c
-	$(CC) -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) $(LDFLAGS) -g -Wall \
+	$(CC) -DHAVE_CONFIG_H $(CFLAGS) -I. $(INCLUDES) $(LDFLAGS) -g -Wall \
 	    -DTEST -o srv-test srv.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@
 
 pka-test:  pka.c
-	$(CC) -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) $(LDFLAGS) -g -Wall \
+	$(CC) -DHAVE_CONFIG_H $(CFLAGS) -I. $(INCLUDES) $(LDFLAGS) -g -Wall \
 	   -DTEST -o pka-test pka.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@
 
 cert-test:  cert.c
-	$(CC) -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) $(LDFLAGS) -g -Wall \
+	$(CC) -DHAVE_CONFIG_H $(CFLAGS) -I. $(INCLUDES) $(LDFLAGS) -g -Wall \
 	   -DTEST -o cert-test cert.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@

Modified: branches/STABLE-BRANCH-1-4/util/http.c
===================================================================
--- branches/STABLE-BRANCH-1-4/util/http.c	2009-03-10 16:10:35 UTC (rev 4946)
+++ branches/STABLE-BRANCH-1-4/util/http.c	2009-03-13 17:27:35 UTC (rev 4947)
@@ -1,6 +1,6 @@
 /* http.c  -  HTTP protocol handler
  * Copyright (C) 1999, 2001, 2002, 2003, 2004,
- *               2005 Free Software Foundation, Inc.
+ *               2005, 2009 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -713,7 +713,7 @@
 
 #ifdef TEST
 static int
-start_server()
+start_server(void)
 {
     struct sockaddr_in mya;
     struct sockaddr_in peer;
@@ -1062,7 +1062,7 @@
     }
     release_parsed_uri( uri ); uri = NULL;
 
-    rc = http_open_document( &hd, *argv, 0, NULL );
+    rc = http_open_document( &hd, *argv, NULL, 0, NULL );
     if( rc ) {
 	log_error("can't get `%s': %s\n", *argv, g10_errstr(rc));
 	return 1;