[PATCH] ethtool: return 1 as exit code on a settings(-s) failure.

[PATCH] ethtool: return 1 as exit code on a settings(-s) failure.

[Sridhar Samudrala]

Currently 0 is returned on both success or failure.

Signed-off-by: Sridhar Samudrala <sridhar.samudrala@intel.com>
---
 ethtool.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ethtool.c b/ethtool.c
index 01b13a6..163dff2 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -2352,7 +2352,7 @@ static int do_sset(struct cmd_context *ctx)
 	int argc = ctx->argc;
 	char **argp = ctx->argp;
 	int i;
-	int err;
+	int err = 0;
 
 	for (i = 0; i < ARRAY_SIZE(flags_msglvl); i++)
 		flag_to_cmdline_info(flags_msglvl[i].name,
@@ -2665,7 +2665,7 @@ static int do_sset(struct cmd_context *ctx)
 		}
 	}
 
-	return 0;
+	return err ? 1 : 0;
 }
 
 static int do_gregs(struct cmd_context *ctx)
-- 
1.8.4.2

Re: [PATCH] ethtool: return 1 as exit code on a settings(-s) failure.

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 1000 bytes --]

On Thu, 2015-04-16 at 13:55 -0700, Sridhar Samudrala wrote:
> Currently 0 is returned on both success or failure.

Previously discussed here:
<http://thread.gmane.org/gmane.linux.network/349717>.

Ben.

> Signed-off-by: Sridhar Samudrala <sridhar.samudrala@intel.com>
> ---
>  ethtool.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/ethtool.c b/ethtool.c
> index 01b13a6..163dff2 100644
> --- a/ethtool.c
> +++ b/ethtool.c
> @@ -2352,7 +2352,7 @@ static int do_sset(struct cmd_context *ctx)
>  	int argc = ctx->argc;
>  	char **argp = ctx->argp;
>  	int i;
> -	int err;
> +	int err = 0;
>  
>  	for (i = 0; i < ARRAY_SIZE(flags_msglvl); i++)
>  		flag_to_cmdline_info(flags_msglvl[i].name,
> @@ -2665,7 +2665,7 @@ static int do_sset(struct cmd_context *ctx)
>  		}
>  	}
>  
> -	return 0;
> +	return err ? 1 : 0;
>  }
>  
>  static int do_gregs(struct cmd_context *ctx)

-- 
Ben Hutchings
Humour is the best antidote to reality.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 811 bytes --]