diff options
| author | Neal H. Walfield <[email protected]> | 2017-06-11 11:58:44 +0000 |
|---|---|---|
| committer | Neal H. Walfield <[email protected]> | 2017-06-11 11:59:31 +0000 |
| commit | 8a9066865688cf17594b2bdde4b260b0ef36d68e (patch) | |
| tree | 2a8764df060d6058d7dc3b694ed8b1f52b3eb532 /g10/gpgcompose.c | |
| parent | artwork: Add new banner. (diff) | |
| download | gnupg-8a9066865688cf17594b2bdde4b260b0ef36d68e.tar.gz gnupg-8a9066865688cf17594b2bdde4b260b0ef36d68e.zip | |
gpg: Remove dead code.
* g10/gpgcompose.c (filter_pop): F->PKTTYPE will never be
PKT_ENCRYPTED_MDC.
(encrypted_pop): Likewise and there is no option --encrypted-mdc-pop.
Diffstat (limited to 'g10/gpgcompose.c')
| -rw-r--r-- | g10/gpgcompose.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/g10/gpgcompose.c b/g10/gpgcompose.c index e541cfef0..a8da54c27 100644 --- a/g10/gpgcompose.c +++ b/g10/gpgcompose.c @@ -81,7 +81,7 @@ filter_pop (iobuf_t out, int expected_type) "but current container is a %s container.\n", pkttype_str (f->pkttype), pkttype_str (expected_type)); - if (f->pkttype == PKT_ENCRYPTED || f->pkttype == PKT_ENCRYPTED_MDC) + if (f->pkttype == PKT_ENCRYPTED) { err = iobuf_pop_filter (out, f->func, f->context); if (err) @@ -2588,12 +2588,6 @@ encrypted_pop (const char *option, int argc, char *argv[], void *cookie) (void) argc; (void) argv; - if (strcmp (option, "--encrypted-pop") == 0) - filter_pop (out, PKT_ENCRYPTED); - else if (strcmp (option, "--encrypted-mdc-pop") == 0) - filter_pop (out, PKT_ENCRYPTED_MDC); - else - log_fatal ("%s: option not handled by this function!\n", option); debug ("Popped encryption container.\n"); |