Linux Netfilter development
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [nftables PATCH] src: fix return code
Date: Fri, 11 Oct 2013 10:25:53 +0200	[thread overview]
Message-ID: <20131011082552.GB3630@localhost> (raw)
In-Reply-To: <20131010211156.12209.65147.stgit@nfdev.cica.es>

On Thu, Oct 10, 2013 at 11:11:56PM +0200, Arturo Borrero Gonzalez wrote:
> Exit with NFT_EXIT_FAILURE if something went wrong in the netlink zone.
> 
> Before this patch:
> 
> # nft list chain filter asd ; echo $?
> internal:0:0-0: Error: Could not find chain `asd' in table `filter': [...]
> 
> 0
> 
> After this patch:
> 
> # nft list chain filter asd ; echo $?
> internal:0:0-0: Error: Could not find chain `asd' in table `filter': [...]
> 
> 1
> 
> Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
> ---
>  src/main.c |    7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/src/main.c b/src/main.c
> index 3ddcb71..9aa5f1b 100644
> --- a/src/main.c
> +++ b/src/main.c
> @@ -222,7 +222,7 @@ int main(int argc, char * const *argv)
>  	char *buf = NULL, *filename = NULL;
>  	unsigned int len;
>  	bool interactive = false;
> -	int i, val;
> +	int i, val, rc = NFT_EXIT_FAILURE;
>  
>  	while (1) {
>  		val = getopt_long(argc, argv, OPTSTRING, options, NULL);
> @@ -318,11 +318,12 @@ int main(int argc, char * const *argv)
>  		exit(NFT_EXIT_FAILURE);
>  	}
>  
> -	nft_run(scanner, &state, &msgs);
> +	if (nft_run(scanner, &state, &msgs) == 0)
> +		rc = NFT_EXIT_SUCCESS;

I prefer if you check for errors, the convention is to check for
errors, which should be the less frequent path. So assume
NFT_EXIT_SUCCESS by default.

>  out:
>  	scanner_destroy(scanner);
>  	erec_print_list(stdout, &msgs);
>  
>  	xfree(buf);
> -	return 0;
> +	exit(rc);

Please, replace this with 'return rc;'

>  }
> 
> --
> To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

  reply	other threads:[~2013-10-11  8:26 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-10 21:11 [nftables PATCH] src: fix return code Arturo Borrero Gonzalez
2013-10-11  8:25 ` Pablo Neira Ayuso [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-10-10 21:11 Arturo Borrero Gonzalez

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20131011082552.GB3630@localhost \
    --to=pablo@netfilter.org \
    --cc=arturo.borrero.glez@gmail.com \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox