[src/trunk]: src/distrib/utils/sysinst Fix a varargs argument type mismatch o...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ee6cae3a9f20
branches:  trunk
changeset: 754088:ee6cae3a9f20
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Apr 19 19:22:41 2010 +0000

description:
Fix a varargs argument type mismatch on 32bit archs - change format to
explicitly use %lu and cast the passed value accordingly.

diffstat:

 distrib/utils/sysinst/mbr.c      |  14 +++++++-------
 distrib/utils/sysinst/msg.mbr.de |   4 ++--
 distrib/utils/sysinst/msg.mbr.en |   4 ++--
 distrib/utils/sysinst/msg.mbr.es |   4 ++--
 distrib/utils/sysinst/msg.mbr.fr |   4 ++--
 distrib/utils/sysinst/msg.mbr.pl |   4 ++--
 6 files changed, 17 insertions(+), 17 deletions(-)

diffs (132 lines):

diff -r 3871b5c301bb -r ee6cae3a9f20 distrib/utils/sysinst/mbr.c
--- a/distrib/utils/sysinst/mbr.c       Mon Apr 19 19:16:11 2010 +0000
+++ b/distrib/utils/sysinst/mbr.c       Mon Apr 19 19:22:41 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mbr.c,v 1.83 2010/04/15 22:55:15 martin Exp $ */
+/*     $NetBSD: mbr.c,v 1.84 2010/04/19 19:22:41 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1173,8 +1173,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;
@@ -1299,6 +1299,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,
@@ -1306,10 +1310,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;
diff -r 3871b5c301bb -r ee6cae3a9f20 distrib/utils/sysinst/msg.mbr.de
--- a/distrib/utils/sysinst/msg.mbr.de  Mon Apr 19 19:16:11 2010 +0000
+++ b/distrib/utils/sysinst/msg.mbr.de  Mon Apr 19 19:22:41 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.mbr.de,v 1.9 2010/04/19 19:16:11 martin Exp $      */
+/*     $NetBSD: msg.mbr.de,v 1.10 2010/04/19 19:22:41 martin 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ü
diff -r 3871b5c301bb -r ee6cae3a9f20 distrib/utils/sysinst/msg.mbr.en
--- a/distrib/utils/sysinst/msg.mbr.en  Mon Apr 19 19:16:11 2010 +0000
+++ b/distrib/utils/sysinst/msg.mbr.en  Mon Apr 19 19:22:41 2010 +0000
@@ -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.14 2010/04/19 19:22:41 martin 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
diff -r 3871b5c301bb -r ee6cae3a9f20 distrib/utils/sysinst/msg.mbr.es
--- a/distrib/utils/sysinst/msg.mbr.es  Mon Apr 19 19:16:11 2010 +0000
+++ b/distrib/utils/sysinst/msg.mbr.es  Mon Apr 19 19:22:41 2010 +0000
@@ -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.5 2010/04/19 19:22:41 martin 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
diff -r 3871b5c301bb -r ee6cae3a9f20 distrib/utils/sysinst/msg.mbr.fr
--- a/distrib/utils/sysinst/msg.mbr.fr  Mon Apr 19 19:16:11 2010 +0000
+++ b/distrib/utils/sysinst/msg.mbr.fr  Mon Apr 19 19:22:41 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.mbr.fr,v 1.15 2009/10/18 19:31:53 stacktic Exp $   */
+/*     $NetBSD: msg.mbr.fr,v 1.16 2010/04/19 19:22:41 martin 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
diff -r 3871b5c301bb -r ee6cae3a9f20 distrib/utils/sysinst/msg.mbr.pl
--- a/distrib/utils/sysinst/msg.mbr.pl  Mon Apr 19 19:16:11 2010 +0000
+++ b/distrib/utils/sysinst/msg.mbr.pl  Mon Apr 19 19:22:41 2010 +0000
@@ -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.12 2010/04/19 19:22:41 martin 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