[Pkg-gnupg-commit] [gnupg2] 99/160: gpg: Allow to cache the mbox in a user id struct.

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch upstream
in repository gnupg2.

commit f015552374d69e28292a12f2b91ab34d65c9b457
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Jul 1 15:40:56 2016 +0200

    gpg: Allow to cache the mbox in a user id struct.
    
    * g10/packet.h (PKT_user_id): Add field 'mbox'.
    * g10/free-packet.c (free_user_id): Free that.
    --
    
    This will be required by the coming import filter.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 g10/free-packet.c | 1 +
 g10/packet.h      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/g10/free-packet.c b/g10/free-packet.c
index 3883f87..516e9a1 100644
--- a/g10/free-packet.c
+++ b/g10/free-packet.c
@@ -311,6 +311,7 @@ free_user_id (PKT_user_id *uid)
     free_attributes(uid);
     xfree (uid->prefs);
     xfree (uid->namehash);
+    xfree (uid->mbox);
     xfree (uid);
 }
 
diff --git a/g10/packet.h b/g10/packet.h
index a496c4b..08e2cb7 100644
--- a/g10/packet.h
+++ b/g10/packet.h
@@ -291,6 +291,7 @@ typedef struct
     unsigned int ks_modify:1;
     unsigned int compacted:1;
   } flags;
+  char *mbox;   /* NULL or the result of mailbox_from_userid.  */
   /* The text contained in the user id packet, which is normally the
      name and email address of the key holder (See RFC 4880 5.11).
      (Serialized.). For convenience an extra Nul is always appended.  */

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