[Pkg-gnupg-commit] [gnupg2] 85/116: gpg: Remove unused definitions.

Daniel Kahn Gillmor dkg at fifthhorseman.net
Tue Jan 24 04:40:57 UTC 2017


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

dkg pushed a commit to branch master
in repository gnupg2.

commit 701f54eccf3da3319dd6d74f46b852c64d90bc52
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Jan 17 12:43:13 2017 +0100

    gpg: Remove unused definitions.
    
    * g10/keydb.h (rt_UNKNOWN, rt_RING): Remove constants.
    (keyblock_pos_struct, KBPOS): Remove struct and type.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 g10/keydb.h | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/g10/keydb.h b/g10/keydb.h
index 8daa9ee..c9f5b1c 100644
--- a/g10/keydb.h
+++ b/g10/keydb.h
@@ -61,12 +61,6 @@ struct kbnode_struct {
 #define is_cloned_kbnode(a)   ((a)->private_flag & 2)
 
 
-enum resource_type {
-    rt_UNKNOWN = 0,
-    rt_RING = 1
-};
-
-
 /* Bit flags used with build_pk_list.  */
 enum
   {
@@ -75,28 +69,14 @@ enum
     PK_LIST_CONFIG     = 4, /* Specified via config file.          */
     PK_LIST_FROM_FILE  = 8  /* Take key from file with that name.  */
   };
+
 /* To store private data in the flags the private data must be left
-   shifted by this value.  */
+ * shifted by this value.  */
 enum
   {
     PK_LIST_SHIFT = 4
   };
 
-/****************
- * A data structure to hold information about the external position
- * of a keyblock.
- */
-struct keyblock_pos_struct {
-    int   resno;     /* resource number */
-    enum resource_type rt;
-    off_t offset;    /* position information */
-    unsigned count;  /* length of the keyblock in packets */
-    iobuf_t  fp;     /* Used by enum_keyblocks. */
-    int secret;      /* working on a secret keyring */
-    PACKET *pkt;     /* ditto */
-    int valid;
-};
-typedef struct keyblock_pos_struct KBPOS;
 
 /* Structure to hold a couple of public key certificates. */
 typedef struct pk_list *PK_LIST;  /* Deprecated. */

-- 
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