* curl-shim.h, curl-shim.c, gpgkeys_hkp.c: Rename curl_escape() to

curl_easy_escape() to match cURL.

4 files changed, 12 insertions, 7 deletions

diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index c84e8b0ce..7d2cb6ce7 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-16  David Shaw  <[email protected]>
+
+	* curl-shim.h, curl-shim.c, gpgkeys_hkp.c: Rename curl_escape() to
+	curl_easy_escape() to match cURL.
+
 2007-01-15  David Shaw  <[email protected]>
 
 	* gpgkeys_hkp.c (send_key): Allow GPG to send any armored key line
diff --git a/keyserver/curl-shim.c b/keyserver/curl-shim.c
index f4fdc0c60..3d9d109ba 100644
--- a/keyserver/curl-shim.c
+++ b/keyserver/curl-shim.c
@@ -1,7 +1,7 @@
 /* curl-shim.c - Implement a small subset of the curl API in terms of
  * the iobuf HTTP API
  *
- * Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+ * Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -265,7 +265,7 @@ curl_easy_perform(CURL *curl)
                         "0123456789"
 
 char *
-curl_escape(char *str,int length)
+curl_easy_escape(CURL *curl,char *str,int length)
 {
   int len,max,idx,enc_idx=0;
   char *enc;
diff --git a/keyserver/curl-shim.h b/keyserver/curl-shim.h
index 91eac9d1e..66e6ed8d6 100644
--- a/keyserver/curl-shim.h
+++ b/keyserver/curl-shim.h
@@ -1,5 +1,5 @@
 /* curl-shim.h
- * Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+ * Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
  *
  * This file is part of GNUPG.
  *
@@ -85,7 +85,7 @@ CURL *curl_easy_init(void);
 CURLcode curl_easy_setopt(CURL *curl,CURLoption option,...);
 CURLcode curl_easy_perform(CURL *curl);
 void curl_easy_cleanup(CURL *curl);
-char *curl_escape(char *str,int len);
+char *curl_easy_escape(CURL *curl,char *str,int len);
 void curl_free(char *ptr);
 #define curl_version() "GnuPG curl-shim "VERSION
 
diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c
index 5e12a71dc..4328a2f53 100644
--- a/keyserver/gpgkeys_hkp.c
+++ b/keyserver/gpgkeys_hkp.c
@@ -166,7 +166,7 @@ send_key(int *eof)
       goto fail;
     }
 
-  encoded_key=curl_escape(key,keysize);
+  encoded_key=curl_easy_escape(curl,key,keysize);
   if(!encoded_key)
     {
       fprintf(console,"gpgkeys: out of memory\n");
@@ -317,7 +317,7 @@ get_name(const char *getkey)
 
   memset(&ctx,0,sizeof(ctx));
 
-  searchkey_encoded=curl_escape((char *)getkey,0);
+  searchkey_encoded=curl_easy_escape(curl,(char *)getkey,0);
   if(!searchkey_encoded)
     {
       fprintf(console,"gpgkeys: out of memory\n");
@@ -403,7 +403,7 @@ search_key(const char *searchkey)
     fprintf(console,"gpgkeys: search type is %d, and key is \"%s\"\n",
 	    search_type,searchkey);
 
-  searchkey_encoded=curl_escape((char *)searchkey,0);
+  searchkey_encoded=curl_easy_escape(curl,(char *)searchkey,0);
   if(!searchkey_encoded)
     {
       fprintf(console,"gpgkeys: out of memory\n");