[svn] GnuPG - r3922 - in trunk: . keyserver util

[svn author dshaw]

Author: dshaw
Date: 2005-11-03 05:46:20 +0100 (Thu, 03 Nov 2005)
New Revision: 3922

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/keyserver/ChangeLog
   trunk/keyserver/gpgkeys_hkp.c
   trunk/util/ChangeLog
   trunk/util/secmem.c
Log:
Fix various build warnings reported by Joe Vender on MinGW.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2005-11-02 16:53:40 UTC (rev 3921)
+++ trunk/ChangeLog	2005-11-03 04:46:20 UTC (rev 3922)
@@ -1,3 +1,7 @@
+2005-11-02  David Shaw  <dshaw at jabberwocky.com>
+
+	* configure.ac: Check for a getpagesize() declaration.
+
 2005-10-14  David Shaw  <dshaw at jabberwocky.com>
 
 	* NEWS: Clarify the cURL keyserver changes, and add a note about

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2005-11-02 16:53:40 UTC (rev 3921)
+++ trunk/configure.ac	2005-11-03 04:46:20 UTC (rev 3922)
@@ -813,6 +813,7 @@
 fi
 
 dnl Checks for library functions.
+AC_CHECK_DECLS(getpagesize)
 AC_FUNC_FSEEKO
 AC_FUNC_VPRINTF
 AC_FUNC_FORK

Modified: trunk/keyserver/ChangeLog
===================================================================
--- trunk/keyserver/ChangeLog	2005-11-02 16:53:40 UTC (rev 3921)
+++ trunk/keyserver/ChangeLog	2005-11-03 04:46:20 UTC (rev 3922)
@@ -1,3 +1,8 @@
+2005-11-02  David Shaw  <dshaw at jabberwocky.com>
+
+	* gpgkeys_hkp.c (search_key): Fix warning with typecast (though
+	curl should really have defined that char * as const).
+
 2005-08-25  David Shaw  <dshaw at jabberwocky.com>
 
 	* ksutil.h, ksutil.c (parse_ks_options): Remove exact-name and

Modified: trunk/keyserver/gpgkeys_hkp.c
===================================================================
--- trunk/keyserver/gpgkeys_hkp.c	2005-11-02 16:53:40 UTC (rev 3921)
+++ trunk/keyserver/gpgkeys_hkp.c	2005-11-03 04:46:20 UTC (rev 3922)
@@ -298,7 +298,7 @@
     fprintf(console,"gpgkeys: search type is %d, and key is \"%s\"\n",
 	    search_type,searchkey);
 
-  searchkey_encoded=curl_escape(searchkey,0);
+  searchkey_encoded=curl_escape((char *)searchkey,0);
   if(!searchkey_encoded)
     {
       fprintf(console,"gpgkeys: out of memory\n");

Modified: trunk/util/ChangeLog
===================================================================
--- trunk/util/ChangeLog	2005-11-02 16:53:40 UTC (rev 3921)
+++ trunk/util/ChangeLog	2005-11-03 04:46:20 UTC (rev 3922)
@@ -1,3 +1,8 @@
+2005-11-02  David Shaw  <dshaw at jabberwocky.com>
+
+	* util.c [!HAVE_DECL_GETPAGESIZE]: Prototype getpagesize() if
+	unistd.h doesn't have it (for MinGW).
+
 2005-09-22  Werner Koch  <wk at g10code.com>
 
 	* iobuf.c (iobuf_get_filelength): New arg OVERFLOW.

Modified: trunk/util/secmem.c
===================================================================
--- trunk/util/secmem.c	2005-11-02 16:53:40 UTC (rev 3921)
+++ trunk/util/secmem.c	2005-11-03 04:46:20 UTC (rev 3922)
@@ -43,6 +43,12 @@
 #include "util.h"
 #include "i18n.h"
 
+/* MinGW doesn't seem to prototype getpagesize, though it does have
+   it. */
+#if !HAVE_DECL_GETPAGESIZE
+int getpagesize(void);
+#endif
+
 #if defined(MAP_ANON) && !defined(MAP_ANONYMOUS)
 #define MAP_ANONYMOUS MAP_ANON
 #endif