3 files changed, 6 insertions, 8 deletions
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index 368d2f3ed2b..7414d285141 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.c,v 1.170 2010/08/08 05:24:46 tedu Exp $	*/
+/*	$OpenBSD: disklabel.c,v 1.171 2010/08/12 23:32:07 tedu Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993
@@ -115,8 +115,6 @@ int	getasciilabel(FILE *, struct disklabel *);
 int	cmplabel(struct disklabel *, struct disklabel *);
 void	usage(void);
 u_int64_t getnum(char *, u_int64_t, u_int64_t, const char **);
-void	uid_print(FILE *, struct disklabel *);
-int	uid_parse(struct disklabel *, char *);
 
 int
 main(int argc, char *argv[])
@@ -597,7 +595,6 @@ void
 makedisktab(FILE *f, struct disklabel *lp)
 {
 	int i;
-	char *did = "\\\n\t:";
 	struct partition *pp;
 
 	if (lp->d_packname[0])
diff --git a/sbin/disklabel/editor.c b/sbin/disklabel/editor.c
index 21bbcd5a458..a3349e30279 100644
--- a/sbin/disklabel/editor.c
+++ b/sbin/disklabel/editor.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: editor.c,v 1.243 2010/08/10 23:35:08 krw Exp $	*/
+/*	$OpenBSD: editor.c,v 1.244 2010/08/12 23:32:07 tedu Exp $	*/
 
 /*
  * Copyright (c) 1997-2000 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -1616,7 +1616,6 @@ set_bounds(struct disklabel *lp)
 void
 set_uid(struct disklabel *lp)
 {
-	u_int uid[8];
 	char *s;
 	int i;
 
@@ -1836,7 +1835,7 @@ mpsave(struct disklabel *lp)
 	/* Sort mountpoints so we don't try to mount /usr/local before /usr */
 	qsort((void *)mi, MAXPARTITIONS, sizeof(struct mountinfo), micmp);
 
-	if (fp = fopen(fstabfile, "w")) {
+	if ((fp = fopen(fstabfile, "w"))) {
 		for (i = 0; i < MAXPARTITIONS && mi[i].mountpoint; i++) {
 			j =  mi[i].partno;
 			fprintf(fp, "%s%c %s %s rw 1 %d\n", bdev, 'a' + j,
diff --git a/sbin/disklabel/extern.h b/sbin/disklabel/extern.h
index 40ca0da34ce..02230f3704d 100644
--- a/sbin/disklabel/extern.h
+++ b/sbin/disklabel/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.18 2009/08/07 00:26:34 martynas Exp $	*/
+/*	$OpenBSD: extern.h,v 1.19 2010/08/12 23:32:07 tedu Exp $	*/
 
 /*
  * Copyright (c) 2003 Theo de Raadt <deraadt@openbsd.org>
@@ -25,6 +25,8 @@ char	canonical_unit(struct disklabel *, char);
 double	scale(u_int64_t, char, struct disklabel *);
 void	display(FILE *, struct disklabel *, char, int);
 void	display_partition(FILE *, struct disklabel *, int, char);
+void	uid_print(FILE *, struct disklabel *);
+int	uid_parse(struct disklabel *, char *);
 
 void	readlabel(int);
 struct disklabel *makebootarea(char *, struct disklabel *, int);