diff options
| -rw-r--r-- | g10/card-util.c | 2 | ||||
| -rw-r--r-- | g10/getkey.c | 2 | ||||
| -rw-r--r-- | g10/gpg.c | 6 | ||||
| -rw-r--r-- | g10/keyedit.c | 2 | ||||
| -rw-r--r-- | g10/keygen.c | 2 | ||||
| -rw-r--r-- | g10/keyserver-internal.h | 6 | ||||
| -rw-r--r-- | g10/keyserver.c | 9 | ||||
| -rw-r--r-- | g10/mainproc.c | 2 |
8 files changed, 13 insertions, 18 deletions
diff --git a/g10/card-util.c b/g10/card-util.c index b030fadb3..4b584bfed 100644 --- a/g10/card-util.c +++ b/g10/card-util.c @@ -754,7 +754,7 @@ fetch_url (ctrl_t ctrl) gpg_strerror(rc)); else if (info.pubkey_url && *info.pubkey_url) { - spec=parse_keyserver_uri(info.pubkey_url,1,NULL,0); + spec = parse_keyserver_uri (info.pubkey_url, 1); if(spec && info.fpr1valid) { /* This is not perfectly right. Currently, all card diff --git a/g10/getkey.c b/g10/getkey.c index 4a4dd551d..f8cb869a7 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -2938,7 +2938,7 @@ parse_auto_key_locate (char *options) else if (ascii_strcasecmp (tok, "pka") == 0) akl->type = AKL_PKA; #endif - else if ((akl->spec = parse_keyserver_uri (tok, 1, NULL, 0))) + else if ((akl->spec = parse_keyserver_uri (tok, 1))) akl->type = AKL_SPEC; else { @@ -2800,8 +2800,7 @@ main (int argc, char **argv) case oKeyServer: { keyserver_spec_t keyserver; - keyserver = parse_keyserver_uri (pargs.r.ret_str,0, - configname,configlineno); + keyserver = parse_keyserver_uri (pargs.r.ret_str, 0); if (!keyserver) log_error (_("could not parse keyserver URL\n")); else @@ -2990,8 +2989,7 @@ main (int argc, char **argv) case oDefaultKeyserverURL: { keyserver_spec_t keyserver; - keyserver = parse_keyserver_uri (pargs.r.ret_str,1, - configname,configlineno); + keyserver = parse_keyserver_uri (pargs.r.ret_str,1 ); if (!keyserver) log_error (_("could not parse keyserver URL\n")); else diff --git a/g10/keyedit.c b/g10/keyedit.c index a8e6f5d18..e2da61bdb 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -4165,7 +4165,7 @@ menu_set_keyserver_url (const char *url, KBNODE pub_keyblock) { struct keyserver_spec *keyserver = NULL; /* Sanity check the format */ - keyserver = parse_keyserver_uri (answer, 1, NULL, 0); + keyserver = parse_keyserver_uri (answer, 1); xfree (answer); if (!keyserver) { diff --git a/g10/keygen.c b/g10/keygen.c index c25caadf2..fa466a8b8 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -3106,7 +3106,7 @@ proc_parameter_file( struct para_data_s *para, const char *fname, { struct keyserver_spec *spec; - spec=parse_keyserver_uri(s1,1,NULL,0); + spec = parse_keyserver_uri (s1, 1); if(spec) { free_keyserver_spec(spec); diff --git a/g10/keyserver-internal.h b/g10/keyserver-internal.h index 2b1b64e35..a955fc7da 100644 --- a/g10/keyserver-internal.h +++ b/g10/keyserver-internal.h @@ -28,10 +28,8 @@ int parse_keyserver_options(char *options); void free_keyserver_spec(struct keyserver_spec *keyserver); struct keyserver_spec *keyserver_match(struct keyserver_spec *spec); -struct keyserver_spec *parse_keyserver_uri(const char *string, - int require_scheme, - const char *configname, - unsigned int configlineno); +struct keyserver_spec *parse_keyserver_uri (const char *string, + int require_scheme); struct keyserver_spec *parse_preferred_keyserver(PKT_signature *sig); int keyserver_export (ctrl_t ctrl, strlist_t users); int keyserver_import (ctrl_t ctrl, strlist_t users); diff --git a/g10/keyserver.c b/g10/keyserver.c index a92544c45..7d8075608 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -258,8 +258,7 @@ keyserver_match(struct keyserver_spec *spec) keyserver/ksutil.c for limited use in gpgkeys_ldap or the like. */ keyserver_spec_t -parse_keyserver_uri (const char *string,int require_scheme, - const char *configname,unsigned int configlineno) +parse_keyserver_uri (const char *string,int require_scheme) { int assume_hkp=0; struct keyserver_spec *keyserver; @@ -481,7 +480,7 @@ parse_preferred_keyserver(PKT_signature *sig) memcpy(dupe,p,plen); dupe[plen]='\0'; - spec=parse_keyserver_uri(dupe,1,NULL,0); + spec = parse_keyserver_uri (dupe, 1); xfree(dupe); } @@ -1931,7 +1930,7 @@ keyserver_import_cert (ctrl_t ctrl, { struct keyserver_spec *spec; - spec=parse_keyserver_uri(url,1,NULL,0); + spec = parse_keyserver_uri (url, 1); if(spec) { err = keyserver_import_fprint (ctrl, *fpr,*fpr_len,spec); @@ -1977,7 +1976,7 @@ keyserver_import_pka (ctrl_t ctrl, { /* An URI is available. Lookup the key. */ struct keyserver_spec *spec; - spec = parse_keyserver_uri (uri, 1, NULL, 0); + spec = parse_keyserver_uri (uri, 1); if (spec) { rc = keyserver_import_fprint (ctrl, *fpr, 20, spec); diff --git a/g10/mainproc.c b/g10/mainproc.c index 03a13c55e..a66a99d4e 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -1739,7 +1739,7 @@ check_sig_and_print (CTX c, kbnode_t node) int res; struct keyserver_spec *spec; - spec = parse_keyserver_uri (uri, 1, NULL, 0); + spec = parse_keyserver_uri (uri, 1); if (spec) { glo_ctrl.in_auto_key_retrieve++; |