d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve portability via s/struct siginfo/struct siginfo_data/. This was

Browse Source 
running into a namespace collision on an avian operating system.
This commit is contained in:
Colin Percival 2008-05-22 21:08:36 +00:00
parent c7b3d8e28a
commit 990662f170
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.bin/tar/bsdtar.h
View File

@ -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,

4
usr.bin/tar/siginfo.c
View File

@ -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. */