From: Tim Kientzle <kientzle@gmail.com>
Date: Thu, 6 Aug 2009 04:59:41 +0000 (-0400)
Subject: Remove major()/minor() in favor of the archive_entry functions.
X-Git-Tag: v2.8.0~442
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2770349ea0ad4d2995e81f5b703cdbaf136a220f;p=thirdparty%2Flibarchive.git

Remove major()/minor() in favor of the archive_entry functions.

SVN-Revision: 1346
---

diff --git a/cpio/cpio.c b/cpio/cpio.c
index 7b515f6c6..5b2a9afa5 100644
--- a/cpio/cpio.c
+++ b/cpio/cpio.c
@@ -975,8 +975,8 @@ list_item_verbose(struct cpio *cpio, struct archive_entry *entry)
 	/* Print device number or file size. */
 	if (S_ISCHR(st->st_mode) || S_ISBLK(st->st_mode)) {
 		snprintf(size, sizeof(size), "%lu,%lu",
-		    (unsigned long)major(st->st_rdev),
-		    (unsigned long)minor(st->st_rdev)); /* ls(1) also casts here. */
+		    (unsigned long)archive_entry_rdevmajor(entry),
+		    (unsigned long)archive_entry_rdevminor(entry));
 	} else {
 		snprintf(size, sizeof(size), CPIO_FILESIZE_PRINTF,
 		    (CPIO_FILESIZE_TYPE)st->st_size);