public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: Stefano Brivio <sbrivio@redhat.com>
To: Laine Stump <laine@redhat.com>
Cc: passt-dev@passt.top, laine@laine.org
Subject: Re: [PATCH v2 5/9] make conf_pasta_ns() exit immediately after logging error
Date: Thu, 9 Feb 2023 18:45:44 +0100	[thread overview]
Message-ID: <20230209184544.67ffe433@elisabeth> (raw)
In-Reply-To: <20230208174838.1680517-6-laine@redhat.com>

On Wed,  8 Feb 2023 12:48:34 -0500
Laine Stump <laine@redhat.com> wrote:

> As with conf_ports, this allows us to make the function return void.
> 
> Signed-off-by: Laine Stump <laine@redhat.com>
> ---
>  conf.c | 37 ++++++++++++-------------------------
>  1 file changed, 12 insertions(+), 25 deletions(-)
> 
> diff --git a/conf.c b/conf.c
> index 799b9ff..1e9c6f6 100644
> --- a/conf.c
> +++ b/conf.c
> @@ -500,21 +500,15 @@ static int conf_netns_opt(char *netns, const char *arg)
>   * @optind:	Index of first non-option argument
>   * @argc:	Number of arguments
>   * @argv:	Command line arguments
> - *
> - * Return: 0 on success, negative error code otherwise
>   */
> -static int conf_pasta_ns(int *netns_only, char *userns, char *netns,
> -			 int optind, int argc, char *argv[])
> +static void conf_pasta_ns(int *netns_only, char *userns, char *netns,
> +			  int optind, int argc, char *argv[])
>  {
> -	if (*netns_only && *userns) {
> -		err("Both --userns and --netns-only given");
> -		return -EINVAL;
> -	}
> +	if (*netns_only && *userns)
> +		errexit("Both --userns and --netns-only given");
>  
> -	if (*netns && optind != argc) {
> -		err("Both --netns and PID or command given");
> -		return -EINVAL;
> -	}
> +	if (*netns && optind != argc)
> +		errexit("Both --netns and PID or command given");
>  
>  	if (optind + 1 == argc) {
>  		char *endptr;
> @@ -523,23 +517,19 @@ static int conf_pasta_ns(int *netns_only, char *userns, char *netns,
>  		pidval = strtol(argv[optind], &endptr, 10);
>  		if (!*endptr) {
>  			/* Looks like a pid */
> -			if (pidval < 0 || pidval > INT_MAX) {
> -				err("Invalid PID %s", argv[optind]);
> -				return -EINVAL;
> -			}
> +			if (pidval < 0 || pidval > INT_MAX)
> +				errexit("Invalid PID %s", argv[optind]);
>  
>  			snprintf(netns, PATH_MAX, "/proc/%ld/ns/net", pidval);
>  			if (!*userns)
>  				snprintf(userns, PATH_MAX, "/proc/%ld/ns/user",
> -					 pidval);
> +				pidval);

Stray change.

>  		}
>  	}
>  
>  	/* Attaching to a netns/PID, with no userns given */
>  	if (*netns && !*userns)
>  		*netns_only = 1;
> -
> -	return 0;
>  }
>  
>  /** conf_ip4_prefix() - Parse an IPv4 prefix length or netmask
> @@ -1562,13 +1552,10 @@ void conf(struct ctx *c, int argc, char **argv)
>  		}
>  	} while (name != -1);
>  
> -	if (c->mode == MODE_PASTA) {
> -		if (conf_pasta_ns(&netns_only, userns, netns,
> -				  optind, argc, argv) < 0)
> -			usage(argv[0]);
> -	} else if (optind != argc) {
> +	if (c->mode == MODE_PASTA)
> +		conf_pasta_ns(&netns_only, userns, netns, optind, argc, argv);
> +	else if (optind != argc)
>  		usage(argv[0]);
> -	}
>  
>  	isolate_user(uid, gid, !netns_only, userns, c->mode);
>  

-- 
Stefano


  reply	other threads:[~2023-02-09 17:45 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-08 17:48 [PATCH v2 0/9] error logging fixes Laine Stump
2023-02-08 17:48 ` [PATCH v2 1/9] log to stderr until process is daemonized, even if a logfile is set Laine Stump
2023-02-09 17:45   ` Stefano Brivio
2023-02-14  3:41     ` Laine Stump
2023-02-08 17:48 ` [PATCH v2 2/9] add errexit() to log an error message and exit with a single call Laine Stump
2023-02-09 17:45   ` Stefano Brivio
2023-02-13  3:22     ` David Gibson
2023-02-13 10:46       ` Stefano Brivio
2023-02-08 17:48 ` [PATCH v2 3/9] eliminate most calls to usage() in conf() Laine Stump
2023-02-09 17:45   ` Stefano Brivio
2023-02-08 17:48 ` [PATCH v2 4/9] make conf_ports() exit immediately after logging error Laine Stump
2023-02-09 17:45   ` Stefano Brivio
2023-02-08 17:48 ` [PATCH v2 5/9] make conf_pasta_ns() " Laine Stump
2023-02-09 17:45   ` Stefano Brivio [this message]
2023-02-08 17:48 ` [PATCH v2 6/9] make conf_ugid() " Laine Stump
2023-02-13  4:23   ` Laine Stump
2023-02-08 17:48 ` [PATCH v2 7/9] make conf_netns_opt() " Laine Stump
2023-02-08 17:48 ` [PATCH v2 8/9] log a detailed error (not usage()) when there are extra non-option arguments Laine Stump
2023-02-09 17:45   ` Stefano Brivio
2023-02-08 17:48 ` [PATCH v2 9/9] convert all remaining err() followed by exit() to errexit() Laine Stump
2023-02-09 17:45   ` Stefano Brivio

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=20230209184544.67ffe433@elisabeth \
    --to=sbrivio@redhat.com \
    --cc=laine@laine.org \
    --cc=laine@redhat.com \
    --cc=passt-dev@passt.top \
    /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.
Code repositories for project(s) associated with this public inbox

	https://passt.top/passt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).