Module Name: src
Committed By: joerg
Date: Mon May 30 14:20:48 UTC 2011
Modified Files:
src/distrib/utils/sysinst: bsddisklabel.c label.c main.c mbr.c
Log Message:
Use proper format strings.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/distrib/utils/sysinst/bsddisklabel.c \
src/distrib/utils/sysinst/label.c
cvs rdiff -u -r1.59 -r1.60 src/distrib/utils/sysinst/main.c
cvs rdiff -u -r1.86 -r1.87 src/distrib/utils/sysinst/mbr.c
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/bsddisklabel.c
diff -u src/distrib/utils/sysinst/bsddisklabel.c:1.55 src/distrib/utils/sysinst/bsddisklabel.c:1.56
--- src/distrib/utils/sysinst/bsddisklabel.c:1.55 Mon Apr 4 08:30:12 2011
+++ src/distrib/utils/sysinst/bsddisklabel.c Mon May 30 14:20:48 2011
@@ -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;
Index: src/distrib/utils/sysinst/label.c
diff -u src/distrib/utils/sysinst/label.c:1.55 src/distrib/utils/sysinst/label.c:1.56
--- src/distrib/utils/sysinst/label.c:1.55 Mon May 3 23:04:12 2010
+++ src/distrib/utils/sysinst/label.c Mon May 30 14:20:48 2011
@@ -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)
Index: src/distrib/utils/sysinst/main.c
diff -u src/distrib/utils/sysinst/main.c:1.59 src/distrib/utils/sysinst/main.c:1.60
--- src/distrib/utils/sysinst/main.c:1.59 Fri Apr 8 15:53:44 2011
+++ src/distrib/utils/sysinst/main.c Mon May 30 14:20:48 2011
@@ -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);
}
Index: src/distrib/utils/sysinst/mbr.c
diff -u src/distrib/utils/sysinst/mbr.c:1.86 src/distrib/utils/sysinst/mbr.c:1.87
--- src/distrib/utils/sysinst/mbr.c:1.86 Mon Apr 4 08:30:12 2011
+++ src/distrib/utils/sysinst/mbr.c Mon May 30 14:20:48 2011
@@ -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
