summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorweingart <weingart@openbsd.org>2001-01-28 00:51:46 +0000
committerweingart <weingart@openbsd.org>2001-01-28 00:51:46 +0000
commit108d94f1aabe3a2cfb73dc42279f740b75dab219 (patch)
treee5c75f75c0593989695fb0a52c8aad0f346cba9b
parent- fix typos (diff)
downloadwireguard-openbsd-108d94f1aabe3a2cfb73dc42279f740b75dab219.tar.xz
wireguard-openbsd-108d94f1aabe3a2cfb73dc42279f740b75dab219.zip
Quick -Wall fixes, ok niklas@, aaron@
-rw-r--r--sbin/fdisk/mbr.c9
-rw-r--r--sbin/fdisk/mbr.h5
2 files changed, 10 insertions, 4 deletions
diff --git a/sbin/fdisk/mbr.c b/sbin/fdisk/mbr.c
index e5076e00cb7..6b59a887900 100644
--- a/sbin/fdisk/mbr.c
+++ b/sbin/fdisk/mbr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mbr.c,v 1.11 2000/07/07 13:37:00 rahnds Exp $ */
+/* $OpenBSD: mbr.c,v 1.12 2001/01/28 00:51:46 weingart Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -36,6 +36,7 @@
#include <unistd.h>
#include <memory.h>
#include <sys/fcntl.h>
+#include <sys/ioctl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/disklabel.h>
@@ -46,7 +47,11 @@
#include "mbr.h"
#include "part.h"
-MBR_init(disk_t *disk, mbr_t *mbr)
+
+void
+MBR_init(disk, mbr)
+ disk_t *disk;
+ mbr_t *mbr;
{
/* Fix up given mbr for this disk */
mbr->part[0].flag = 0;
diff --git a/sbin/fdisk/mbr.h b/sbin/fdisk/mbr.h
index d91f14a5a79..30edbed38a4 100644
--- a/sbin/fdisk/mbr.h
+++ b/sbin/fdisk/mbr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mbr.h,v 1.4 1998/09/14 03:54:35 rahnds Exp $ */
+/* $OpenBSD: mbr.h,v 1.5 2001/01/28 00:51:47 weingart Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -60,13 +60,14 @@ void MBR_print_disk __P((char *));
void MBR_print __P((mbr_t *));
void MBR_parse __P((disk_t *, char *, off_t, off_t, mbr_t *));
void MBR_make __P((mbr_t *, char *));
+void MBR_init __P((disk_t *, mbr_t *));
int MBR_read __P((int, off_t, char *));
int MBR_write __P((int, off_t, char *));
/* Sanity check */
#include <machine/param.h>
#if (DEV_BSIZE != 512)
-#error "DEV_BSIZE != 512, somebody better fix!"
+#error "DEV_BSIZE != 512, somebody better fix me!"
#endif
#endif _MBR_H