From patchwork Fri Nov 8 17:00:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Nault X-Patchwork-Id: 1192061 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="JD25KXev"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 478mjr2V2nz9s7T for ; Sat, 9 Nov 2019 04:00:32 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730192AbfKHRAb (ORCPT ); Fri, 8 Nov 2019 12:00:31 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:46750 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726819AbfKHRAa (ORCPT ); Fri, 8 Nov 2019 12:00:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573232429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=n/6+UyZlF4TyeEnNIyN82rQsyWZEE8yQgrnfKdOn+Z8=; b=JD25KXevB1mBPcMxWO0FXeCGr/X9mugAC+ttmOgzxNGNhON71fBId4cGP/f+acLnwIJklJ iFfCPbhVoZXXTSNrEFc5uvhnm5FiuXePxSXuOjPDSi/ZQFx+m0V2XKg1Tal67p5RLyBZ6V YOmsOMbi+HhXd78KSsrcV1jLy8CL+1o= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-68-jRHI6aP_PmWMpWW7uS9Hgg-1; Fri, 08 Nov 2019 12:00:24 -0500 Received: by mail-wr1-f70.google.com with SMTP id q6so119608wrv.11 for ; Fri, 08 Nov 2019 09:00:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=bWk0xE7owDpet8m7u9r1HEdfidzmdlltjQwawzuH6fQ=; b=LDtds43mM4A6vZUdAn05qBurMBA9WSXH7FwEpm6cpSZ7iDl/MeSkjm9ll1RwTDuKOQ 2pXDxzIVwhvpxBsX2YWJzSIPfv82VEwuE+z18GGB9QxIfp8N8A6bowoOolvdN4aB7LwO I5WyxetI4zhY7Jy8PrMOKt8TOdXAJ0DozAiMP3tWz8w45P/yvOWofWoqJaHou+SCo/OR GXycbVR3tIjy5o/U751T6QRgXX4lQiErHx2mHNdGuqBb/ZqbGlGyRs/2FshcLeKLm1Dh VCR1IkOkt5rDq4fRJ0qe033a26PeNyqypsryoAtDualZSXAsYNvYrrwLAaoNbY8IOX0i YLZA== X-Gm-Message-State: APjAAAXfNndMFAsxsmILW3f4oJbOzp0FRyiOwpP4wyxSiPq7yThYim/S xWUqkkREj5J1Ie1sv0lpjl6TWRQTtPhpNQfbziW5QG2mip7VHzn12TxBqe8ESsrTMLMNQoZRsos J3Ho535zIG0GyHdm3 X-Received: by 2002:a1c:4c10:: with SMTP id z16mr8489364wmf.24.1573232422708; Fri, 08 Nov 2019 09:00:22 -0800 (PST) X-Google-Smtp-Source: APXvYqwtRm+cS/UhlN3BBBwJUlIrBT7kp0q1wiHT+zuIR9yZ67qhdzMpQsFsxBZaPwbtb0Q6dUObwA== X-Received: by 2002:a1c:4c10:: with SMTP id z16mr8489347wmf.24.1573232422537; Fri, 08 Nov 2019 09:00:22 -0800 (PST) Received: from linux.home (2a01cb058918ce00dd1a5a4f9908f2d5.ipv6.abo.wanadoo.fr. [2a01:cb05:8918:ce00:dd1a:5a4f:9908:f2d5]) by smtp.gmail.com with ESMTPSA id 11sm7717154wmb.34.2019.11.08.09.00.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Nov 2019 09:00:22 -0800 (PST) Date: Fri, 8 Nov 2019 18:00:20 +0100 From: Guillaume Nault To: David Ahern Cc: netdev@vger.kernel.org, Nicolas Dichtel Subject: [PATCH iproute2-next 5/5] ipnetns: remove blank lines printed by invarg() messages Message-ID: References: MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/1.12.1 (2019-06-15) X-MC-Unique: jRHI6aP_PmWMpWW7uS9Hgg-1 X-Mimecast-Spam-Score: 0 Content-Disposition: inline Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Since invarg() automatically adds a '\n' character, having one in the error message generates an extra blank line. Signed-off-by: Guillaume Nault --- ip/ipnetns.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ip/ipnetns.c b/ip/ipnetns.c index 4eb4a09a..b22e5d62 100644 --- a/ip/ipnetns.c +++ b/ip/ipnetns.c @@ -439,10 +439,10 @@ static int netns_list_id(int argc, char **argv) NEXT_ARG(); if (get_integer(&filter.target_nsid, *argv, 0)) - invarg("\"target-nsid\" value is invalid\n", + invarg("\"target-nsid\" value is invalid", *argv); else if (filter.target_nsid < 0) - invarg("\"target-nsid\" value should be >= 0\n", + invarg("\"target-nsid\" value should be >= 0", argv[1]); } else if (strcmp(*argv, "nsid") == 0) { if (nsid >= 0) @@ -450,9 +450,9 @@ static int netns_list_id(int argc, char **argv) NEXT_ARG(); if (get_integer(&nsid, *argv, 0)) - invarg("\"nsid\" value is invalid\n", *argv); + invarg("\"nsid\" value is invalid", *argv); else if (nsid < 0) - invarg("\"nsid\" value should be >= 0\n", + invarg("\"nsid\" value should be >= 0", argv[1]); } else usage(); @@ -932,9 +932,9 @@ static int netns_set(int argc, char **argv) if (strcmp(argv[1], "auto") == 0) nsid = -1; else if (get_integer(&nsid, argv[1], 0)) - invarg("Invalid \"netnsid\" value\n", argv[1]); + invarg("Invalid \"netnsid\" value", argv[1]); else if (nsid < 0) - invarg("\"netnsid\" value should be >= 0\n", argv[1]); + invarg("\"netnsid\" value should be >= 0", argv[1]); snprintf(netns_path, sizeof(netns_path), "%s/%s", NETNS_RUN_DIR, name); netns = open(netns_path, O_RDONLY | O_CLOEXEC);