diff mbox

[05/11] nfsd.c: removed a few warnings

Message ID 20170719205354.10006-6-steved@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Steve Dickson July 19, 2017, 8:53 p.m. UTC
nfsd.c:187:8: warning: this statement may fall through [-Wimplicit-fallthrough=]
nfsd.c:213:8: warning: this statement may fall through [-Wimplicit-fallthrough=]nfsd.c:263:4: warning: this statement may fall through [-Wimplicit-fallthrough=]

Signed-off-by: Steve Dickson <steved@redhat.com>
---
 utils/nfsd/nfsd.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

J. Bruce Fields July 20, 2017, 6:28 p.m. UTC | #1
On Wed, Jul 19, 2017 at 04:53:48PM -0400, Steve Dickson wrote:
> nfsd.c:187:8: warning: this statement may fall through [-Wimplicit-fallthrough=]
> nfsd.c:213:8: warning: this statement may fall through [-Wimplicit-fallthrough=]nfsd.c:263:4: warning: this statement may fall through [-Wimplicit-fallthrough=]

Are you sure about this?  It looks to me like the fall through was
intended in the -N4 and -V4 cases.

--b.

> 
> Signed-off-by: Steve Dickson <steved@redhat.com>
> ---
>  utils/nfsd/nfsd.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c
> index 2b38249..1d35658 100644
> --- a/utils/nfsd/nfsd.c
> +++ b/utils/nfsd/nfsd.c
> @@ -198,6 +198,7 @@ main(int argc, char **argv)
>  					minorvers = 0;
>  					minorversset = minormask;
>  				}
> +				break;
>  			case 3:
>  			case 2:
>  				NFSCTL_VERUNSET(versbits, c);
> @@ -220,6 +221,7 @@ main(int argc, char **argv)
>  					NFSCTL_MINORSET(minorvers, i);
>  				} else
>  					minorvers = minorversset = minormask;
> +				break;
>  			case 3:
>  			case 2:
>  				NFSCTL_VERSET(versbits, c);
> @@ -261,8 +263,9 @@ main(int argc, char **argv)
>  			break;
>  		default:
>  			fprintf(stderr, "Invalid argument: '%c'\n", c);
> +			/* FALLTHRU */
>  		case 'h':
> -			usage(progname);
> +			usage(progname); /* usage does not return */
>  		}
>  	}
>  
> -- 
> 2.13.3
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Steve Dickson July 21, 2017, 4:20 p.m. UTC | #2
On 07/20/2017 02:28 PM, J. Bruce Fields wrote:
> On Wed, Jul 19, 2017 at 04:53:48PM -0400, Steve Dickson wrote:
>> nfsd.c:187:8: warning: this statement may fall through [-Wimplicit-fallthrough=]
>> nfsd.c:213:8: warning: this statement may fall through [-Wimplicit-fallthrough=]nfsd.c:263:4: warning: this statement may fall through [-Wimplicit-fallthrough=]
> 
> Are you sure about this?  It looks to me like the fall through was
> intended in the -N4 and -V4 cases.
Wow... how un-obvious that! The -N4 actually does use the 
NFSCTL_VERUNSET() in the 3,2 case... Talk about in needed
of a comment! ;-)

steved.

> 
> --b.
> 
>>
>> Signed-off-by: Steve Dickson <steved@redhat.com>
>> ---
>>  utils/nfsd/nfsd.c | 5 ++++-
>>  1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c
>> index 2b38249..1d35658 100644
>> --- a/utils/nfsd/nfsd.c
>> +++ b/utils/nfsd/nfsd.c
>> @@ -198,6 +198,7 @@ main(int argc, char **argv)
>>  					minorvers = 0;
>>  					minorversset = minormask;
>>  				}
>> +				break;
>>  			case 3:
>>  			case 2:
>>  				NFSCTL_VERUNSET(versbits, c);
>> @@ -220,6 +221,7 @@ main(int argc, char **argv)
>>  					NFSCTL_MINORSET(minorvers, i);
>>  				} else
>>  					minorvers = minorversset = minormask;
>> +				break;
>>  			case 3:
>>  			case 2:
>>  				NFSCTL_VERSET(versbits, c);
>> @@ -261,8 +263,9 @@ main(int argc, char **argv)
>>  			break;
>>  		default:
>>  			fprintf(stderr, "Invalid argument: '%c'\n", c);
>> +			/* FALLTHRU */
>>  		case 'h':
>> -			usage(progname);
>> +			usage(progname); /* usage does not return */
>>  		}
>>  	}
>>  
>> -- 
>> 2.13.3
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c
index 2b38249..1d35658 100644
--- a/utils/nfsd/nfsd.c
+++ b/utils/nfsd/nfsd.c
@@ -198,6 +198,7 @@  main(int argc, char **argv)
 					minorvers = 0;
 					minorversset = minormask;
 				}
+				break;
 			case 3:
 			case 2:
 				NFSCTL_VERUNSET(versbits, c);
@@ -220,6 +221,7 @@  main(int argc, char **argv)
 					NFSCTL_MINORSET(minorvers, i);
 				} else
 					minorvers = minorversset = minormask;
+				break;
 			case 3:
 			case 2:
 				NFSCTL_VERSET(versbits, c);
@@ -261,8 +263,9 @@  main(int argc, char **argv)
 			break;
 		default:
 			fprintf(stderr, "Invalid argument: '%c'\n", c);
+			/* FALLTHRU */
 		case 'h':
-			usage(progname);
+			usage(progname); /* usage does not return */
 		}
 	}