From 11cab56df59e028a294c2799e83a40ba14288090 Mon Sep 17 00:00:00 2001 From: Marc Dionne Date: Wed, 28 May 2014 09:53:58 -0400 Subject: [PATCH] vol: Fix gcc 4.9 warnings gcc 4.9 complains here because the trailing 0 in these macros has no effect, the value having already been set to NULL. Just remove the offending 0s, nothing uses the return value anyway, even if there were platforms where 0 != NULL. Reviewed-on: http://gerrit.openafs.org/11176 Tested-by: BuildBot Reviewed-by: Benjamin Kaduk Reviewed-by: D Brashear (cherry picked from commit c0683441a0121433d772bfb36e1e9a1c020a5dcb) Change-Id: Ia63f56d3254b87e7d56752ec11729d82e0293792 Reviewed-on: http://gerrit.openafs.org/11204 Tested-by: BuildBot Reviewed-by: Chas Williams - CONTRACTOR Reviewed-by: Perry Ruiter Reviewed-by: Andrew Deason Reviewed-by: Stephan Wiesand --- src/vol/ihandle.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vol/ihandle.h b/src/vol/ihandle.h index b59568552..e87246392 100644 --- a/src/vol/ihandle.h +++ b/src/vol/ihandle.h @@ -353,9 +353,9 @@ extern FdHandle_t *ih_attachfd(IHandle_t * ihP, FD_t fd); #define IH_OPEN(H) ih_open(H) -#define FDH_CLOSE(H) (fd_close(H), (H)=NULL, 0) +#define FDH_CLOSE(H) (fd_close(H), (H)=NULL) -#define FDH_REALLYCLOSE(H) (fd_reallyclose(H), (H)=NULL, 0) +#define FDH_REALLYCLOSE(H) (fd_reallyclose(H), (H)=NULL) #define FDH_FDOPEN(H, A) stream_fdopen((H)->fd_fd) @@ -379,7 +379,7 @@ extern FdHandle_t *ih_attachfd(IHandle_t * ihP, FD_t fd); #define STREAM_REALLYCLOSE(H) stream_close(H, 1) -#define IH_RELEASE(H) (ih_release(H), (H)=NULL, 0) +#define IH_RELEASE(H) (ih_release(H), (H)=NULL) #define IH_REALLYCLOSE(H) ih_reallyclose(H) -- 2.39.5