[git] GnuPG - branch, master, updated. gnupg-2.1.15-27-g70df5a8

[by Neal H. Walfield]

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, master has been updated
       via  70df5a8fd781d8774d835384ca28c4d8518bb9d0 (commit)
      from  268f6b7a3403d036882b4af384ba7ab2f8c8355f (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 70df5a8fd781d8774d835384ca28c4d8518bb9d0
Author: Neal H. Walfield <neal at g10code.com>
Date:   Wed Aug 31 10:58:18 2016 +0200

    g10: Drop unused argument.
    
    * g10/tofu.c (begin_transaction): Remove unused option only_batch.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>

diff --git a/g10/tofu.c b/g10/tofu.c
index 88833cd..62c6efc 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -163,7 +163,7 @@ tofu_policy_to_trust_level (enum tofu_policy policy)
 

 /* Start a transaction on DB.  */
 static gpg_error_t
-begin_transaction (ctrl_t ctrl, int only_batch)
+begin_transaction (ctrl_t ctrl)
 {
   tofu_dbs_t dbs = ctrl->tofu.dbs;
   int rc;
@@ -219,9 +219,6 @@ begin_transaction (ctrl_t ctrl, int only_batch)
       dbs->batch_update_started = gnupg_get_time ();
     }
 
-  if (only_batch)
-    return 0;
-
   log_assert(dbs->in_transaction >= 0);
   dbs->in_transaction ++;
 
@@ -2231,7 +2228,7 @@ tofu_register (ctrl_t ctrl, PKT_public_key *pk, strlist_t user_id_list,
 
   /* We do a query and then an insert.  Make sure they are atomic
      by wrapping them in a transaction.  */
-  rc = begin_transaction (ctrl, 0);
+  rc = begin_transaction (ctrl);
   if (rc)
     return rc;
 
@@ -2479,7 +2476,7 @@ tofu_get_validity (ctrl_t ctrl, PKT_public_key *pk, strlist_t user_id_list,
 
   fingerprint = hexfingerprint (pk, NULL, 0);
 
-  begin_transaction (ctrl, 0);
+  begin_transaction (ctrl);
 
   for (user_id = user_id_list; user_id; user_id = user_id->next, bindings ++)
     {

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

Summary of changes:
 g10/tofu.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)


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