Module Name: src
Committed By: snj
Date: Thu May 20 05:32:45 UTC 2010
Modified Files:
src/distrib/utils/sysinst [netbsd-5-0]: mbr.c msg.mbr.de msg.mbr.en
msg.mbr.es msg.mbr.fr msg.mbr.pl
Log Message:
Pull up following revision(s) (requested by martin in ticket #1396):
distrib/utils/sysinst/mbr.c: revision 1.84
distrib/utils/sysinst/msg.mbr.de: revision 1.10
distrib/utils/sysinst/msg.mbr.en: revision 1.14
distrib/utils/sysinst/msg.mbr.es: revision 1.5
distrib/utils/sysinst/msg.mbr.fr: revision 1.16
distrib/utils/sysinst/msg.mbr.pl: revision 1.12
Fix a varargs argument type mismatch on 32bit archs - change format to
explicitly use %lu and cast the passed value accordingly.
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.79.18.1 src/distrib/utils/sysinst/mbr.c
cvs rdiff -u -r1.8 -r1.8.26.1 src/distrib/utils/sysinst/msg.mbr.de
cvs rdiff -u -r1.13 -r1.13.34.1 src/distrib/utils/sysinst/msg.mbr.en
cvs rdiff -u -r1.4 -r1.4.34.1 src/distrib/utils/sysinst/msg.mbr.es
cvs rdiff -u -r1.14 -r1.14.32.1 src/distrib/utils/sysinst/msg.mbr.fr
cvs rdiff -u -r1.11 -r1.11.32.1 src/distrib/utils/sysinst/msg.mbr.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/mbr.c
diff -u src/distrib/utils/sysinst/mbr.c:1.79 src/distrib/utils/sysinst/mbr.c:1.79.18.1
--- src/distrib/utils/sysinst/mbr.c:1.79 Fri Dec 28 00:48:43 2007
+++ src/distrib/utils/sysinst/mbr.c Thu May 20 05:32:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mbr.c,v 1.79 2007/12/28 00:48:43 dholland Exp $ */
+/* $NetBSD: mbr.c,v 1.79.18.1 2010/05/20 05:32:45 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1156,8 +1156,8 @@
msg_display(MSG_editparttable);
- msg_table_add(MSG_part_header, dlsize/sizemult, multname, multname,
- multname, multname);
+ msg_table_add(MSG_part_header, (unsigned long)(dlsize/sizemult),
+ multname, multname, multname, multname);
if (num_opts == 0) {
num_opts = 6;
@@ -1282,6 +1282,10 @@
return(md_mbr_use_wholedisk(mbri));
}
+ /* Default to MB, and use bios geometry for cylinder size */
+ set_sizemultname_meg();
+ current_cylsize = bhead * bsec;
+
mbr_menu = new_menu(NULL, NULL, 16, 0, -1, 15, 70,
MC_NOBOX | MC_ALWAYS_SCROLL | MC_NOCLEAR,
set_mbr_header, set_mbr_label, NULL,
@@ -1289,10 +1293,6 @@
if (mbr_menu == -1)
return 0;
- /* Default to MB, and use bios geometry for cylinder size */
- set_sizemultname_meg();
- current_cylsize = bhead * bsec;
-
for (;;) {
ptstart = 0;
ptsize = 0;
Index: src/distrib/utils/sysinst/msg.mbr.de
diff -u src/distrib/utils/sysinst/msg.mbr.de:1.8 src/distrib/utils/sysinst/msg.mbr.de:1.8.26.1
--- src/distrib/utils/sysinst/msg.mbr.de:1.8 Thu Feb 15 12:00:15 2007
+++ src/distrib/utils/sysinst/msg.mbr.de Thu May 20 05:32:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mbr.de,v 1.8 2007/02/15 12:00:15 rillig Exp $ */
+/* $NetBSD: msg.mbr.de,v 1.8.26.1 2010/05/20 05:32:45 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -66,7 +66,7 @@
/* the %s's will expand into three character strings */
message part_header
-{ Festplattenkapazität insgesamt %d %s.
+{ Festplattenkapazität insgesamt %lu %s.
.if BOOTSEL
Start(%3s) Größe(%3s) Flag Typ Bootmenü
Index: src/distrib/utils/sysinst/msg.mbr.en
diff -u src/distrib/utils/sysinst/msg.mbr.en:1.13 src/distrib/utils/sysinst/msg.mbr.en:1.13.34.1
--- src/distrib/utils/sysinst/msg.mbr.en:1.13 Sun Apr 23 23:09:48 2006
+++ src/distrib/utils/sysinst/msg.mbr.en Thu May 20 05:32:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mbr.en,v 1.13 2006/04/23 23:09:48 hubertf Exp $ */
+/* $NetBSD: msg.mbr.en,v 1.13.34.1 2010/05/20 05:32:45 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -67,7 +67,7 @@
/* the %s's will expand into three character strings */
message part_header
-{ Total disk size %d %s.
+{ Total disk size %lu %s.
.if BOOTSEL
Start(%3s) Size(%3s) Flg Kind Bootmenu
Index: src/distrib/utils/sysinst/msg.mbr.es
diff -u src/distrib/utils/sysinst/msg.mbr.es:1.4 src/distrib/utils/sysinst/msg.mbr.es:1.4.34.1
--- src/distrib/utils/sysinst/msg.mbr.es:1.4 Thu Dec 8 16:51:45 2005
+++ src/distrib/utils/sysinst/msg.mbr.es Thu May 20 05:32:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mbr.es,v 1.4 2005/12/08 16:51:45 xtraeme Exp $ */
+/* $NetBSD: msg.mbr.es,v 1.4.34.1 2010/05/20 05:32:45 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -66,7 +66,7 @@
/* the %s's will expand into three character strings */
message part_header
-{ Tamaño total del disco %d %s.
+{ Tamaño total del disco %lu %s.
.if BOOTSEL
Inicio(%3s) Tamaño(%3s) Opc Tipo Bootmenu
Index: src/distrib/utils/sysinst/msg.mbr.fr
diff -u src/distrib/utils/sysinst/msg.mbr.fr:1.14 src/distrib/utils/sysinst/msg.mbr.fr:1.14.32.1
--- src/distrib/utils/sysinst/msg.mbr.fr:1.14 Mon Sep 4 22:00:52 2006
+++ src/distrib/utils/sysinst/msg.mbr.fr Thu May 20 05:32:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mbr.fr,v 1.14 2006/09/04 22:00:52 hubertf Exp $ */
+/* $NetBSD: msg.mbr.fr,v 1.14.32.1 2010/05/20 05:32:45 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -63,7 +63,7 @@
/* the %s's will expand into three character strings */
message part_header
-{ Taille totale du disque %d %s.
+{ Taille totale du disque %lu %s.
.if BOOTSEL
Début(%3s) Taille(%3s) Flg Type Nom de démarrage
Index: src/distrib/utils/sysinst/msg.mbr.pl
diff -u src/distrib/utils/sysinst/msg.mbr.pl:1.11 src/distrib/utils/sysinst/msg.mbr.pl:1.11.32.1
--- src/distrib/utils/sysinst/msg.mbr.pl:1.11 Tue Sep 19 14:47:10 2006
+++ src/distrib/utils/sysinst/msg.mbr.pl Thu May 20 05:32:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mbr.pl,v 1.11 2006/09/19 14:47:10 hubertf Exp $ */
+/* $NetBSD: msg.mbr.pl,v 1.11.32.1 2010/05/20 05:32:45 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -61,7 +61,7 @@
/* the %s's will expand into three character strings */
message part_header
-{ Calkowity rozmiar dysku %d %s.
+{ Calkowity rozmiar dysku %lu %s.
.if BOOTSEL
Pocz(%3s) Rozm(%3s) Flg Rodzaj Wpis menu
