From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Wed, 30 Mar 2011 12:55:58 +0000 (-0400)
Subject: Correct a print format of test failure log for file times. its type is `long long... 
X-Git-Tag: v3.0.0a~553
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dfb82f1776079d0557f2ec0ea69e8c90fe29c6f;p=thirdparty%2Flibarchive.git

Correct a print format of test failure log for file times. its type is `long long' not `long'.

SVN-Revision: 3128
---

diff --git a/cpio/test/main.c b/cpio/test/main.c
index 9a658da18..c0166f692 100644
--- a/cpio/test/main.c
+++ b/cpio/test/main.c
@@ -1086,14 +1086,14 @@ assertion_file_time(const char *file, int line,
 		time_t now = time(NULL);
 		if (filet < now - 10 || filet > now + 1) {
 			failure_start(file, line,
-			    "File %s has %ctime %ld, %ld seconds ago\n",
+			    "File %s has %ctime %lld, %lld seconds ago\n",
 			    pathname, type, filet, now - filet);
 			failure_finish(NULL);
 			return (0);
 		}
 	} else if (filet != t || filet_nsec != nsec) {
 		failure_start(file, line,
-		    "File %s has %ctime %ld.%09ld, expected %ld.%09ld",
+		    "File %s has %ctime %lld.%09lld, expected %lld.%09lld",
 		    pathname, type, filet, filet_nsec, t, nsec);
 		failure_finish(NULL);
 		return (0);
diff --git a/libarchive/test/main.c b/libarchive/test/main.c
index 7ed047c17..4cc8f4f81 100644
--- a/libarchive/test/main.c
+++ b/libarchive/test/main.c
@@ -1100,14 +1100,14 @@ assertion_file_time(const char *file, int line,
 		time_t now = time(NULL);
 		if (filet < now - 10 || filet > now + 1) {
 			failure_start(file, line,
-			    "File %s has %ctime %ld, %ld seconds ago\n",
+			    "File %s has %ctime %lld, %lld seconds ago\n",
 			    pathname, type, filet, now - filet);
 			failure_finish(NULL);
 			return (0);
 		}
 	} else if (filet != t || filet_nsec != nsec) {
 		failure_start(file, line,
-		    "File %s has %ctime %ld.%09ld, expected %ld.%09ld",
+		    "File %s has %ctime %lld.%09lld, expected %lld.%09lld",
 		    pathname, type, filet, filet_nsec, t, nsec);
 		failure_finish(NULL);
 		return (0);
diff --git a/tar/test/main.c b/tar/test/main.c
index fc8449c62..ea8cff2b9 100644
--- a/tar/test/main.c
+++ b/tar/test/main.c
@@ -1086,14 +1086,14 @@ assertion_file_time(const char *file, int line,
 		time_t now = time(NULL);
 		if (filet < now - 10 || filet > now + 1) {
 			failure_start(file, line,
-			    "File %s has %ctime %ld, %ld seconds ago\n",
+			    "File %s has %ctime %lld, %lld seconds ago\n",
 			    pathname, type, filet, now - filet);
 			failure_finish(NULL);
 			return (0);
 		}
 	} else if (filet != t || filet_nsec != nsec) {
 		failure_start(file, line,
-		    "File %s has %ctime %ld.%09ld, expected %ld.%09ld",
+		    "File %s has %ctime %lld.%09lld, expected %lld.%09lld",
 		    pathname, type, filet, filet_nsec, t, nsec);
 		failure_finish(NULL);
 		return (0);