[svn] GnuPG - r4878 - branches/STABLE-BRANCH-1-4/keyserver

[svn author dshaw]

Author: dshaw
Date: 2008-11-18 19:43:13 +0100 (Tue, 18 Nov 2008)
New Revision: 4878

Modified:
   branches/STABLE-BRANCH-1-4/keyserver/ChangeLog
   branches/STABLE-BRANCH-1-4/keyserver/curl-shim.h
   branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_curl.c
   branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_hkp.c
Log:
* curl-shim.h, gpgkeys_curl.c, gpgkeys_hkp.c (main): Always show curl
version (even for curl-shim).


Modified: branches/STABLE-BRANCH-1-4/keyserver/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/keyserver/ChangeLog	2008-11-18 18:17:10 UTC (rev 4877)
+++ branches/STABLE-BRANCH-1-4/keyserver/ChangeLog	2008-11-18 18:43:13 UTC (rev 4878)
@@ -1,3 +1,8 @@
+2008-11-18  David Shaw  <dshaw at jabberwocky.com>
+
+	* curl-shim.h, gpgkeys_curl.c, gpgkeys_hkp.c (main): Always show
+	curl version (even for curl-shim).
+
 2008-11-18  Werner Koch  <wk at g10code.com>
 
 	* gpgkeys_curl.c (main): Print curl version according to GNU standards.

Modified: branches/STABLE-BRANCH-1-4/keyserver/curl-shim.h
===================================================================
--- branches/STABLE-BRANCH-1-4/keyserver/curl-shim.h	2008-11-18 18:17:10 UTC (rev 4877)
+++ branches/STABLE-BRANCH-1-4/keyserver/curl-shim.h	2008-11-18 18:43:13 UTC (rev 4878)
@@ -1,5 +1,5 @@
 /* curl-shim.h
- * Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+ * Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
  *
  * This file is part of GNUPG.
  *
@@ -83,8 +83,6 @@
 #define CURL_GLOBAL_DEFAULT 0
 #define CURLVERSION_NOW 0
 
-#define curl_is_gnupg_curl_shim 1
-
 CURLcode curl_global_init(long flags);
 void curl_global_cleanup(void);
 CURL *curl_easy_init(void);

Modified: branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_curl.c
===================================================================
--- branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_curl.c	2008-11-18 18:17:10 UTC (rev 4877)
+++ branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_curl.c	2008-11-18 18:43:13 UTC (rev 4878)
@@ -125,9 +125,7 @@
   if (argc > 1 && !strcmp (argv[1], "--version"))
     {
       printf ("gpgkeys_curl (GnuPG) %s\n", VERSION);
-#ifndef curl_is_gnupg_curl_shim
-      printf ("libcurl %s\n", curl_version());
-#endif /*curl_is_gnupg_curl_shim*/
+      printf ("Uses: %s\n", curl_version());
       return 0;
     }
   else if (argc > 1 && !strcmp (argv[1], "--help"))

Modified: branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_hkp.c
===================================================================
--- branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_hkp.c	2008-11-18 18:17:10 UTC (rev 4877)
+++ branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_hkp.c	2008-11-18 18:43:13 UTC (rev 4878)
@@ -518,9 +518,7 @@
   if (argc > 1 && !strcmp (argv[1], "--version"))
     {
       printf ("gpgkeys_hkp (GnuPG) %s\n", VERSION);
-#ifndef curl_is_gnupg_curl_shim
-      printf ("libcurl %s\n", curl_version());
-#endif /*curl_is_gnupg_curl_shim*/
+      printf ("Uses: %s\n", curl_version());
       return 0;
     }
   else if (argc > 1 && !strcmp (argv[1], "--help"))