diff options
| author | Werner Koch <[email protected]> | 2016-09-05 06:31:25 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-09-05 07:52:04 +0000 |
| commit | c8e0d37f4152d1341ef562a190fce93a0386a759 (patch) | |
| tree | 479cbce9599381a886ccf2c43aa881fbf75307f2 /g10/import.c | |
| parent | scd: Fix an action after card removal. (diff) | |
| download | gnupg-c8e0d37f4152d1341ef562a190fce93a0386a759.tar.gz gnupg-c8e0d37f4152d1341ef562a190fce93a0386a759.zip | |
gpg: Use a common filter_getval for import and export.
* g10/import.c (filter_getval): Rename to ...
(impex_filter_getval): this. Make global.
(apply_keep_uid_filter, apply_drop_sig_filter): Adjust.
* g10/export.c (filter_getval): Remove.
(apply_drop_sig_filter): Use impex_filter_getval.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/import.c')
| -rw-r--r-- | g10/import.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/g10/import.c b/g10/import.c index f7cb92367..14abd2bb2 100644 --- a/g10/import.c +++ b/g10/import.c @@ -1103,9 +1103,9 @@ check_prefs (ctrl_t ctrl, kbnode_t keyblock) } -/* Helper for apply_keep_uid_filter and apply_drop_sig_filter. */ -static const char * -filter_getval (void *cookie, const char *propname) +/* Helper for apply_*_filter in im,port.c and export.c. */ +const char * +impex_filter_getval (void *cookie, const char *propname) { /* FIXME: Malloc our static buffers and access them via the cookie. */ kbnode_t node = cookie; @@ -1178,7 +1178,7 @@ apply_keep_uid_filter (kbnode_t keyblock, recsel_expr_t selector) { if (node->pkt->pkttype == PKT_USER_ID) { - if (!recsel_select (selector, filter_getval, node)) + if (!recsel_select (selector, impex_filter_getval, node)) { /* log_debug ("keep-uid: deleting '%s'\n", */ @@ -1237,7 +1237,7 @@ apply_drop_sig_filter (kbnode_t keyblock, recsel_expr_t selector) if (IS_UID_SIG(sig) || IS_UID_REV(sig)) { - if (recsel_select (selector, filter_getval, node)) + if (recsel_select (selector, impex_filter_getval, node)) delete_kbnode (node); } } |