diff options
| author | Werner Koch <[email protected]> | 2005-01-18 11:16:10 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2005-01-18 11:16:10 +0000 |
| commit | 02a85a958c11475d86614dfa9fb305b75a029910 (patch) | |
| tree | 88e7c39e98f9bbf4873b622d1d58b9dd581fc24a /keyserver/gpgkeys_curl.c | |
| parent | (public_key_list): Do a trustdb staleness check before (diff) | |
| download | gnupg-02a85a958c11475d86614dfa9fb305b75a029910.tar.gz gnupg-02a85a958c11475d86614dfa9fb305b75a029910.zip | |
* gpgkeys_curl.c: s/MAX_PATH/URLMAX_PATH/g to avoid a clash with
the W32 defined macro. Removed unneeded initialization of static
variables.
* gpgkeys_http.c: Ditto.
* ksutil.h: s/MAX_PATH/URLMAX_PATH/.
Diffstat (limited to 'keyserver/gpgkeys_curl.c')
| -rw-r--r-- | keyserver/gpgkeys_curl.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/keyserver/gpgkeys_curl.c b/keyserver/gpgkeys_curl.c index c553d79a2..fef43333f 100644 --- a/keyserver/gpgkeys_curl.c +++ b/keyserver/gpgkeys_curl.c @@ -35,10 +35,15 @@ extern char *optarg; extern int optind; static int verbose=0; -static char scheme[MAX_SCHEME+1],auth[MAX_AUTH+1],host[MAX_HOST+1]={'\0'},port[MAX_PORT+1]={'\0'},path[MAX_PATH+1]={'\0'},proxy[MAX_PROXY+1]={'\0'}; -static FILE *input=NULL,*output=NULL,*console=NULL; +static char scheme[MAX_SCHEME+1]; +static char auth[MAX_AUTH+1]; +static char host[MAX_HOST+1]; +static char port[MAX_PORT+1]; +static char path[URLMAX_PATH+1]; +static char proxy[MAX_PROXY+1; +static FILE *input, *output, *console; static CURL *curl; -static char request[MAX_URL]={'\0'}; +static char request[MAX_URL]; static int curl_err_to_gpg_err(CURLcode error) @@ -217,9 +222,9 @@ main(int argc,char *argv[]) continue; } - if(sscanf(line,"PATH %" MKSTRING(MAX_PATH) "s\n",path)==1) + if(sscanf(line,"PATH %" MKSTRING(URLMAX_PATH) "s\n",path)==1) { - path[MAX_PATH]='\0'; + path[URLMAX_PATH]='\0'; continue; } |