aboutsummaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorColin Percival <cperciva@FreeBSD.org>2008-05-22 21:08:36 +0000
committerColin Percival <cperciva@FreeBSD.org>2008-05-22 21:08:36 +0000
commit990662f170790cda8e0c8ad9f308c381eeae05c0 (patch)
tree761358248070311c176d7217dfa562598e0c7bf4 /usr.bin
parentc7b3d8e28a5c4653d5b0b964c88b248462b3f98c (diff)
downloadsrc-990662f170790cda8e0c8ad9f308c381eeae05c0.tar.gz
src-990662f170790cda8e0c8ad9f308c381eeae05c0.zip
Notes
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/tar/bsdtar.h2
-rw-r--r--usr.bin/tar/siginfo.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/tar/bsdtar.h b/usr.bin/tar/bsdtar.h
index 62be3ccab5e2..ee2550883dfb 100644
--- a/usr.bin/tar/bsdtar.h
+++ b/usr.bin/tar/bsdtar.h
@@ -96,7 +96,7 @@ struct bsdtar {
struct matching *matching; /* for matching.c */
struct security *security; /* for read.c */
struct name_cache *uname_cache; /* for write.c */
- struct siginfo *siginfo; /* for siginfo.c */
+ struct siginfo_data *siginfo; /* for siginfo.c */
};
void bsdtar_errc(struct bsdtar *, int _eval, int _code,
diff --git a/usr.bin/tar/siginfo.c b/usr.bin/tar/siginfo.c
index e55308bf5e46..f0269a10f67d 100644
--- a/usr.bin/tar/siginfo.c
+++ b/usr.bin/tar/siginfo.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
/* Is there a pending SIGINFO or SIGUSR1? */
static volatile sig_atomic_t siginfo_received = 0;
-struct 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 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. */