From b94f39ceccad9ccf4d118ead7f54e09b1cc38eed Mon Sep 17 00:00:00 2001
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Mon, 2 Apr 2007 00:15:45 +0000
Subject: [PATCH] Style:  bare "unsigned" is deprecated, use "unsigned int"
 instead.

Thanks to: Joerg Sonnenberger
---
 lib/libarchive/archive_check_magic.c | 8 ++++----
 lib/libarchive/archive_private.h     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/libarchive/archive_check_magic.c b/lib/libarchive/archive_check_magic.c
index 7225da3e63f1..d9cfbc62c6c3 100644
--- a/lib/libarchive/archive_check_magic.c
+++ b/lib/libarchive/archive_check_magic.c
@@ -72,9 +72,9 @@ state_name(unsigned s)
 
 
 static void
-write_all_states(int states)
+write_all_states(unsigned int states)
 {
-	unsigned lowbit;
+	unsigned int lowbit;
 
 	/* A trick for computing the lowest set bit. */
 	while ((lowbit = states & (-states)) != 0) {
@@ -92,8 +92,8 @@ write_all_states(int states)
  * the libarchive API.
  */
 void
-__archive_check_magic(struct archive *a, unsigned magic, unsigned state,
-    const char *function)
+__archive_check_magic(struct archive *a, unsigned int magic,
+    unsigned int state, const char *function)
 {
 	if (a->magic != magic) {
 		errmsg("INTERNAL ERROR: Function ");
diff --git a/lib/libarchive/archive_private.h b/lib/libarchive/archive_private.h
index a6b7fd6575da..a75489d7e33a 100644
--- a/lib/libarchive/archive_private.h
+++ b/lib/libarchive/archive_private.h
@@ -63,8 +63,8 @@ struct archive {
 	 * ridiculous time, or the client passes us an invalid
 	 * pointer, these values allow me to catch that.
 	 */
-	unsigned	  magic;
-	unsigned	  state;
+	unsigned int	magic;
+	unsigned int	state;
 
 	/*
 	 * Some public API functions depend on the "real" type of the
@@ -89,8 +89,8 @@ struct archive {
 };
 
 /* Check magic value and state; exit if it isn't valid. */
-void	__archive_check_magic(struct archive *, unsigned magic,
-	    unsigned state, const char *func);
+void	__archive_check_magic(struct archive *, unsigned int magic,
+	    unsigned int state, const char *func);
 
 void	__archive_errx(int retvalue, const char *msg);