From: Tim Kientzle <kientzle@gmail.com>
Date: Thu, 22 May 2008 21:51:18 +0000 (-0400)
Subject: IFC
X-Git-Tag: v2.6.0~204
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb36df20ef860ec136545e729dab87e6c04dd3c6;p=thirdparty%2Flibarchive.git

IFC

SVN-Revision: 88
---

diff --git a/tar/bsdtar.h b/tar/bsdtar.h
index bc696e0f6..9d4733c50 100644
--- a/tar/bsdtar.h
+++ b/tar/bsdtar.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/usr.bin/tar/bsdtar.h,v 1.31 2008/05/18 06:24:47 cperciva Exp $
+ * $FreeBSD: src/usr.bin/tar/bsdtar.h,v 1.32 2008/05/22 21:08:36 cperciva Exp $
  */
 
 #include "bsdtar_platform.h"
@@ -97,7 +97,7 @@ struct bsdtar {
 	struct matching		*matching;	/* for matching.c */
 	struct security		*security;	/* for read.c */
 	struct name_cache	*uname_cache;	/* for write.c */
-	struct bsdtar_siginfo	*siginfo;	/* for siginfo.c */
+	struct siginfo_data	*siginfo;	/* for siginfo.c */
 	struct substitution	*substitution;	/* for subst.c */
 };
 
diff --git a/tar/siginfo.c b/tar/siginfo.c
index b5fe3a66f..249ee34a9 100644
--- a/tar/siginfo.c
+++ b/tar/siginfo.c
@@ -24,7 +24,7 @@
  */
 
 #include "bsdtar_platform.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/siginfo.c,v 1.1 2008/05/18 06:24:47 cperciva Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/tar/siginfo.c,v 1.2 2008/05/22 21:08:36 cperciva Exp $");
 
 #include <errno.h>
 #include <signal.h>
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD: src/usr.bin/tar/siginfo.c,v 1.1 2008/05/18 06:24:47 cperciva
 /* Is there a pending SIGINFO or SIGUSR1? */
 static volatile sig_atomic_t siginfo_received = 0;
 
-struct bsdtar_siginfo {
+struct siginfo_data {
 	/* What sort of operation are we doing? */
 	char * oper;
 
@@ -72,7 +72,7 @@ siginfo_init(struct bsdtar *bsdtar)
 {
 
 	/* Allocate space for internal structure. */
-	if ((bsdtar->siginfo = malloc(sizeof(struct bsdtar_siginfo))) == NULL)
+	if ((bsdtar->siginfo = malloc(sizeof(struct siginfo_data))) == NULL)
 		bsdtar_errc(bsdtar, 1, errno, "malloc failed");
 
 	/* Set the strings to NULL so that free() is safe. */