Patchwork Fix fall-through warnings in sunrpc/xdr.c

login
register
mail settings
Submitter Joseph Myers
Date Feb. 14, 2019, 6:39 p.m.
Message ID <alpine.DEB.2.21.1902141839200.28311@digraph.polyomino.org.uk>
Download mbox | patch
Permalink /patch/31481/
State Committed
Headers show

Comments

Joseph Myers - Feb. 14, 2019, 6:39 p.m.
This patch fixes implicit-fallthrough warnings in sunrpc/xdr.c when
building with -Wextra.  A fall-through comment is added in three
places; in two other places, an existing comment is reworded so it
matches the default patterns used by -Wimplicit-fallthrough.

Tested for x86_64.

2019-02-14  Joseph Myers  <joseph@codesourcery.com>

	* sunrpc/xdr.c (xdr_int): Add fall-through comment.
	(xdr_u_int): Likewise.
	(xdr_enum): Likewise.
	(xdr_bytes): Reword fall-through comment.
	(xdr_string): Likewise.
Florian Weimer - Feb. 14, 2019, 6:58 p.m.
* Joseph Myers:

> diff --git a/sunrpc/xdr.c b/sunrpc/xdr.c
> index 8b0b91995b..b5fb7455e2 100644
> --- a/sunrpc/xdr.c
> +++ b/sunrpc/xdr.c
> @@ -113,6 +113,7 @@ xdr_int (XDR *xdrs, int *ip)
>  	  return FALSE;
>  	}
>        *ip = (int) l;
> +      /* Fall through.  */
>      case XDR_FREE:
>        return TRUE;

I would duplicate the return statement for those cases.  But no strong
preference.  Patch looks okay as-is.

Patch

diff --git a/sunrpc/xdr.c b/sunrpc/xdr.c
index 8b0b91995b..b5fb7455e2 100644
--- a/sunrpc/xdr.c
+++ b/sunrpc/xdr.c
@@ -113,6 +113,7 @@  xdr_int (XDR *xdrs, int *ip)
 	  return FALSE;
 	}
       *ip = (int) l;
+      /* Fall through.  */
     case XDR_FREE:
       return TRUE;
     }
@@ -152,6 +153,7 @@  xdr_u_int (XDR *xdrs, u_int *up)
 	  return FALSE;
 	}
       *up = (u_int) (u_long) l;
+      /* Fall through.  */
     case XDR_FREE:
       return TRUE;
     }
@@ -506,6 +508,7 @@  xdr_enum (XDR *xdrs, enum_t *ep)
 	      return FALSE;
 	    }
 	  *ep = l;
+	  /* Fall through.  */
 	case XDR_FREE:
 	  return TRUE;
 
@@ -628,7 +631,7 @@  xdr_bytes (XDR *xdrs, char **cpp, u_int *sizep, u_int maxsize)
 	  (void) __fxprintf (NULL, "%s: %s", __func__, _("out of memory\n"));
 	  return FALSE;
 	}
-      /* fall into ... */
+      /* Fall through.  */
 
     case XDR_ENCODE:
       return xdr_opaque (xdrs, sp, nodesize);
@@ -789,7 +792,7 @@  xdr_string (XDR *xdrs, char **cpp, u_int maxsize)
 	  return FALSE;
 	}
       sp[size] = 0;
-      /* fall into ... */
+      /* Fall through.  */
 
     case XDR_ENCODE:
       return xdr_opaque (xdrs, sp, size);