Module Name: src
Committed By: matt
Date: Fri Sep 5 05:27:23 UTC 2014
Modified Files:
src/sys/dev: ld.c
Log Message:
Don't use new as a variable name.
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/ld.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/dev/ld.c
diff -u src/sys/dev/ld.c:1.75 src/sys/dev/ld.c:1.76
--- src/sys/dev/ld.c:1.75 Sun Aug 10 16:44:35 2014
+++ src/sys/dev/ld.c Fri Sep 5 05:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ld.c,v 1.75 2014/08/10 16:44:35 tls Exp $ */
+/* $NetBSD: ld.c,v 1.76 2014/09/05 05:27:23 matt Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.75 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.76 2014/09/05 05:27:23 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -570,7 +570,7 @@ ldioctl(dev_t dev, u_long cmd, void *add
case DIOCSSTRATEGY:
{
struct disk_strategy *dks = (void *)addr;
- struct bufq_state *new, *old;
+ struct bufq_state *new_bufq, *old_bufq;
if ((flag & FWRITE) == 0)
return EPERM;
@@ -579,17 +579,17 @@ ldioctl(dev_t dev, u_long cmd, void *add
return EINVAL;
dks->dks_name[sizeof(dks->dks_name) - 1] = 0; /* ensure term */
- error = bufq_alloc(&new, dks->dks_name,
+ error = bufq_alloc(&new_bufq, dks->dks_name,
BUFQ_EXACT|BUFQ_SORT_RAWBLOCK);
if (error)
return error;
mutex_enter(&sc->sc_mutex);
- old = sc->sc_bufq;
- bufq_move(new, old);
- sc->sc_bufq = new;
+ old_bufq = sc->sc_bufq;
+ bufq_move(new_bufq, old_bufq);
+ sc->sc_bufq = new_bufq;
mutex_exit(&sc->sc_mutex);
- bufq_free(old);
+ bufq_free(old_bufq);
return 0;
}
