Module Name: src
Committed By: christos
Date: Wed Mar 26 17:44:36 UTC 2014
Modified Files:
src/sys/arch/mvmeppc/mvmeppc: machdep.c platform_160x.c
Log Message:
kill sprintf
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/mvmeppc/mvmeppc/machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mvmeppc/mvmeppc/platform_160x.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mvmeppc/mvmeppc/machdep.c
diff -u src/sys/arch/mvmeppc/mvmeppc/machdep.c:1.30 src/sys/arch/mvmeppc/mvmeppc/machdep.c:1.31
--- src/sys/arch/mvmeppc/mvmeppc/machdep.c:1.30 Sat Oct 13 13:58:54 2012
+++ src/sys/arch/mvmeppc/mvmeppc/machdep.c Wed Mar 26 13:44:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.30 2012/10/13 17:58:54 jdc Exp $ */
+/* $NetBSD: machdep.c,v 1.31 2014/03/26 17:44:36 christos Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.30 2012/10/13 17:58:54 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.31 2014/03/26 17:44:36 christos Exp $");
#include "opt_compat_netbsd.h"
#include "opt_mvmetype.h"
@@ -123,7 +123,7 @@ initppc(u_long startkernel, u_long endke
extern void _mvmeppc_unsup_board(const char *, const char *);
char msg[80];
- sprintf(msg, "Unsupported model: MVME%04x",
+ snprintf(msg, sizeof(msg), "Unsupported model: MVME%04x",
bootinfo.bi_modelnumber);
_mvmeppc_unsup_board(msg, &msg[strlen(msg)]);
/* NOTREACHED */
@@ -168,7 +168,8 @@ cpu_startup(void)
if (!prep_intr_reg)
panic("startup: no room for interrupt register");
- sprintf(modelbuf, "%s\nCore Speed: %dMHz, Bus Speed: %dMHz\n",
+ snprintf(modelbuf, sizeof(modelbuf),
+ "%s\nCore Speed: %dMHz, Bus Speed: %dMHz\n",
platform->model,
bootinfo.bi_mpuspeed/1000000,
bootinfo.bi_busspeed/1000000);
Index: src/sys/arch/mvmeppc/mvmeppc/platform_160x.c
diff -u src/sys/arch/mvmeppc/mvmeppc/platform_160x.c:1.8 src/sys/arch/mvmeppc/mvmeppc/platform_160x.c:1.9
--- src/sys/arch/mvmeppc/mvmeppc/platform_160x.c:1.8 Sat Jun 18 04:08:29 2011
+++ src/sys/arch/mvmeppc/mvmeppc/platform_160x.c Wed Mar 26 13:44:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: platform_160x.c,v 1.8 2011/06/18 08:08:29 matt Exp $ */
+/* $NetBSD: platform_160x.c,v 1.9 2014/03/26 17:44:36 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: platform_160x.c,v 1.8 2011/06/18 08:08:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: platform_160x.c,v 1.9 2014/03/26 17:44:36 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -104,8 +104,8 @@ p160x_match(struct platform *p)
for (cp = &bid.pwa[sizeof(bid.pwa) - 1]; *cp == ' '; cp--)
*cp = '\0';
- sprintf(p160x_model, "%s, Serial: %s, PWA: %s", bid.id,
- bid.serial, bid.pwa);
+ snprintf(p160x_model, sizeof(p160x_model),
+ "%s, Serial: %s, PWA: %s", bid.id, bid.serial, bid.pwa);
p->model = p160x_model;
speed[3] = '\0';
