[Pkg-gnupg-commit] [gnupg2] 53/180: g10: Remove dead code.

Daniel Kahn Gillmor dkg at fifthhorseman.net
Sat Dec 24 22:29:07 UTC 2016


This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit bd9ebe1404c1395edd0e029023a9e780c90f6d73
Author: Neal H. Walfield <neal at g10code.com>
Date:   Fri Dec 2 11:42:38 2016 +0100

    g10: Remove dead code.
    
    * g10/tofu.c (tofu_set_policy_by_keyid): Remove function.
    
    Signed-off-by: Neal H. Walfield <neal at g10code.com>
---
 g10/tofu.c | 17 -----------------
 g10/tofu.h |  5 -----
 2 files changed, 22 deletions(-)

diff --git a/g10/tofu.c b/g10/tofu.c
index 18f9c54..5b3e84c 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -3760,23 +3760,6 @@ tofu_set_policy (ctrl_t ctrl, kbnode_t kb, enum tofu_policy policy)
   return err;
 }
 
-/* Set the TOFU policy for all non-revoked user ids in the KEY with
-   the key id KEYID to POLICY.
-
-   If no key is available with the specified key id, then this
-   function returns GPG_ERR_NO_PUBKEY.
-
-   Returns 0 on success and an error code otherwise.  */
-gpg_error_t
-tofu_set_policy_by_keyid (ctrl_t ctrl, u32 *keyid, enum tofu_policy policy)
-{
-  kbnode_t keyblock = get_pubkeyblock (keyid);
-  if (! keyblock)
-    return gpg_error (GPG_ERR_NO_PUBKEY);
-
-  return tofu_set_policy (ctrl, keyblock, policy);
-}
-
 /* Return the TOFU policy for the specified binding in *POLICY.  If no
    policy has been set for the binding, sets *POLICY to
    TOFU_POLICY_NONE.
diff --git a/g10/tofu.h b/g10/tofu.h
index 3ee2f41..7b1beea 100644
--- a/g10/tofu.h
+++ b/g10/tofu.h
@@ -120,11 +120,6 @@ int tofu_get_validity (ctrl_t ctrl,
    POLICY.  */
 gpg_error_t tofu_set_policy (ctrl_t ctrl, kbnode_t kb, enum tofu_policy policy);
 
-/* Set the TOFU policy for all non-revoked users in the key with the
-   key id KEYID to POLICY.  */
-gpg_error_t tofu_set_policy_by_keyid (ctrl_t ctrl,
-                                      u32 *keyid, enum tofu_policy policy);
-
 /* Return the TOFU policy for the specified binding in *POLICY.  */
 gpg_error_t tofu_get_policy (ctrl_t ctrl,
                              PKT_public_key *pk, PKT_user_id *user_id,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git



More information about the Pkg-gnupg-commit mailing list