CVS commit: src/sys/dev/scsipi

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Fri Sep  5 05:30:42 UTC 2014

Modified Files:
        src/sys/dev/scsipi: sd.c

Log Message:
Don't use new as a variable name.


To generate a diff of this commit:
cvs rdiff -u -r1.308 -r1.309 src/sys/dev/scsipi/sd.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/scsipi/sd.c
diff -u src/sys/dev/scsipi/sd.c:1.308 src/sys/dev/scsipi/sd.c:1.309
--- src/sys/dev/scsipi/sd.c:1.308	Sun Aug 10 16:44:36 2014
+++ src/sys/dev/scsipi/sd.c	Fri Sep  5 05:30:42 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: sd.c,v 1.308 2014/08/10 16:44:36 tls Exp $	*/
+/*	$NetBSD: sd.c,v 1.309 2014/09/05 05:30:42 matt Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.308 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.309 2014/09/05 05:30:42 matt Exp $");
 
 #include "opt_scsi.h"
 
@@ -1272,8 +1272,8 @@ sdioctl(dev_t dev, u_long cmd, void *add
 	case DIOCSSTRATEGY:
 	    {
 		struct disk_strategy *dks = addr;
-		struct bufq_state *new;
-		struct bufq_state *old;
+		struct bufq_state *new_bufq;
+		struct bufq_state *old_bufq;
 
 		if ((flag & FWRITE) == 0) {
 			return EBADF;
@@ -1283,17 +1283,17 @@ sdioctl(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;
 		}
 		s = splbio();
-		old = sd->buf_queue;
-		bufq_move(new, old);
-		sd->buf_queue = new;
+		old_bufq = sd->buf_queue;
+		bufq_move(new_bufq, old_bufq);
+		sd->buf_queue = new_bufq;
 		splx(s);
-		bufq_free(old);
+		bufq_free(old_bufq);
 		
 		return 0;
 	    }