Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/compat/ndis/Attic/subr_ntoskrnl.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/compat/ndis/Attic/subr_ntoskrnl.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.21
retrieving revision 1.21.2.2
diff -u -p -r1.21 -r1.21.2.2
--- src/sys/compat/ndis/Attic/subr_ntoskrnl.c	2011/08/31 18:31:02	1.21
+++ src/sys/compat/ndis/Attic/subr_ntoskrnl.c	2014/05/22 11:40:17	1.21.2.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_ntoskrnl.c,v 1.21 2011/08/31 18:31:02 plunky Exp $	*/
+/*	$NetBSD: subr_ntoskrnl.c,v 1.21.2.2 2014/05/22 11:40:17 yamt 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.21 2011/08/31 18:31:02 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_ntoskrnl.c,v 1.21.2.2 2014/05/22 11:40:17 yamt Exp $");
 #endif
 
 #ifdef __FreeBSD__
@@ -661,17 +661,17 @@ IoBuildAsynchronousFsdRequest(uint32_t f
 }
 
 __stdcall static irp *
-IoBuildDeviceIoControlRequest(iocode, dobj, ibuf, ilen, obuf, olen,
-    isinternal, event, status)
-	uint32_t		iocode;
-	device_object		*dobj;
-	void			*ibuf;
-	uint32_t		ilen;
-	void			*obuf;
-	uint32_t		olen;
-	uint8_t			isinternal;
-	nt_kevent		*event;
-	io_status_block		*status;
+IoBuildDeviceIoControlRequest(
+	uint32_t		iocode,
+	device_object		*dobj,
+	void			*ibuf,
+	uint32_t		ilen,
+	void			*obuf,
+	uint32_t		olen,
+	uint8_t			isinternal,
+	nt_kevent		*event,
+	io_status_block		*status
+)
 {
 	irp			*ip;
 	io_stack_location	*sl;
@@ -1001,9 +1001,9 @@ static void
 ntoskrnl_wakeup(void *arg)
 {
 	nt_dispatch_header	*obj;
-	wait_block		*w;
 	list_entry		*e;
 #ifdef __FreeBSD__
+	wait_block		*w;
 	struct thread		*td;
 #endif
 
@@ -1012,9 +1012,9 @@ ntoskrnl_wakeup(void *arg)
 	obj->dh_sigstate = TRUE;
 	e = obj->dh_waitlisthead.nle_flink;
 	while (e != &obj->dh_waitlisthead) {
-		w = (wait_block *)e;
 /* TODO: is this correct? */		
 #ifdef __FreeBSD__
+		w = (wait_block *)e;
 		td = w->wb_kthread;
 		ndis_thresume(td->td_proc);
 #else
@@ -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);
@@ -2693,8 +2693,6 @@ image_patch_table ntoskrnl_functbl[] = {
 	IMPORT_FUNC(RtlFreeAnsiString),
 	IMPORT_FUNC(RtlFreeUnicodeString),
 	IMPORT_FUNC(RtlUnicodeStringToInteger),
-	IMPORT_FUNC(sprintf),
-	IMPORT_FUNC(vsprintf),
 	IMPORT_FUNC_MAP(_snprintf, snprintf),
 	IMPORT_FUNC_MAP(_vsnprintf, vsnprintf),
 	IMPORT_FUNC(DbgPrint),