 @@ -1,14 +1,14 @@
-/*	$NetBSD: mbrlabel.c,v 1.26 2005/12/28 06:03:15 christos Exp $	*/
+/*	$NetBSD: mbrlabel.c,v 1.27 2011/08/27 17:45:30 joerg Exp $	*/
 /*
  * Copyright (C) 1998 Wolfgang Solfrank.
  * Copyright (C) 1998 TooLs GmbH.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -23,108 +23,107 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mbrlabel.c,v 1.26 2005/12/28 06:03:15 christos Exp $");
+__RCSID("$NetBSD: mbrlabel.c,v 1.27 2011/08/27 17:45:30 joerg Exp $");
 #endif /* not lint */
 #include <stdio.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <util.h>
 #include <sys/param.h>
 #define FSTYPENAMES
 #include <sys/disklabel.h>
 #include <sys/bootblock.h>
 #include <sys/ioctl.h>
 #include "dkcksum.h"
 #include "extern.h"
-int	main(int, char **);
+__dead static void	usage(void);
-void	usage(void);
+static void	getlabel(int);
-void	getlabel(int);
+static void	setlabel(int, int);
-void	setlabel(int, int);
+static int	getparts(int, u_int32_t, u_int32_t, int);
-int	getparts(int, u_int32_t, u_int32_t, int);
+static u_int16_t	getshort(void *);
-u_int16_t	getshort(void *);
+static u_int32_t	getlong(void *);
 u_int32_t	getlong(void *);
 struct disklabel label;
-void
+static void
 getlabel(int sd)
+{
 	if (ioctl(sd, DIOCGDINFO, &label) < 0) {
 		perror("get label");
 		exit(1);
+	}
 	/*
 	 * Some ports seem to not set the number of partitions
 	 * correctly, albeit they seem to set the raw partition ok!
 	 */
 	if (label.d_npartitions <= getrawpartition())
 		label.d_npartitions = getrawpartition() + 1;
+}
-void
+static void
 setlabel(int sd, int doraw)
+{
 	int one = 1;
 	label.d_checksum = 0;
 	label.d_checksum = dkcksum(&label);
 	if (ioctl(sd, doraw ? DIOCWDINFO : DIOCSDINFO, &label) < 0) {
 		perror("set label");
 		exit(1);
+	}
 	if (!doraw)
 		/* If we haven't written to the disk, don't discard on close */
 		ioctl(sd, DIOCKLABEL, &one);
+}
-u_int16_t
+static u_int16_t
 getshort(void *p)
+{
 	unsigned char *cp = p;
 	return (cp[0] | (cp[1] << 8));
+}
-u_int32_t
+static u_int32_t
 getlong(void *p)
+{
 	unsigned char *cp = p;
 	return (cp[0] | (cp[1] << 8) | (cp[2] << 16) | (cp[3] << 24));
+}
-int
+static int
 getparts(int sd, u_int32_t off, u_int32_t extoff, int verbose)
+{
 	unsigned char		buf[DEV_BSIZE];
 	struct mbr_partition	parts[MBR_PART_COUNT];
 	struct partition	npe;
 	off_t			loff;
 	int			i, j, unused, changed;
 	changed = 0;
 	loff = (off_t)off * DEV_BSIZE;
 	if (lseek(sd, loff, SEEK_SET) != loff) {
 		perror("seek label");
 @@ -227,27 +226,27 @@ getparts(int sd, u_int32_t off, u_int32_
 				/* recursively scan extended partitions */
 	for (i = 0; i < MBR_PART_COUNT; i++) {
 		u_int32_t poff;
 		if (MBR_IS_EXTENDED(parts[i].mbrp_type)) {
 			poff = getlong(&parts[i].mbrp_start) + extoff;
 			changed += getparts(sd, poff,
 			    extoff ? extoff : poff, verbose);
+		}
+	}
 	return (changed);
+}
-void
+static void
 usage(void)
+{
 	fprintf(stderr, "usage: %s [-fqrw] [-s sector] rawdisk\n",
 	    getprogname());
 	exit(1);
+}
 int
 main(int argc, char **argv)
+{
 	int	sd, ch, changed;
 	char	*ep, name[MAXPATHLEN];