[git] GPG-ERROR - branch, master, updated. libgpg-error-1.31-12-gbd5bcd2

by Werner Koch cvs at cvs.gnupg.org
Thu Jul 12 09:28:48 CEST 2018


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 "Error codes used by GnuPG et al.".

The branch, master has been updated
       via  bd5bcd2dd19ef0b1c3d33a3a388b537ba08a4eb6 (commit)
      from  0727c394562237d7e626849eae04790264e56208 (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 bd5bcd2dd19ef0b1c3d33a3a388b537ba08a4eb6
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jul 12 09:17:52 2018 +0200

    estream: Always propagate flush event to cookie functions.
    
    * src/estream.c (flush_stream): Always call cookie's flush func.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/estream.c b/src/estream.c
index a1cc62e..8ad664e 100644
--- a/src/estream.c
+++ b/src/estream.c
@@ -1930,14 +1930,15 @@ flush_stream (estream_t stream)
 	  stream->intern->offset += stream->data_offset;
 	  stream->data_offset = 0;
 	  stream->data_flushed = 0;
-
-	  /* Propagate flush event.  */
-	  (*func_write) (stream->intern->cookie, NULL, 0);
 	}
     }
   else
     err = 0;
 
+  /* Always propagate flush event in case gpgrt_fflush was called
+   * explictly to do flush buffers in caller's cookie functions.  */
+  (*func_write) (stream->intern->cookie, NULL, 0);
+
  out:
 
   if (err && errno != EAGAIN)

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

Summary of changes:
 src/estream.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Error codes used by GnuPG et al.
http://git.gnupg.org




More information about the Gnupg-commits mailing list