security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

* ksutil.h, ksutil.c: #ifdef so we can build without libcurl or

Browse Source 
fake-curl.
This commit is contained in:
David Shaw 2005-05-04 13:34:25 +00:00
parent 049195f9e0
commit d9d902dffb
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
keyserver/ChangeLog
View File

@ -1,3 +1,8 @@
2005-05-04 David Shaw <dshaw@jabberwocky.com>
* ksutil.h, ksutil.c: #ifdef so we can build without libcurl or
fake-curl.
2005-05-03 David Shaw <dshaw@jabberwocky.com>
* gpgkeys_http.c: Need GET defined.

9
keyserver/ksutil.c
View File

@ -24,10 +24,13 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#ifdef HAVE_LIBCURL
#include <curl/curl.h>
#else
#ifdef FAKE_CURL
#include "curl-shim.h"
#else
#include <curl/curl.h>
#endif
#endif
#include "keyserver.h"
#include "ksutil.h"
@ -318,6 +321,7 @@ print_nocr(FILE *stream,const char *str)
}
}
#if defined (HAVE_LIBCURL) || defined (FAKE_CURL)
int
curl_err_to_gpg_err(CURLcode error)
{
@ -383,3 +387,4 @@ curl_writer(const void *ptr,size_t size,size_t nmemb,void *cw_ctx)
return size*nmemb;
}
#endif

9
keyserver/ksutil.h
View File

@ -21,10 +21,12 @@
#ifndef _KSUTIL_H_
#define _KSUTIL_H_
#ifdef HAVE_LIBCURL
#include <curl/curl.h>
#else
#ifdef FAKE_CURL
#include "curl-shim.h"
#else
#include <curl/curl.h>
#endif
#endif
/* MAX_LINE must be at least 1 larger than the largest item we expect
@ -98,6 +100,8 @@ void free_ks_options(struct ks_options *opt);
int parse_ks_options(char *line,struct ks_options *opt);
const char *ks_action_to_string(enum ks_action action);
void print_nocr(FILE *stream,const char *str);
#if defined (HAVE_LIBCURL) || defined (FAKE_CURL)
int curl_err_to_gpg_err(CURLcode error);
struct curl_writer_ctx
@ -108,5 +112,6 @@ struct curl_writer_ctx
};
size_t curl_writer(const void *ptr,size_t size,size_t nmemb,void *cw_ctx);
#endif
#endif /* !_KSUTIL_H_ */