From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 301101397EF for ; Thu, 20 Aug 2015 13:32:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 790D514145; Thu, 20 Aug 2015 13:32:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2BE4014145 for ; Thu, 20 Aug 2015 13:32:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 129263408CF for ; Thu, 20 Aug 2015 13:32:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A13F1155 for ; Thu, 20 Aug 2015 13:32:35 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1440070849.0fccfd92e7de1c339cfa11d40f3c51969424a4c3.vapier@gentoo> Subject: [gentoo-commits] proj/pax-utils:master commit in: / X-VCS-Repository: proj/pax-utils X-VCS-Files: paxelf.c scanelf.c scanmacho.c X-VCS-Directories: / X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 0fccfd92e7de1c339cfa11d40f3c51969424a4c3 X-VCS-Branch: master Date: Thu, 20 Aug 2015 13:32:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 855c6d92-463c-4674-a2c7-45808f0458f0 X-Archives-Hash: 4a59bed31d9b53c70b3f6712f7ef083f commit: 0fccfd92e7de1c339cfa11d40f3c51969424a4c3 Author: Mike Frysinger gentoo org> AuthorDate: Thu Aug 20 11:40:10 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Thu Aug 20 11:40:49 2015 +0000 URL: https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=0fccfd92 avoid using \n with warn macros These already append a newline for us, so don't want two of them. paxelf.c | 2 +- scanelf.c | 2 +- scanmacho.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/paxelf.c b/paxelf.c index 2bafda4..b0ba144 100644 --- a/paxelf.c +++ b/paxelf.c @@ -697,7 +697,7 @@ char *pax_short_pf_flags(unsigned long flags) ((flags & PF_RANDEXEC) && (flags & PF_NORANDEXEC)) || \ ((flags & PF_EMUTRAMP) && (flags & PF_NOEMUTRAMP)) || \ ((flags & PF_RANDMMAP) && (flags & PF_NORANDMMAP))) - warn("inconsistent state detected. flags=%lX\n", flags); + warn("inconsistent state detected. flags=%lX", flags); return buffer; } diff --git a/scanelf.c b/scanelf.c index 2591e92..99192b2 100644 --- a/scanelf.c +++ b/scanelf.c @@ -1842,7 +1842,7 @@ static int scanelf_dirat(int dir_fd, const char *path) len = strlen(dentry->d_name); if (len + pathlen + 1 >= sizeof(buf)) { - warnf("Skipping '%s%s': len > sizeof(buf); %zu > %zu\n", + warnf("Skipping '%s%s': len > sizeof(buf); %zu > %zu", path, dentry->d_name, len + pathlen + 1, sizeof(buf)); continue; } diff --git a/scanmacho.c b/scanmacho.c index f8c4d89..ee713f9 100644 --- a/scanmacho.c +++ b/scanmacho.c @@ -472,8 +472,8 @@ static int scanmacho_dir(const char *path) continue; len = (pathlen + 1 + strlen(dentry->d_name) + 1); if (len >= sizeof(buf)) { - warnf("Skipping '%s': len > sizeof(buf); %lu > %lu\n", path, - (unsigned long)len, (unsigned long)sizeof(buf)); + warnf("Skipping '%s': len > sizeof(buf); %zu > %zu", + path, len, sizeof(buf)); continue; } snprintf(buf, sizeof(buf), "%s%s%s", path, (path[pathlen-1] == '/') ? "" : "/", dentry->d_name);