mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* 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/.
This commit is contained in:
parent
79161ef7b9
commit
02a85a958c
4 changed files with 29 additions and 11 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue