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

SVN-Revision: 1346

diff --git a/cpio/cpio.c b/cpio/cpio.c
index 7b515f6c6b7dd4f82d3eac48ff10adf158a2fa14..5b2a9afa5ae774c899f5f109a8b1387e27040d41 100644 (file)
--- 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);