[gentoo-commits] proj/pax-utils:master commit in: /

[Mike Frysinger]

commit:     0fccfd92e7de1c339cfa11d40f3c51969424a4c3
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 11:40:10 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> 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);