Netdev List
 help / color / mirror / Atom feed
From: Jakub Kicinski <jakub.kicinski@netronome.com>
To: netdev@vger.kernel.org
Cc: oss-drivers@netronome.com, Quentin Monnet <quentin.monnet@netronome.com>
Subject: [PATCH net 4/6] tools: bpftool: remove spurious line break from error message
Date: Tue, 28 Nov 2017 17:44:31 -0800	[thread overview]
Message-ID: <20171129014434.31694-5-jakub.kicinski@netronome.com> (raw)
In-Reply-To: <20171129014434.31694-1-jakub.kicinski@netronome.com>

From: Quentin Monnet <quentin.monnet@netronome.com>

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 <jakub.kicinski@netronome.com>
Signed-off-by: Quentin Monnet <quentin.monnet@netronome.com>
Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
---
 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
 
-- 
2.14.1

  parent reply	other threads:[~2017-11-29  1:45 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-29  1:44 [PATCH net 0/6] tools: bpftool: fix a minor issues with JSON and Makefiles Jakub Kicinski
2017-11-29  1:44 ` [PATCH net 1/6] tools: bpftool: fix crash on bad parameters with JSON Jakub Kicinski
2017-11-29  1:44 ` [PATCH net 2/6] tools: bpftool: clean up the JSON writer before exiting in usage() Jakub Kicinski
2017-11-29  1:44 ` [PATCH net 3/6] tools: bpftool: make error message from getopt_long() JSON-friendly Jakub Kicinski
2017-11-29  1:44 ` Jakub Kicinski [this message]
2017-11-29  1:44 ` [PATCH net 5/6] tools: bpftool: unify installation directories Jakub Kicinski
2017-11-29  1:44 ` [PATCH net 6/6] tools: bpftool: declare phony targets as such Jakub Kicinski
2017-11-30  1:17 ` [PATCH net 0/6] tools: bpftool: fix a minor issues with JSON and Makefiles Daniel Borkmann

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=20171129014434.31694-5-jakub.kicinski@netronome.com \
    --to=jakub.kicinski@netronome.com \
    --cc=netdev@vger.kernel.org \
    --cc=oss-drivers@netronome.com \
    --cc=quentin.monnet@netronome.com \
    /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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox