[svn] GnuPG - r4013 - trunk/keyserver

[svn author dshaw]

Author: dshaw
Date: 2006-02-22 03:11:35 +0100 (Wed, 22 Feb 2006)
New Revision: 4013

Modified:
   trunk/keyserver/ChangeLog
   trunk/keyserver/curl-shim.c
   trunk/keyserver/curl-shim.h
Log:
* curl-shim.h, curl-shim.c (curl_easy_init, curl_easy_setopt,
curl_easy_perform): Mingw has 'stderr' as a macro?


Modified: trunk/keyserver/ChangeLog
===================================================================
--- trunk/keyserver/ChangeLog	2006-02-21 22:23:35 UTC (rev 4012)
+++ trunk/keyserver/ChangeLog	2006-02-22 02:11:35 UTC (rev 4013)
@@ -1,6 +1,9 @@
 2006-02-21  David Shaw  <dshaw at jabberwocky.com>
 
 	* curl-shim.h, curl-shim.c (curl_easy_init, curl_easy_setopt,
+	curl_easy_perform): Mingw has 'stderr' as a macro?
+
+	* curl-shim.h, curl-shim.c (curl_easy_init, curl_easy_setopt,
 	curl_easy_perform): Add CURLOPT_VERBOSE and CURLOPT_STDERR for
 	easier debugging.
 

Modified: trunk/keyserver/curl-shim.c
===================================================================
--- trunk/keyserver/curl-shim.c	2006-02-21 22:23:35 UTC (rev 4012)
+++ trunk/keyserver/curl-shim.c	2006-02-22 02:11:35 UTC (rev 4013)
@@ -92,7 +92,7 @@
 
   handle=calloc(1,sizeof(CURL));
   if(handle)
-    handle->stderr=stderr;
+    handle->errors=stderr;
 
   return handle;
 }
@@ -143,7 +143,7 @@
       curl->flags.verbose=va_arg(ap,unsigned int);
       break;
     case CURLOPT_STDERR:
-      curl->stderr=va_arg(ap,FILE *);
+      curl->errors=va_arg(ap,FILE *);
       break;
     default:
       /* We ignore the huge majority of curl options */
@@ -175,7 +175,7 @@
     proxy=getenv(HTTP_PROXY_ENV);
 
   if(curl->flags.verbose)
-    fprintf(curl->stderr,"* HTTP proxy is \"%s\"\n",proxy?proxy:"null");
+    fprintf(curl->errors,"* HTTP proxy is \"%s\"\n",proxy?proxy:"null");
 
   if(curl->flags.post)
     {

Modified: trunk/keyserver/curl-shim.h
===================================================================
--- trunk/keyserver/curl-shim.h	2006-02-21 22:23:35 UTC (rev 4012)
+++ trunk/keyserver/curl-shim.h	2006-02-22 02:11:35 UTC (rev 4013)
@@ -66,7 +66,7 @@
   void *file;
   char *postfields;
   unsigned int status;
-  FILE *stderr;
+  FILE *errors;
   struct
   {
     unsigned int post:1;