[Pkg-gnupg-commit] [libgpg-error] 18/32: estream: Minor portability fix.

Daniel Kahn Gillmor dkg at fifthhorseman.net
Wed Nov 16 01:31:03 UTC 2016


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

dkg pushed a commit to branch master
in repository libgpg-error.

commit c26117b2eda43258d4e3e8fd3ed602b2eaaa51f4
Author: Werner Koch <wk at gnupg.org>
Date:   Sat Nov 12 20:00:06 2016 +0100

    estream: Minor portability fix.
    
    --
    
    A trailing comma in an enum is not groked by all compilers.
    Binary operation should have their own parentheses to make it clear
    that a binary operator was meant.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 src/estream.c   | 6 +++---
 src/gpgrt-int.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/estream.c b/src/estream.c
index c46bc61..58d5d03 100644
--- a/src/estream.c
+++ b/src/estream.c
@@ -2087,7 +2087,7 @@ es_create (estream_t *stream, void *cookie, es_syshd_t *syshd,
   stream_new->intern = stream_internal_new;
 
 #if _WIN32
-  if (xmode & X_POLLABLE)
+  if ((xmode & X_POLLABLE))
     {
       void *new_cookie;
 
@@ -3243,7 +3243,7 @@ do_fdopen (int filedes, const char *mode, int no_close, int with_locked_list)
   err = parse_mode (mode, &modeflags, &xmode, NULL);
   if (err)
     goto out;
-  if (xmode & X_SYSOPEN)
+  if ((xmode & X_SYSOPEN))
     {
       /* Not allowed for fdopen.  */
       _set_errno (EINVAL);
@@ -3307,7 +3307,7 @@ do_fpopen (FILE *fp, const char *mode, int no_close, int with_locked_list)
   err = parse_mode (mode, &modeflags, &xmode, &cmode);
   if (err)
     goto out;
-  if (xmode & X_SYSOPEN)
+  if ((xmode & X_SYSOPEN))
     {
       /* Not allowed for fpopen.  */
       _set_errno (EINVAL);
diff --git a/src/gpgrt-int.h b/src/gpgrt-int.h
index a6e6036..fba2585 100644
--- a/src/gpgrt-int.h
+++ b/src/gpgrt-int.h
@@ -82,7 +82,7 @@ typedef enum
     BACKEND_W32,
     BACKEND_FP,
     BACKEND_USER,
-    BACKEND_W32_POLLABLE,
+    BACKEND_W32_POLLABLE
   } gpgrt_stream_backend_kind_t;
 
 

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



More information about the Pkg-gnupg-commit mailing list