Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/distrib/utils/sysinst Use proper format strings.



details:   https://anonhg.NetBSD.org/src/rev/3751ceda9fd9
branches:  trunk
changeset: 765556:3751ceda9fd9
user:      joerg <joerg%NetBSD.org@localhost>
date:      Mon May 30 14:20:48 2011 +0000

description:
Use proper format strings.

diffstat:

 distrib/utils/sysinst/bsddisklabel.c |   4 ++--
 distrib/utils/sysinst/label.c        |   6 +++---
 distrib/utils/sysinst/main.c         |   4 ++--
 distrib/utils/sysinst/mbr.c          |  10 +++++-----
 4 files changed, 12 insertions(+), 12 deletions(-)

diffs (95 lines):

diff -r fa3dcd33ee9e -r 3751ceda9fd9 distrib/utils/sysinst/bsddisklabel.c
--- a/distrib/utils/sysinst/bsddisklabel.c      Mon May 30 14:20:19 2011 +0000
+++ b/distrib/utils/sysinst/bsddisklabel.c      Mon May 30 14:20:48 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bsddisklabel.c,v 1.55 2011/04/04 08:30:12 mbalmer Exp $        */
+/*     $NetBSD: bsddisklabel.c,v 1.56 2011/05/30 14:20:48 joerg Exp $  */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -152,7 +152,7 @@
 
        p = &pi->ptn_sizes[opt];
        if (p->mount[0] == 0) {
-               wprintw(m->mw, msg_string(MSG_add_another_ptn));
+               wprintw(m->mw, "%s", msg_string(MSG_add_another_ptn));
                return;
        }
        size = p->size;
diff -r fa3dcd33ee9e -r 3751ceda9fd9 distrib/utils/sysinst/label.c
--- a/distrib/utils/sysinst/label.c     Mon May 30 14:20:19 2011 +0000
+++ b/distrib/utils/sysinst/label.c     Mon May 30 14:20:48 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: label.c,v 1.55 2010/05/03 23:04:12 martin Exp $        */
+/*     $NetBSD: label.c,v 1.56 2011/05/30 14:20:48 joerg Exp $ */
 
 /*
  * Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: label.c,v 1.55 2010/05/03 23:04:12 martin Exp $");
+__RCSID("$NetBSD: label.c,v 1.56 2011/05/30 14:20:48 joerg Exp $");
 #endif
 
 #include <sys/types.h>
@@ -519,7 +519,7 @@
                        msg_string(p->pi_flags & PIF_MOUNT ? MSG_Yes : MSG_No));
                break;
        case PTN_MENU_MOUNTOPT:
-               wprintw(m->mw, msg_string(MSG_mount_options_fmt));
+               wprintw(m->mw, "%s", msg_string(MSG_mount_options_fmt));
                if (p->pi_flags & PIF_ASYNC)
                        wprintw(m->mw, "async ");
                if (p->pi_flags & PIF_NOATIME)
diff -r fa3dcd33ee9e -r 3751ceda9fd9 distrib/utils/sysinst/main.c
--- a/distrib/utils/sysinst/main.c      Mon May 30 14:20:19 2011 +0000
+++ b/distrib/utils/sysinst/main.c      Mon May 30 14:20:48 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.59 2011/04/08 15:53:44 martin Exp $ */
+/*     $NetBSD: main.c,v 1.60 2011/05/30 14:20:48 joerg Exp $  */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -345,7 +345,7 @@
 usage(void)
 {
 
-       (void)fprintf(stderr, msg_string(MSG_usage));
+       (void)fprintf(stderr, "%s", msg_string(MSG_usage));
        exit(1);
 }
 
diff -r fa3dcd33ee9e -r 3751ceda9fd9 distrib/utils/sysinst/mbr.c
--- a/distrib/utils/sysinst/mbr.c       Mon May 30 14:20:19 2011 +0000
+++ b/distrib/utils/sysinst/mbr.c       Mon May 30 14:20:48 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mbr.c,v 1.86 2011/04/04 08:30:12 mbalmer Exp $ */
+/*     $NetBSD: mbr.c,v 1.87 2011/05/30 14:20:48 joerg Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -475,18 +475,18 @@
 {
 
        if (opt == 0) {
-               wprintw(m->mw, msg_string(MSG_Dont_change));
+               wprintw(m->mw, "%s", msg_string(MSG_Dont_change));
                return;
        }
        if (opt == 1) {
-               wprintw(m->mw, msg_string(MSG_Delete_partition));
+               wprintw(m->mw, "%s", msg_string(MSG_Delete_partition));
                return;
        }
        if (part_ids[opt - 1].id == -1) {
-               wprintw(m->mw, msg_string(MSG_Other_kind));
+               wprintw(m->mw, "%s", msg_string(MSG_Other_kind));
                return;
        }
-       wprintw(m->mw, part_ids[opt - 1].name);
+       wprintw(m->mw, "%s", part_ids[opt - 1].name);
 }
 
 static int



Home | Main Index | Thread Index | Old Index