Changeset b28c09e in buchla-68k for ram

Timestamp:

11/15/2017 09:13:05 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

b27040e

Parents:

e68b406

Message:

Avoid shadowing.

Location:

ram

Files:

• asgvce.c (modified) (2 diffs)
• delpnts.c (modified) (4 diffs)
• ldselbx.c (modified) (2 diffs)
• showcfg.c (modified) (2 diffs)

ram/asgvce.c

@@ -303 +303 @@
         register int16_t vp;
         register int16_t trg;
-        register int16_t aflag;
+        register int16_t flag;
 
         DB_ENTR("asgvce");
@@ -337 +337 @@
 
                 if (tv EQ -1)
-                        aflag = TRUE;           /* OK - unassigned */
+                        flag = TRUE;            /* OK - unassigned */
                 else if (0 EQ (tv & (MKEYHELD << 8)))
-                        aflag = TRUE;           /* OK - not held */
+                        flag = TRUE;            /* OK - not held */
                 else
-                        aflag = FALSE;          /* NO - held */
-
-                if (aflag AND (vce2grp[vp] EQ (grp + 1))) {
+                        flag = FALSE;           /* NO - held */
+
+                if (flag AND (vce2grp[vp] EQ (grp + 1))) {
 
                         if ((ins2grp[grp] & GTAG1) AND

ram/delpnts.c

@@ -216 +216 @@
 {
         register int8_t *fp1, *fp2;
-        register int16_t i, j, k, l, npts;
+        register int16_t i, j, k, l, pcnt;
         int16_t topnt, frompt, oldi;
 
@@ -227 +227 @@
         topnt = NIPNTS - ip->idhplft;           /* calculate move parameters */
         frompt = topnt - 1;
-        npts = frompt - inpnt;
+        pcnt = frompt - inpnt;
         i = topnt;
         j = frompt;
@@ -234 +234 @@
         if (debugsw)
                 printf("inspnt():  fn=%d, in=%d, to=%d, from=%d, npts=%d, pif=%d\r\n",
-                        fn, inpnt, topnt, frompt, npts, ip->idhfnc[fn].idfpif);
+                        fn, inpnt, topnt, frompt, pcnt, ip->idhfnc[fn].idfpif);
 #endif
 
@@ -242 +242 @@
 /* ++++++++++++++++++++++++ FPU interrupts disabled +++++++++++++++++++++++++ */
 
-        for (k = 0; k < npts; k++) {            /* move things up */
+        for (k = 0; k < pcnt; k++) {            /* move things up */
 
                 fp1 = (int8_t *)&ip->idhpnt[i--];

ram/ldselbx.c

@@ -70 +70 @@
         register int32_t count;
         register int16_t c;
-        int8_t errbuf[64];
+        int8_t buf[64];
 
         for (count = 0; count < len; count++) {
@@ -78 +78 @@
                 if (EOF EQ (c = getc(fp))) {
 
-                        sprintf(errbuf, "errno = %d", errno);
+                        sprintf(buf, "errno = %d", errno);
 
                         ldermsg("Unexpected EOF",
-                                errbuf, (int8_t *)NULL, LD_EMCF, LD_EMCB);
+                                buf, (int8_t *)NULL, LD_EMCF, LD_EMCB);
 
 #if     DEBUGIT

ram/showcfg.c

@@ -313 +313 @@
 {
         register int16_t i, np;
-        int8_t idbuf[8];
+        int8_t buf[8];
         register int8_t *cfgdat, *cfp;
 
@@ -321 +321 @@
         tsplot4(instob, 64, CFBX18, wcmrow, 4 + wcmcol, "Config #", 14);
 
-        sprintf(idbuf, "%02d", nn);
-        tsplot4(instob, 64, CFBX18, wcmrow, 12 + wcmcol, idbuf, 14);
+        sprintf(buf, "%02d", nn);
+        tsplot4(instob, 64, CFBX18, wcmrow, 12 + wcmcol, buf, 14);
 
         cfgdat = cfgptr[nn];