Rename sig_t to avoid conflict with the type of the same name from
sys/signal.h on DragonFly.
This commit is contained in:
parent
c2aaeefffb
commit
393d580d9d
5 changed files with 109 additions and 1 deletions
|
@ -1,7 +1,11 @@
|
||||||
$NetBSD: distinfo,v 1.1.1.1 2005/05/25 10:29:01 agc Exp $
|
$NetBSD: distinfo,v 1.2 2006/10/09 13:23:37 joerg Exp $
|
||||||
|
|
||||||
SHA1 (fatback-1.3.tar.gz) = 0c17a76f64b359ee67ea308e58b668c14c77c699
|
SHA1 (fatback-1.3.tar.gz) = 0c17a76f64b359ee67ea308e58b668c14c77c699
|
||||||
RMD160 (fatback-1.3.tar.gz) = 4a8b29f00e51ea4856e41e94c30dca3e96712a40
|
RMD160 (fatback-1.3.tar.gz) = 4a8b29f00e51ea4856e41e94c30dca3e96712a40
|
||||||
Size (fatback-1.3.tar.gz) = 190800 bytes
|
Size (fatback-1.3.tar.gz) = 190800 bytes
|
||||||
SHA1 (patch-aa) = 7012ffcfc8c50bebf4a2a9accefc62d024cfe1aa
|
SHA1 (patch-aa) = 7012ffcfc8c50bebf4a2a9accefc62d024cfe1aa
|
||||||
SHA1 (patch-ab) = 36fb419f55817375437e2548e6c99cb5b70bf0c5
|
SHA1 (patch-ab) = 36fb419f55817375437e2548e6c99cb5b70bf0c5
|
||||||
|
SHA1 (patch-ac) = f844b30f09716c64347ec500210e17e8431bec7d
|
||||||
|
SHA1 (patch-ad) = 3f0960a7347e8d5c2d6f99849a04133056b36feb
|
||||||
|
SHA1 (patch-ae) = 6419bde4bc1e04e8dcace69d515a366d693f9676
|
||||||
|
SHA1 (patch-af) = f522a1257bdf274983c93147e6b8f293e509d41d
|
||||||
|
|
31
sysutils/fatback/patches/patch-ac
Normal file
31
sysutils/fatback/patches/patch-ac
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
$NetBSD: patch-ac,v 1.1 2006/10/09 13:23:37 joerg Exp $
|
||||||
|
|
||||||
|
--- vbr.c.orig 2006-10-09 15:14:51.000000000 +0000
|
||||||
|
+++ vbr.c
|
||||||
|
@@ -17,7 +17,7 @@
|
||||||
|
#include "vars.h"
|
||||||
|
|
||||||
|
static vbr_t read_vbr(off_t);
|
||||||
|
-static int scheck_vbr(vbr_t, sig_t);
|
||||||
|
+static int scheck_vbr(vbr_t, signature_t);
|
||||||
|
|
||||||
|
enum { OEM_NAME_LEN = 8,
|
||||||
|
LABEL_LEN = 11,
|
||||||
|
@@ -49,7 +49,7 @@ static vbr_t read_vbr(off_t offset)
|
||||||
|
{
|
||||||
|
vbr_t vbr = emalloc(sizeof *vbr);
|
||||||
|
u_int8_t *buffer;
|
||||||
|
- sig_t signature;
|
||||||
|
+ signature_t signature;
|
||||||
|
int fat32_flag = 0;
|
||||||
|
fbvar_t *sectsize_var;
|
||||||
|
unsigned sectsize;
|
||||||
|
@@ -164,7 +164,7 @@ static vbr_t read_vbr(off_t offset)
|
||||||
|
/*
|
||||||
|
* Sanity check the Volume Boot Record
|
||||||
|
*/
|
||||||
|
-static int scheck_vbr(vbr_t vbr, sig_t signature)
|
||||||
|
+static int scheck_vbr(vbr_t vbr, signature_t signature)
|
||||||
|
{
|
||||||
|
unsigned i, invalid = 0;
|
||||||
|
|
17
sysutils/fatback/patches/patch-ad
Normal file
17
sysutils/fatback/patches/patch-ad
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
$NetBSD: patch-ad,v 1.1 2006/10/09 13:23:37 joerg Exp $
|
||||||
|
|
||||||
|
--- sig.h.orig 2006-10-09 15:14:54.000000000 +0000
|
||||||
|
+++ sig.h
|
||||||
|
@@ -4,9 +4,9 @@
|
||||||
|
#define SIG_H
|
||||||
|
|
||||||
|
#include <sys/types.h>
|
||||||
|
-typedef u_int16_t sig_t;
|
||||||
|
+typedef u_int16_t signature_t;
|
||||||
|
|
||||||
|
-extern sig_t read_sig(u_int8_t *);
|
||||||
|
-extern int scheck_sig(sig_t);
|
||||||
|
+extern signature_t read_sig(u_int8_t *);
|
||||||
|
+extern int scheck_sig(signature_t);
|
||||||
|
|
||||||
|
#endif /* SIG_H */
|
25
sysutils/fatback/patches/patch-ae
Normal file
25
sysutils/fatback/patches/patch-ae
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
$NetBSD: patch-ae,v 1.1 2006/10/09 13:23:37 joerg Exp $
|
||||||
|
|
||||||
|
--- sig.c.orig 2006-10-09 15:14:56.000000000 +0000
|
||||||
|
+++ sig.c
|
||||||
|
@@ -4,9 +4,9 @@
|
||||||
|
#include "sig.h"
|
||||||
|
#include "input.h"
|
||||||
|
|
||||||
|
-sig_t read_sig(u_int8_t *buf)
|
||||||
|
+signature_t read_sig(u_int8_t *buf)
|
||||||
|
{
|
||||||
|
- sig_t retval;
|
||||||
|
+ signature_t retval;
|
||||||
|
|
||||||
|
assert(buf);
|
||||||
|
|
||||||
|
@@ -15,7 +15,7 @@ sig_t read_sig(u_int8_t *buf)
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
-int scheck_sig(sig_t sig)
|
||||||
|
+int scheck_sig(signature_t sig)
|
||||||
|
{
|
||||||
|
static const int MBR_SIGNATURE = 0xAA55;
|
||||||
|
|
31
sysutils/fatback/patches/patch-af
Normal file
31
sysutils/fatback/patches/patch-af
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
$NetBSD: patch-af,v 1.1 2006/10/09 13:23:37 joerg Exp $
|
||||||
|
|
||||||
|
--- mbr.c.orig 2006-10-09 15:14:59.000000000 +0000
|
||||||
|
+++ mbr.c
|
||||||
|
@@ -37,7 +37,7 @@ static struct ptable_list_s *Ptable_list
|
||||||
|
|
||||||
|
static struct ptable_list_s *build_ptable(off_t);
|
||||||
|
static int read_ptable(off_t, struct ptable_entry *);
|
||||||
|
-static int scheck_ptable(struct ptable_entry *, sig_t);
|
||||||
|
+static int scheck_ptable(struct ptable_entry *, signature_t);
|
||||||
|
static int scheck_boot_indicator(struct ptable_entry *);
|
||||||
|
static int scheck_sys_indicator(struct ptable_entry *);
|
||||||
|
static int scheck_part_range(struct part_range_s *);
|
||||||
|
@@ -203,7 +203,7 @@ static struct ptable_list_s *build_ptabl
|
||||||
|
static int read_ptable(off_t offset, struct ptable_entry *table)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
- sig_t signature;
|
||||||
|
+ signature_t signature;
|
||||||
|
u_int8_t *index, *buffer;
|
||||||
|
fbvar_t *sectsize_var;
|
||||||
|
unsigned sectsize;
|
||||||
|
@@ -282,7 +282,7 @@ static int is_extended_part(struct ptabl
|
||||||
|
/*
|
||||||
|
* Sanity check a partition table
|
||||||
|
*/
|
||||||
|
-static int scheck_ptable(struct ptable_entry *table, sig_t sig)
|
||||||
|
+static int scheck_ptable(struct ptable_entry *table, signature_t sig)
|
||||||
|
{
|
||||||
|
int i, num_partitions = 0;
|
||||||
|
struct part_range_s prange[NUM_PTABLE_ENTRIES];
|
Loading…
Reference in a new issue