On Wed, Feb 15, 2023 at 03:24:35AM -0500, Laine Stump wrote: > ...and return void to simplify the caller. > > Signed-off-by: Laine Stump Reviewed-by: David Gibson > --- > conf.c | 16 ++++------------ > 1 file changed, 4 insertions(+), 12 deletions(-) > > diff --git a/conf.c b/conf.c > index 19020f9..d020b4f 100644 > --- a/conf.c > +++ b/conf.c > @@ -464,10 +464,8 @@ out: > * conf_netns_opt() - Parse --netns option > * @netns: buffer of size PATH_MAX, updated with netns path > * @arg: --netns argument > - * > - * Return: 0 on success, negative error code otherwise > */ > -static int conf_netns_opt(char *netns, const char *arg) > +static void conf_netns_opt(char *netns, const char *arg) > { > int ret; > > @@ -479,12 +477,8 @@ static int conf_netns_opt(char *netns, const char *arg) > ret = snprintf(netns, PATH_MAX, "%s", arg); > } > > - if (ret <= 0 || ret > PATH_MAX) { > - err("Network namespace name/path %s too long"); > - return -E2BIG; > - } > - > - return 0; > + if (ret <= 0 || ret > PATH_MAX) > + die("Network namespace name/path %s too long"); > } > > /** > @@ -1157,9 +1151,7 @@ void conf(struct ctx *c, int argc, char **argv) > if (c->mode != MODE_PASTA) > die("--netns is for pasta mode only"); > > - ret = conf_netns_opt(netns, optarg); > - if (ret < 0) > - usage(argv[0]); > + conf_netns_opt(netns, optarg); > break; > case 4: > if (c->mode != MODE_PASTA) -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson