From patchwork Wed Nov 29 01:44:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 842392 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="jsgD/rWN"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ymjzl2hlNz9sBd for ; Wed, 29 Nov 2017 12:45:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753518AbdK2Bpx (ORCPT ); Tue, 28 Nov 2017 20:45:53 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:44137 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753210AbdK2Bpj (ORCPT ); Tue, 28 Nov 2017 20:45:39 -0500 Received: by mail-pf0-f195.google.com with SMTP id m26so804616pfj.11 for ; Tue, 28 Nov 2017 17:45:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=avmZjhFjC46msaAvaPWq71sHHlzaODd46omVMKJaPn0=; b=jsgD/rWNi8U+AoQfLcP5o7p8XCCW4Jz2+7MdeMVPCH/b9WmlP7T0UiLqgq7ijVhR+G 5bo0t0Dqz9OIG4UBn1m4VWfn6k3G+jqe5whvX6lYDvyOyh/LsJ21tYUf4wEB/q2brUt9 lc5/qnfhAEg1tjxWdxc2nQUhHbmMWfB0qhuhLUDnY/qOAH0Rw716VY8VLt69hcWefMPI FrcjkRAsCCkC2L+K/z9Quq3O4qZVaElSUaYcs3l0As9g/0JitynnmEmE8/w6RxatPGEc 6hWCLohlciwUaYL20IckHWT5INUCkVPEJhnGVlbkm8h4unMXl9qohWiMuMwT7ty6wdIv qY3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=avmZjhFjC46msaAvaPWq71sHHlzaODd46omVMKJaPn0=; b=ufNfR65OYcjmCyFOjxQKIG4rgj4pJuQdRNeQxcHrcVAuz+Jeho9GdltIVphx2W6xQo j9ot3ZudkB+nsV/oQV5JYh6Fr6e2oGjMvV6rimIluNa0JH66poQyt7+CfccRCTeQc/dk Rt2eIs7K0l/YQx1yAPKhqYL/nVQ1UZd1FlCfAwjxlFgcJsfAi70fNFXL+R58luVXTWB+ 09UR654SMo1spZEaRVLE3kVHZb3zSiyP27ttpFhvriff9j1n6VAFeqNDCUg3DmLP+e5l 7TzqxKpKG4s5npX/lyf7m+YBm9Z2vlVAyr/ALeS8/9rvJLKPRJoJzTkWglvRa33dDW9l q7oA== X-Gm-Message-State: AJaThX7RI4Lt4UtEzYsA5fJd7c9IL0Fp2ZcG7GTDhbCdmKWk3DUxnnwb iuVZhGqtNqVzGlVMI8Pb9wMq3FLV X-Google-Smtp-Source: AGs4zMbYqHRqlmsLWzG4MU2VEU8u0fZrkReMEQnra+dIeFFYnx4FlrdAY2WEkfJdlLKKbhF2XNr5Gw== X-Received: by 10.99.43.5 with SMTP id r5mr1187182pgr.348.1511919938582; Tue, 28 Nov 2017 17:45:38 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id f79sm495625pfd.45.2017.11.28.17.45.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Nov 2017 17:45:38 -0800 (PST) From: Jakub Kicinski To: netdev@vger.kernel.org Cc: oss-drivers@netronome.com, Quentin Monnet Subject: [PATCH net 4/6] tools: bpftool: remove spurious line break from error message Date: Tue, 28 Nov 2017 17:44:31 -0800 Message-Id: <20171129014434.31694-5-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171129014434.31694-1-jakub.kicinski@netronome.com> References: <20171129014434.31694-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Quentin Monnet The end-of-line character inside the string would break JSON compliance. Remove it, `p_err()` already adds a '\n' character for plain output anyway. Fixes: 9a5ab8bf1d6d ("tools: bpftool: turn err() and info() macros into functions") Reported-by: Jakub Kicinski Signed-off-by: Quentin Monnet Acked-by: Jakub Kicinski --- tools/bpf/bpftool/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/bpf/bpftool/main.h b/tools/bpf/bpftool/main.h index 0b60ddfb2b93..bff330b49791 100644 --- a/tools/bpf/bpftool/main.h +++ b/tools/bpf/bpftool/main.h @@ -51,7 +51,7 @@ #define NEXT_ARG() ({ argc--; argv++; if (argc < 0) usage(); }) #define NEXT_ARGP() ({ (*argc)--; (*argv)++; if (*argc < 0) usage(); }) -#define BAD_ARG() ({ p_err("what is '%s'?\n", *argv); -1; }) +#define BAD_ARG() ({ p_err("what is '%s'?", *argv); -1; }) #define ERR_MAX_LEN 1024