[git] GPGME - branch, master, updated. gpgme-1.4.2-25-gdd9c8c5

[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 "GnuPG Made Easy".

The branch, master has been updated
       via  dd9c8c56719db093b8daa23aa40b2be71bbd1526 (commit)
       via  75a6255935f450d56f3637cbb2b6c8161ace57ab (commit)
      from  40938feb3f3393b0cdc6ec61ca2e77ff0b82c69a (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 dd9c8c56719db093b8daa23aa40b2be71bbd1526
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Mar 11 13:58:38 2014 +0100

    Avoid pointer arithmetic on void pointer.
    
    * src/gpgme.c (gpgme_io_writen): Use new var buffer.
    --
    
    Reported-by: Albert Chin

diff --git a/src/gpgme.c b/src/gpgme.c
index 4182c74..438fef2 100644
--- a/src/gpgme.c
+++ b/src/gpgme.c
@@ -691,8 +691,9 @@ gpgme_io_write (int fd, const void *buffer, size_t count)
    written or an error is return.  Returns: 0 on success or -1 on
    error and the sets errno. */
 int
-gpgme_io_writen (int fd, const void *buffer, size_t count)
+gpgme_io_writen (int fd, const void *buffer_arg, size_t count)
 {
+  const char *buffer = buffer_arg;
   int ret = 0;
   TRACE_BEG2 (DEBUG_GLOBAL, "gpgme_io_writen", fd,
 	      "buffer=%p, count=%u", buffer, count);

commit 75a6255935f450d56f3637cbb2b6c8161ace57ab
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Mar 11 13:54:21 2014 +0100

    Change implementation return type to match the definition.
    
    * src/gpgme.c (gpgme_get_sub_protocol): Change return type to
    gpgme_protocol_t.
    --
    
    Yet another enum/int mismatch.
    
    Reported-by: Albert Chin.

diff --git a/src/gpgme.c b/src/gpgme.c
index 9c297d8..4182c74 100644
--- a/src/gpgme.c
+++ b/src/gpgme.c
@@ -370,7 +370,7 @@ gpgme_set_sub_protocol (gpgme_ctx_t ctx, gpgme_protocol_t protocol)
 }
 
 
-gpgme_error_t
+gpgme_protocol_t
 gpgme_get_sub_protocol (gpgme_ctx_t ctx)
 {
   TRACE2 (DEBUG_CTX, "gpgme_get_sub_protocol", ctx,

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

Summary of changes:
 src/gpgme.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org