diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2015-12-24 14:12:44 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2015-12-24 14:12:44 +0000 |
| commit | 3f9edfcd6c16fa9ee76196cb366ba73ec87777ee (patch) | |
| tree | 20901212d63d8d5e660c52c5908e2aa68059dbc8 | |
| parent | 49ab3cfd267a65cb64ef323ac9ca0518966661ce (diff) | |
Add prototype for gpt_chk_mbr() to i386_installboot.c. Add 'static' to
declarations of gpt_chk_mbr() to match prototypes in efidev.c and
softraid.c.
| -rw-r--r-- | sys/arch/amd64/stand/efiboot/efidev.c | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/libsa/softraid.c | 4 | ||||
| -rw-r--r-- | usr.sbin/installboot/i386_installboot.c | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/sys/arch/amd64/stand/efiboot/efidev.c b/sys/arch/amd64/stand/efiboot/efidev.c index 85e69eff7a6..fe798d9a92c 100644 --- a/sys/arch/amd64/stand/efiboot/efidev.c +++ b/sys/arch/amd64/stand/efiboot/efidev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: efidev.c,v 1.11 2015/11/29 15:35:41 krw Exp $ */ +/* $OpenBSD: efidev.c,v 1.12 2015/12/24 14:12:43 krw Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -170,7 +170,7 @@ efid_diskio(int rw, struct diskinfo *dip, u_int off, int nsect, void *buf) * * NOTE: MS always uses a size of UINT32_MAX for the EFI partition!** */ -int +static int gpt_chk_mbr(struct dos_partition *dp, efi_diskinfo_t ed) { struct dos_partition *dp2; diff --git a/sys/arch/amd64/stand/libsa/softraid.c b/sys/arch/amd64/stand/libsa/softraid.c index 738bb36a5ec..21b7289c3da 100644 --- a/sys/arch/amd64/stand/libsa/softraid.c +++ b/sys/arch/amd64/stand/libsa/softraid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid.c,v 1.18 2015/12/24 05:14:18 krw Exp $ */ +/* $OpenBSD: softraid.c,v 1.19 2015/12/24 14:12:43 krw Exp $ */ /* * Copyright (c) 2012 Joel Sing <jsing@openbsd.org> @@ -407,7 +407,7 @@ sr_strategy(struct sr_boot_volume *bv, int rw, daddr32_t blk, size_t size, * * NOTE: MS always uses a size of UINT32_MAX for the EFI partition!** */ -int +static int gpt_chk_mbr(struct dos_partition *dp, struct sr_boot_volume *bv) { struct dos_partition *dp2; diff --git a/usr.sbin/installboot/i386_installboot.c b/usr.sbin/installboot/i386_installboot.c index 8d1cf1302e5..933e25a4df7 100644 --- a/usr.sbin/installboot/i386_installboot.c +++ b/usr.sbin/installboot/i386_installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i386_installboot.c,v 1.22 2015/12/20 18:04:34 rpe Exp $ */ +/* $OpenBSD: i386_installboot.c,v 1.23 2015/12/24 14:12:43 krw Exp $ */ /* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */ /* @@ -90,6 +90,7 @@ static void devread(int, void *, daddr_t, size_t, char *); static u_int findopenbsd(int, struct disklabel *); static int getbootparams(char *, int, struct disklabel *); static char *loadproto(char *, long *); +static int gpt_chk_mbr(struct dos_partition *, struct disklabel *); /* * Read information about /boot's inode and filesystem parameters, then @@ -454,7 +455,7 @@ again: * * NOTE: MS always uses a size of UINT32_MAX for the EFI partition!** */ -int +static int gpt_chk_mbr(struct dos_partition *dp, struct disklabel *lp) { struct dos_partition *dp2; |