Module Name: src
Committed By: christos
Date: Thu Mar 20 20:51:40 UTC 2014
Modified Files:
src/sys/arch/alpha/alpha: db_disasm.c machdep.c trap.c
Log Message:
kill sprintf
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/alpha/alpha/db_disasm.c
cvs rdiff -u -r1.342 -r1.343 src/sys/arch/alpha/alpha/machdep.c
cvs rdiff -u -r1.129 -r1.130 src/sys/arch/alpha/alpha/trap.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/alpha/alpha/db_disasm.c
diff -u src/sys/arch/alpha/alpha/db_disasm.c:1.15 src/sys/arch/alpha/alpha/db_disasm.c:1.16
--- src/sys/arch/alpha/alpha/db_disasm.c:1.15 Sun Feb 5 21:14:10 2012
+++ src/sys/arch/alpha/alpha/db_disasm.c Thu Mar 20 16:51:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: db_disasm.c,v 1.15 2012/02/06 02:14:10 matt Exp $ */
+/* $NetBSD: db_disasm.c,v 1.16 2014/03/20 20:51:40 christos Exp $ */
/*
* Mach Operating System
@@ -48,7 +48,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.15 2012/02/06 02:14:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.16 2014/03/20 20:51:40 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -199,7 +199,7 @@ pal_opname(int op)
return (pal_op_tbl[i].name);
}
- sprintf(unk, "0x%x", op);
+ snprintf(unk, sizeof(unk), "0x%x", op);
return (unk);
}
@@ -253,7 +253,7 @@ arit_name(int op)
if (name != NULL)
return (name);
- sprintf(unk, "?arit 0x%x?", op);
+ snprintf(unk, sizeof(unk), "?arit 0x%x?", op);
return (unk);
}
@@ -301,7 +301,7 @@ logical_name(int op)
if (name != NULL)
return (name);
- sprintf(unk, "?logical 0x%x?", op);
+ snprintf(unk, sizeof(unk), "?logical 0x%x?", op);
return (unk);
}
@@ -344,7 +344,7 @@ bitop_name(int op)
if (name != NULL)
return (name);
- sprintf(unk, "?bit 0x%x?", op);
+ snprintf(unk, sizeof(unk), "?bit 0x%x?", op);
return (unk);
}
@@ -366,7 +366,7 @@ mul_name(int op)
if (name != NULL)
return (name);
- sprintf(unk, "?mul 0x%x?", op);
+ snprintf(unk, sizeof(unk), "?mul 0x%x?", op);
return (unk);
}
@@ -398,7 +398,7 @@ special_name(int op)
if (name != NULL)
return (name);
- sprintf(unk, "?special 0x%x?", op);
+ snprintf(unk, sizeof(unk), "?special 0x%x?", op);
return (unk);
}
@@ -435,7 +435,7 @@ intmisc_name(int op)
case op_ftois: return ("ftois");
}
- sprintf(unk, "?intmisc 0x%x?", op);
+ snprintf(unk, sizeof(unk), "?intmisc 0x%x?", op);
return (unk);
}
@@ -450,7 +450,7 @@ float_name(const struct tbl *tbl, int op
return (tbl[i].name);
}
- sprintf(unk, "?%s 0x%x?", type, op);
+ snprintf(unk, sizeof(unk), "?%s 0x%x?", type, op);
return (unk);
}
Index: src/sys/arch/alpha/alpha/machdep.c
diff -u src/sys/arch/alpha/alpha/machdep.c:1.342 src/sys/arch/alpha/alpha/machdep.c:1.343
--- src/sys/arch/alpha/alpha/machdep.c:1.342 Tue Sep 11 22:00:53 2012
+++ src/sys/arch/alpha/alpha/machdep.c Thu Mar 20 16:51:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.342 2012/09/12 02:00:53 manu Exp $ */
+/* $NetBSD: machdep.c,v 1.343 2014/03/20 20:51:40 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.342 2012/09/12 02:00:53 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.343 2014/03/20 20:51:40 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -928,7 +928,7 @@ alpha_unknown_sysname(void)
{
static char s[128]; /* safe size */
- sprintf(s, "%s family, unknown model variation 0x%lx",
+ snprintf(s, sizeof(s), "%s family, unknown model variation 0x%lx",
platform.family, hwrpb->rpb_variation & SV_ST_MASK);
return ((const char *)s);
}
Index: src/sys/arch/alpha/alpha/trap.c
diff -u src/sys/arch/alpha/alpha/trap.c:1.129 src/sys/arch/alpha/alpha/trap.c:1.130
--- src/sys/arch/alpha/alpha/trap.c:1.129 Mon Nov 4 11:57:32 2013
+++ src/sys/arch/alpha/alpha/trap.c Thu Mar 20 16:51:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.129 2013/11/04 16:57:32 christos Exp $ */
+/* $NetBSD: trap.c,v 1.130 2014/03/20 20:51:40 christos Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -93,7 +93,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.129 2013/11/04 16:57:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.130 2014/03/20 20:51:40 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -174,7 +174,7 @@ printtrap(const u_long a0, const u_long
entryname = "system call";
break;
default:
- sprintf(ubuf, "type %lx", entry);
+ snprintf(ubuf, sizeof(ubuf), "type %lx", entry);
entryname = (const char *) ubuf;
break;
}
