Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/midirecord don't shadow div(3)



details:   https://anonhg.NetBSD.org/src/rev/c226e409d613
branches:  trunk
changeset: 335273:c226e409d613
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jan 01 04:57:01 2015 +0000

description:
don't shadow div(3)

diffstat:

 usr.bin/midirecord/midirecord.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (46 lines):

diff -r a5aa068b5cc2 -r c226e409d613 usr.bin/midirecord/midirecord.c
--- a/usr.bin/midirecord/midirecord.c   Thu Jan 01 03:21:49 2015 +0000
+++ b/usr.bin/midirecord/midirecord.c   Thu Jan 01 04:57:01 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: midirecord.c,v 1.4 2014/12/30 18:52:47 mrg Exp $       */
+/*     $NetBSD: midirecord.c,v 1.5 2015/01/01 04:57:01 christos Exp $  */
 
 /*
  * Copyright (c) 2014 Matthew R. Green
@@ -33,7 +33,7 @@
 #include <sys/cdefs.h>
 
 #ifndef lint
-__RCSID("$NetBSD: midirecord.c,v 1.4 2014/12/30 18:52:47 mrg Exp $");
+__RCSID("$NetBSD: midirecord.c,v 1.5 2015/01/01 04:57:01 christos Exp $");
 #endif
 
 #include <sys/param.h>
@@ -313,21 +313,21 @@
 {
        static unsigned prev_div;
        unsigned cur_div;
-       unsigned val = 0, div;
+       unsigned val = 0, xdiv;
        int vallen = 0, i;
 
        if (prev_div == 0 && !oflag)
                prev_div = e.t_WAIT_ABS.divisions;
        cur_div = e.t_WAIT_ABS.divisions;
 
-       div = cur_div - prev_div;
-       if (div) {
-               while (div) {
+       xdiv = cur_div - prev_div;
+       if (xdiv) {
+               while (xdiv) {
                        uint32_t extra = val ? 0x80 : 0;
 
                        val <<= 8;
-                       val |= (div & 0x7f) | extra;
-                       div >>= 7;
+                       val |= (xdiv & 0x7f) | extra;
+                       xdiv >>= 7;
                        vallen++;
                }
        } else



Home | Main Index | Thread Index | Old Index