diff options
| author | David Shaw <[email protected]> | 2004-02-14 05:03:45 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-02-14 05:03:45 +0000 |
| commit | c9aa5000d70b9d2bae7903074c8f10b75815e01d (patch) | |
| tree | fb4110bcd821ed6dad24a5571e351f1a500aa6ea /g10/import.c | |
| parent | * import.c (check_prefs): Some language fixes. (sec_to_pub_keyblock, (diff) | |
| download | gnupg-c9aa5000d70b9d2bae7903074c8f10b75815e01d.tar.gz gnupg-c9aa5000d70b9d2bae7903074c8f10b75815e01d.zip | |
* keyserver.c (argsep): Move to misc.c.
* main.h, misc.c (parse_options), export.c (parse_export_options),
import.c (parse_import_options), g10.c (main): Use it here to allow for
options with optional arguments. Change all callers.
Diffstat (limited to 'g10/import.c')
| -rw-r--r-- | g10/import.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/g10/import.c b/g10/import.c index 9b368f681..60b8ff207 100644 --- a/g10/import.c +++ b/g10/import.c @@ -88,13 +88,13 @@ parse_import_options(char *str,unsigned int *options,int noisy) { struct parse_options import_opts[]= { - {"allow-local-sigs",IMPORT_ALLOW_LOCAL_SIGS}, - {"repair-hkp-subkey-bug",IMPORT_REPAIR_PKS_SUBKEY_BUG}, - {"repair-pks-subkey-bug",IMPORT_REPAIR_PKS_SUBKEY_BUG}, - {"fast-import",IMPORT_FAST_IMPORT}, - {"convert-sk-to-pk",IMPORT_SK2PK}, - {"merge-only",IMPORT_MERGE_ONLY}, - {NULL,0} + {"allow-local-sigs",IMPORT_ALLOW_LOCAL_SIGS,NULL}, + {"repair-hkp-subkey-bug",IMPORT_REPAIR_PKS_SUBKEY_BUG,NULL}, + {"repair-pks-subkey-bug",IMPORT_REPAIR_PKS_SUBKEY_BUG,NULL}, + {"fast-import",IMPORT_FAST_IMPORT,NULL}, + {"convert-sk-to-pk",IMPORT_SK2PK,NULL}, + {"merge-only",IMPORT_MERGE_ONLY,NULL}, + {NULL,0,NULL} }; return parse_options(str,options,import_opts,noisy); @@ -619,7 +619,7 @@ check_prefs(KBNODE keyblock) size_t fprlen=0; byte fpr[MAX_FINGERPRINT_LEN],*p; char username[(MAX_FINGERPRINT_LEN*2)+1]; - int i; + unsigned int i; p=fingerprint_from_pk(keyblock->pkt->pkt.public_key,fpr,&fprlen); for(i=0;i<fprlen;i++,p++) |