Module Name: src
Committed By: msaitoh
Date: Fri Jun 14 03:54:43 UTC 2013
Modified Files:
src/usr.sbin/installboot/arch: amiga.c hp300.c hp700.c i386.c next68k.c
Log Message:
Remove trailng whitespaces.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/installboot/arch/amiga.c \
src/usr.sbin/installboot/arch/next68k.c
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/installboot/arch/hp300.c
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/installboot/arch/hp700.c
cvs rdiff -u -r1.39 -r1.40 src/usr.sbin/installboot/arch/i386.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/installboot/arch/amiga.c
diff -u src/usr.sbin/installboot/arch/amiga.c:1.7 src/usr.sbin/installboot/arch/amiga.c:1.8
--- src/usr.sbin/installboot/arch/amiga.c:1.7 Thu Jan 14 16:27:49 2010
+++ src/usr.sbin/installboot/arch/amiga.c Fri Jun 14 03:54:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: amiga.c,v 1.7 2010/01/14 16:27:49 tsutsui Exp $ */
+/* $NetBSD: amiga.c,v 1.8 2013/06/14 03:54:43 msaitoh Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if !defined(__lint)
-__RCSID("$NetBSD: amiga.c,v 1.7 2010/01/14 16:27:49 tsutsui Exp $");
+__RCSID("$NetBSD: amiga.c,v 1.8 2013/06/14 03:54:43 msaitoh Exp $");
#endif /* !__lint */
#include <sys/param.h>
@@ -76,7 +76,7 @@ amiga_setboot(ib_params *params)
char *dline;
int sumlen;
u_int32_t sum2, sum16;
-
+
struct stat bootstrapsb;
u_int32_t block[128*16];
Index: src/usr.sbin/installboot/arch/next68k.c
diff -u src/usr.sbin/installboot/arch/next68k.c:1.7 src/usr.sbin/installboot/arch/next68k.c:1.8
--- src/usr.sbin/installboot/arch/next68k.c:1.7 Thu Jan 7 13:26:00 2010
+++ src/usr.sbin/installboot/arch/next68k.c Fri Jun 14 03:54:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: next68k.c,v 1.7 2010/01/07 13:26:00 tsutsui Exp $ */
+/* $NetBSD: next68k.c,v 1.8 2013/06/14 03:54:43 msaitoh Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#if !defined(__lint)
-__RCSID("$NetBSD: next68k.c,v 1.7 2010/01/07 13:26:00 tsutsui Exp $");
+__RCSID("$NetBSD: next68k.c,v 1.8 2013/06/14 03:54:43 msaitoh Exp $");
#endif /* !__lint */
#include <sys/param.h>
@@ -154,7 +154,7 @@ next68k_setboot(ib_params *params)
goto done;
}
- if (bootsize > be16toh(next68klabel->cd_front) * cd_secsize -
+ if (bootsize > be16toh(next68klabel->cd_front) * cd_secsize -
NEXT68K_LABEL_SIZE) {
warnx("Boot program is larger than front porch space");
goto done;
@@ -174,7 +174,7 @@ next68k_setboot(ib_params *params)
/* can only fit one copy */
b0 = b1 = NEXT68K_LABEL_SIZE / cd_secsize;
else {
- if (2 * bootsize > (fp * cd_secsize -
+ if (2 * bootsize > (fp * cd_secsize -
NEXT68K_LABEL_DEFAULTBOOT0_1 *
params->sectorsize))
/* can fit two copies starting after label */
@@ -230,7 +230,7 @@ next68k_setboot(ib_params *params)
goto done;
}
}
-
+
b0 *= sec_netonb_mult;
b1 *= sec_netonb_mult;
@@ -247,7 +247,7 @@ next68k_setboot(ib_params *params)
goto done;
}
if ((size_t)rv != bootsize) {
- warnx("Writing `%s' at %d: short write",
+ warnx("Writing `%s' at %d: short write",
params->filesystem, b0);
goto done;
}
Index: src/usr.sbin/installboot/arch/hp300.c
diff -u src/usr.sbin/installboot/arch/hp300.c:1.14 src/usr.sbin/installboot/arch/hp300.c:1.15
--- src/usr.sbin/installboot/arch/hp300.c:1.14 Fri May 3 21:32:04 2013
+++ src/usr.sbin/installboot/arch/hp300.c Fri Jun 14 03:54:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: hp300.c,v 1.14 2013/05/03 21:32:04 matt Exp $ */
+/* $NetBSD: hp300.c,v 1.15 2013/06/14 03:54:43 msaitoh Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#if !defined(__lint)
-__RCSID("$NetBSD: hp300.c,v 1.14 2013/05/03 21:32:04 matt Exp $");
+__RCSID("$NetBSD: hp300.c,v 1.15 2013/06/14 03:54:43 msaitoh Exp $");
#endif /* !__lint */
/* We need the target disklabel.h, not the hosts one..... */
@@ -43,7 +43,7 @@ __RCSID("$NetBSD: hp300.c,v 1.14 2013/05
#include "nbtool_config.h"
#include <nbinclude/hp300/disklabel.h>
#include <nbinclude/sys/disklabel.h>
-#else
+#else
#include <sys/disklabel.h>
#endif
#include <sys/fcntl.h>
Index: src/usr.sbin/installboot/arch/hp700.c
diff -u src/usr.sbin/installboot/arch/hp700.c:1.5 src/usr.sbin/installboot/arch/hp700.c:1.6
--- src/usr.sbin/installboot/arch/hp700.c:1.5 Mon Jan 9 11:44:53 2012
+++ src/usr.sbin/installboot/arch/hp700.c Fri Jun 14 03:54:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: hp700.c,v 1.5 2012/01/09 11:44:53 skrll Exp $ */
+/* $NetBSD: hp700.c,v 1.6 2013/06/14 03:54:43 msaitoh Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -35,14 +35,14 @@
#include <sys/cdefs.h>
#if !defined(__lint)
-__RCSID("$NetBSD: hp700.c,v 1.5 2012/01/09 11:44:53 skrll Exp $");
+__RCSID("$NetBSD: hp700.c,v 1.6 2013/06/14 03:54:43 msaitoh Exp $");
#endif /* !__lint */
/* We need the target disklabel.h, not the hosts one..... */
#ifdef HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#include <nbinclude/sys/disklabel.h>
-#else
+#else
#include <sys/disklabel.h>
#endif
#include <sys/param.h>
Index: src/usr.sbin/installboot/arch/i386.c
diff -u src/usr.sbin/installboot/arch/i386.c:1.39 src/usr.sbin/installboot/arch/i386.c:1.40
--- src/usr.sbin/installboot/arch/i386.c:1.39 Fri Apr 6 10:10:11 2012
+++ src/usr.sbin/installboot/arch/i386.c Fri Jun 14 03:54:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.39 2012/04/06 10:10:11 gson Exp $ */
+/* $NetBSD: i386.c,v 1.40 2013/06/14 03:54:43 msaitoh Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#if !defined(__lint)
-__RCSID("$NetBSD: i386.c,v 1.39 2012/04/06 10:10:11 gson Exp $");
+__RCSID("$NetBSD: i386.c,v 1.40 2013/06/14 03:54:43 msaitoh Exp $");
#endif /* !__lint */
#include <sys/param.h>
@@ -185,7 +185,7 @@ write_boot_area(ib_params *params, uint8
bad_write:
if (rv == -1)
warn("Writing `%s'", params->filesystem);
- else
+ else
warnx("Writing `%s': short write, %u bytes",
params->filesystem, rv);
return 0;
