[git] GnuPG - branch, STABLE-BRANCH-1-4, updated. gnupg-1.4.11-34-g02f2823

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, STABLE-BRANCH-1-4 has been updated
       via  02f282368e6e68ac1c8dffcfd6e772ec4ff356f8 (commit)
       via  16c90b2175c92c0698172b547b90f5325bb9ab17 (commit)
      from  cb8ebf792e919b1797bf16b6606427d77c45c947 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 02f282368e6e68ac1c8dffcfd6e772ec4ff356f8
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jan 12 12:19:54 2012 +0100

    gpg: Remove unused fields from a trust data structure.
    
    The functions tdbio_read_record and tdbio_write_record control the
    actual on-disk format.  Thus there is no need to keep reserved fields
    in the internal data structure.
    
    * g10/tdbio.h (struct trust_record): Remove reserved fields.

diff --git a/g10/tdbio.h b/g10/tdbio.h
index d6af98f..5360ce9 100644
--- a/g10/tdbio.h
+++ b/g10/tdbio.h
@@ -56,10 +56,7 @@ struct trust_record {
 	    byte  trust_model;
 	    ulong created;   /* timestamp of trustdb creation  */
 	    ulong nextcheck; /* timestamp of next scheduled check */
-	    ulong reserved;  
-	    ulong reserved2;
 	    ulong firstfree;
-	    ulong reserved3;
             ulong trusthashtbl;
 	} ver;
 	struct {	    /* free record */
@@ -81,7 +78,7 @@ struct trust_record {
       } trust;
       struct {
         byte namehash[20];
-        ulong next;  
+        ulong next;
         byte validity;
 	byte full_count;
 	byte marginal_count;

commit 16c90b2175c92c0698172b547b90f5325bb9ab17
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jan 12 11:47:35 2012 +0100

    Typo fixes and comment re-formatting.

diff --git a/cipher/rndlinux.c b/cipher/rndlinux.c
index fd4fd8e..9d40f47 100644
--- a/cipher/rndlinux.c
+++ b/cipher/rndlinux.c
@@ -61,8 +61,9 @@ get_entropy_count( int fd )
 #endif
 #endif
 
-/****************
- * Used to open the /dev/random devices (Linux, xBSD, Solaris (if it exists), ...)
+/*
+ * Used to open the /dev/random devices (Linux, xBSD, Solaris (if it
+ * exists), ...)
  */
 static int
 open_device( const char *name, int minor )
@@ -82,7 +83,7 @@ open_device( const char *name, int minor )
 }
 
 
-/****************
+/*
  * Note:  Using a level of 0 should never block and better add nothing
  * to the pool.  This is easy to accomplish with /dev/urandom.
  */
@@ -103,8 +104,8 @@ rndlinux_gather_random( void (*add)(const void*, size_t, int), int requester,
 	fd = fd_random;
     }
     else {
-	/* this will also be used for elve 0 but by using /dev/urandom
-	 * we can be sure that oit will never block. */
+	/* This will also be used for level 0.  By using /dev/urandom
+	 * we can be sure that it will never block. */
 	if( fd_urandom == -1 )
 	    fd_urandom = open_device( NAME_OF_DEV_URANDOM, 9 );
 	fd = fd_urandom;

-----------------------------------------------------------------------

Summary of changes:
 cipher/rndlinux.c |   11 ++++++-----
 g10/tdbio.h       |    5 +----
 2 files changed, 7 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org