From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by passt.top (Postfix) with ESMTP id 713CA5A026D for ; Wed, 8 Feb 2023 18:48:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675878523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UHBNBHs42e6X78ThSmeTSBqH5GIXTmF5BS4LKAZDhDQ=; b=HeWSkDoDzvel07rUwyJZGhMK6CzKQiD6+cvey/2718Dcbo7Pyx01soC5+yUv5FRPQs5fi7 1nbbgZA7aryesNiLgMPSvpHam0LQMm2vEgNGYO3KF/pGAgqMNk1T1pAVrXXMZxX5Bs2Xem GOf0BVDcM9IPGRhvjA1O3OB0hbMoc9I= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-644-0E1bki4yOfuZeOZ2sVt0Mw-1; Wed, 08 Feb 2023 12:48:40 -0500 X-MC-Unique: 0E1bki4yOfuZeOZ2sVt0Mw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 32B01101A52E; Wed, 8 Feb 2023 17:48:40 +0000 (UTC) Received: from vhost3.router.laine.org (unknown [10.2.17.81]) by smtp.corp.redhat.com (Postfix) with ESMTP id 192E72166B29; Wed, 8 Feb 2023 17:48:40 +0000 (UTC) From: Laine Stump To: passt-dev@passt.top, laine@laine.org Subject: [PATCH v2 7/9] make conf_netns_opt() exit immediately after logging error Date: Wed, 8 Feb 2023 12:48:36 -0500 Message-Id: <20230208174838.1680517-8-laine@redhat.com> In-Reply-To: <20230208174838.1680517-1-laine@redhat.com> References: <20230208174838.1680517-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: ZDEHYUUL6BBRF66NEE233OE4737RFOML X-Message-ID-Hash: ZDEHYUUL6BBRF66NEE233OE4737RFOML X-MailFrom: laine@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.3 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ...and return void to simplify the caller. Signed-off-by: Laine Stump --- conf.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/conf.c b/conf.c index 5e9a6f9..1bfbc55 100644 --- a/conf.c +++ b/conf.c @@ -467,10 +467,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; @@ -482,12 +480,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) + errexit("Network namespace name/path %s too long"); } /** @@ -1161,9 +1155,7 @@ void conf(struct ctx *c, int argc, char **argv) if (c->mode != MODE_PASTA) errexit("--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) -- 2.39.1