netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: arturo.borrero.glez@gmail.com
Subject: [PATCH nft 3/3] scanner: don't break line on include error message
Date: Tue,  9 Aug 2016 11:29:42 +0200	[thread overview]
Message-ID: <1470734982-10298-3-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1470734982-10298-1-git-send-email-pablo@netfilter.org>

For consistency with other error messages in this codebase, don't add a
line break.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 src/scanner.l | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scanner.l b/src/scanner.l
index cb2ea32..613c3c9 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -644,7 +644,7 @@ int scanner_include_file(void *scanner, const char *filename,
 		name = filename;
 	}
 	if (f == NULL) {
-		erec = error(loc, "Could not open file \"%s\": %s\n",
+		erec = error(loc, "Could not open file \"%s\": %s",
 			     filename, strerror(errno));
 		goto err;
 	}
-- 
2.1.4


      parent reply	other threads:[~2016-08-09  9:30 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-09  9:29 [PATCH nft 1/3] scanner: honor absolute and relative paths via include file Pablo Neira Ayuso
2016-08-09  9:29 ` [PATCH nft 2/3] scanner: don't fall back on current directory if include is not found Pablo Neira Ayuso
2016-08-09  9:29 ` Pablo Neira Ayuso [this message]

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=1470734982-10298-3-git-send-email-pablo@netfilter.org \
    --to=pablo@netfilter.org \
    --cc=arturo.borrero.glez@gmail.com \
    --cc=netfilter-devel@vger.kernel.org \
    /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;
as well as URLs for NNTP newsgroup(s).