Module Name: src
Committed By: christos
Date: Tue Mar 25 16:23:58 UTC 2014
Modified Files:
src/sys/compat/ndis: kern_ndis.c subr_ndis.c subr_ntoskrnl.c
Log Message:
kill sprintf
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/compat/ndis/kern_ndis.c
cvs rdiff -u -r1.27 -r1.28 src/sys/compat/ndis/subr_ndis.c
cvs rdiff -u -r1.23 -r1.24 src/sys/compat/ndis/subr_ntoskrnl.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/compat/ndis/kern_ndis.c
diff -u src/sys/compat/ndis/kern_ndis.c:1.25 src/sys/compat/ndis/kern_ndis.c:1.26
--- src/sys/compat/ndis/kern_ndis.c:1.25 Sat Mar 22 22:55:26 2014
+++ src/sys/compat/ndis/kern_ndis.c Tue Mar 25 12:23:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_ndis.c,v 1.25 2014/03/23 02:55:26 christos Exp $ */
+/* $NetBSD: kern_ndis.c,v 1.26 2014/03/25 16:23:58 christos Exp $ */
/*-
* Copyright (c) 2003
@@ -37,7 +37,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.60.2.5 2005/04/01 17:14:20 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: kern_ndis.c,v 1.25 2014/03/23 02:55:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ndis.c,v 1.26 2014/03/25 16:23:58 christos Exp $");
#endif
#include <sys/param.h>
@@ -920,17 +920,18 @@ ndis_create_sysctls(void *arg)
"NDIS API Version", "0x00050001", CTLFLAG_RD);
/* Bus type (PCI, PCMCIA, etc...) */
- sprintf(buf, "%d", (int)sc->ndis_iftype);
+ snprintf(buf, sizeof(buf), "%d", (int)sc->ndis_iftype);
ndis_add_sysctl(sc, "BusType", "Bus Type", buf, CTLFLAG_RD);
if (sc->ndis_res_io != NULL) {
- sprintf(buf, "0x%lx", rman_get_start(sc->ndis_res_io));
+ snprintf(buf, sizeof(buf), "0x%lx",
+ rman_get_start(sc->ndis_res_io));
ndis_add_sysctl(sc, "IOBaseAddress",
"Base I/O Address", buf, CTLFLAG_RD);
}
if (sc->ndis_irq != NULL) {
- sprintf(buf, "%lu", rman_get_start(sc->ndis_irq));
+ snprintf(buf, sizeof(buf), "%lu", rman_get_start(sc->ndis_irq));
ndis_add_sysctl(sc, "InterruptNumber",
"Interrupt Number", buf, CTLFLAG_RD);
}
@@ -1015,17 +1016,18 @@ ndis_create_sysctls(void *arg)
/*"NDIS API Version"*/ "Version", "0x00050001", CTLFLAG_RD);
/* Bus type (PCI, PCMCIA, etc...) */
- sprintf(buf, "%d", (int)sc->ndis_iftype);
+ snprintf(buf, sizeof(buf), "%d", (int)sc->ndis_iftype);
ndis_add_sysctl(sc, "BusType", "Bus Type", buf, CTLFLAG_RD);
if (sc->ndis_res_io != NULL) {
- sprintf(buf, "0x%lx", (long unsigned int)rman_get_start(sc->ndis_res_io));
+ snprintf(buf, sizeof(buf), "0x%lx",
+ (long unsigned int)rman_get_start(sc->ndis_res_io));
ndis_add_sysctl(sc, "IOBaseAddress",
/*"Base I/O Address"*/ "Base I/O", buf, CTLFLAG_RD);
}
if (sc->ndis_irq != NULL) {
- sprintf(buf, "%lu", (long unsigned int)rman_get_start(sc->ndis_irq));
+ snprintf(buf, sizeof(buf), "%lu", (long unsigned int)rman_get_start(sc->ndis_irq));
ndis_add_sysctl(sc, "InterruptNumber",
"Interrupt Number", buf, CTLFLAG_RD);
}
Index: src/sys/compat/ndis/subr_ndis.c
diff -u src/sys/compat/ndis/subr_ndis.c:1.27 src/sys/compat/ndis/subr_ndis.c:1.28
--- src/sys/compat/ndis/subr_ndis.c:1.27 Sun Mar 23 05:31:15 2014
+++ src/sys/compat/ndis/subr_ndis.c Tue Mar 25 12:23:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_ndis.c,v 1.27 2014/03/23 09:31:15 christos Exp $ */
+/* $NetBSD: subr_ndis.c,v 1.28 2014/03/25 16:23:58 christos Exp $ */
/*-
* Copyright (c) 2003
@@ -37,7 +37,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.67.2.7 2005/03/31 21:50:11 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: subr_ndis.c,v 1.27 2014/03/23 09:31:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_ndis.c,v 1.28 2014/03/25 16:23:58 christos Exp $");
#endif
/*
@@ -160,7 +160,7 @@ __stdcall static void NdisOpenConfigurat
static ndis_status ndis_encode_parm(ndis_miniport_block *,
struct sysctl_oid *, ndis_parm_type, ndis_config_parm **);
static ndis_status ndis_decode_parm(ndis_miniport_block *,
- ndis_config_parm *, char *);
+ ndis_config_parm *, char *, size_t);
#else /* __NetBSD__ */
static ndis_status ndis_encode_parm(ndis_miniport_block *,
void *, ndis_parm_type, ndis_config_parm **);
@@ -853,7 +853,8 @@ NdisReadConfiguration(ndis_status *statu
#ifdef __FreeBSD__
static ndis_status
-ndis_decode_parm(ndis_miniport_block *block, ndis_config_parm *parm, char *val)
+ndis_decode_parm(ndis_miniport_block *block, ndis_config_parm *parm, char *val,
+ size_t len)
{
ndis_unicode_string *ustr;
char *astr = NULL;
@@ -868,10 +869,10 @@ ndis_decode_parm(ndis_miniport_block *bl
free(astr, M_DEVBUF);
break;
case ndis_parm_int:
- sprintf(val, "%d", parm->ncp_parmdata.ncp_intdata);
+ snprintf(val, len, "%d", parm->ncp_parmdata.ncp_intdata);
break;
case ndis_parm_hexint:
- sprintf(val, "%xu", parm->ncp_parmdata.ncp_intdata);
+ snprintf(val, len, "%xu", parm->ncp_parmdata.ncp_intdata);
break;
default:
return(NDIS_STATUS_FAILURE);
@@ -910,7 +911,7 @@ NdisWriteConfiguration(
/* Decode the parameter into a string. */
memset(val, 0, sizeof(val));
- *status = ndis_decode_parm(block, parm, val);
+ *status = ndis_decode_parm(block, parm, val, sizeof(val));
if (*status != NDIS_STATUS_SUCCESS) {
free(keystr, M_DEVBUF);
return;
Index: src/sys/compat/ndis/subr_ntoskrnl.c
diff -u src/sys/compat/ndis/subr_ntoskrnl.c:1.23 src/sys/compat/ndis/subr_ntoskrnl.c:1.24
--- src/sys/compat/ndis/subr_ntoskrnl.c:1.23 Sun Mar 23 05:31:15 2014
+++ src/sys/compat/ndis/subr_ntoskrnl.c Tue Mar 25 12:23:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_ntoskrnl.c,v 1.23 2014/03/23 09:31:15 christos Exp $ */
+/* $NetBSD: subr_ntoskrnl.c,v 1.24 2014/03/25 16:23:58 christos Exp $ */
/*-
* Copyright (c) 2003
@@ -37,7 +37,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.43.2.5 2005/03/31 04:24:36 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: subr_ntoskrnl.c,v 1.23 2014/03/23 09:31:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_ntoskrnl.c,v 1.24 2014/03/25 16:23:58 christos Exp $");
#endif
#ifdef __FreeBSD__
@@ -2384,7 +2384,7 @@ PsCreateSystemThread(
tc->tc_thrctx = thrctx;
tc->tc_thrfunc = thrfunc;
- sprintf(tname, "windows kthread %d", ntoskrnl_kth);
+ snprintf(tname, sizeof(tname), "windows kthread %d", ntoskrnl_kth);
#ifdef __FreeBSD__
error = kthread_create(ntoskrnl_thrfunc, tc, &p,
RFHIGHPID, NDIS_KSTACK_PAGES, tname);
