Changeset 0b23063 in buchla-68k

Timestamp:

11/15/2017 08:22:41 PM (6 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

5399628

Parents:

3c45656

Message:

Fixed char array subscripts.

Location:

ram

Files:

• delpnts.c (modified) (1 diff)
• etagpt.c (modified) (1 diff)
• etiosc.c (modified) (1 diff)
• initi.c (modified) (2 diffs)
• instdsp.c (modified) (2 diffs)
• ldselbx.c (modified) (2 diffs)
• scread.c (modified) (1 diff)
• scwrite.c (modified) (1 diff)
• sedump.c (modified) (1 diff)

ram/delpnts.c

@@ -133 +133 @@
                 /* reset first point in function */
 
-                pp = &vp->idhpnt[fp->idfpt1];
+                pp = &vp->idhpnt[(int16_t)fp->idfpt1];
 
                 pp->iptim  = FPU_MINT;

ram/etagpt.c

@@ -102 +102 @@
         }
 
-        dspbuf[0] = *gprep[ebuf[0]];
+        dspbuf[0] = *gprep[(int16_t)ebuf[0]];
         dspbuf[1] = '\0';
 

ram/etiosc.c

@@ -113 +113 @@
         }
 
-        cents = (ebuf[0] * 1200) + pitches[ebuf[1]] + shrpflt[ebuf[2] - 7]
-                + (ebuf[3] * 10) + ebuf[4] + 160;
+        cents = (ebuf[0] * 1200) + pitches[(int16_t)ebuf[1]]
+                + shrpflt[ebuf[2] - 7] + (ebuf[3] * 10) + ebuf[4] + 160;
 
         return(SUCCESS);

ram/initi.c

@@ -64 +64 @@
         register uint16_t tacc;
 
-        pp = &vbufs[curvce].idhpnt[vbufs[curvce].idhfnc[curfunc].idfpt1];
+        pp = &vbufs[curvce].idhpnt[(int16_t)vbufs[curvce].idhfnc[curfunc].idfpt1];
         tacc = 0;
 
@@ -87 +87 @@
         register struct instpnt *pp;
 
-        pp = &vbufs[curvce].idhpnt[vbufs[curvce].idhfnc[curfunc].idfpt1];
+        pp = &vbufs[curvce].idhpnt[(int16_t)vbufs[curvce].idhfnc[curfunc].idfpt1];
         tacc = 0;
 

ram/instdsp.c

@@ -198 +198 @@
         npt2 = 1;               /* right endpoint of line */
 
-        pt1 = &ip->idhpnt[fp->idfpt1];          /* left endpoint of line */
+        pt1 = &ip->idhpnt[(int16_t)fp->idfpt1]; /* left endpoint of line */
         pt2 = pt1 + 1;                          /* right endpoint of line */
 
@@ -412 +412 @@
                         idbuf[0] = (int8_t)(idbuf[0] + '0');
                         idbuf[1] = (int8_t)(idbuf[1] + 'A');
-                        idbuf[2] = sfdsp[idbuf[2]];
+                        idbuf[2] = sfdsp[(int16_t)idbuf[2]];
                         idbuf[3] = (int8_t)(idbuf[3] + '0');
                         idbuf[4] = (int8_t)(idbuf[4] + '0');

ram/ldselbx.c

@@ -133 +133 @@
         }
 
-        if (skp_ec(fp, (int32_t)(scsizes[etype][1] - 1))) {     /* skip data */
+        if (skp_ec(fp, (int32_t)(scsizes[(int16_t)etype][1] - 1))) {    /* skip data */
 
                 skperr(ns);
@@ -150 +150 @@
                 /* skip the event's data */
 
-                if (skp_ec(fp, (int32_t)(scsizes[etype][1] - 1))) {
+                if (skp_ec(fp, (int32_t)(scsizes[(int16_t)etype][1] - 1))) {
 
                         skperr(ns);

ram/scread.c

@@ -251 +251 @@
 
                         if (etype EQ EV_SBGN)
-                                seclist[sn][ep->e_data1] = ep;
+                                seclist[sn][(int16_t)ep->e_data1] = ep;
 
                         break;

ram/scwrite.c

@@ -76 +76 @@
                 ep->e_type &= 0x7F;             /* clear new-data flag */
 
-                nl += scsizes[ep->e_type][0];
-                nb += scsizes[ep->e_type][1];
+                nl += scsizes[(int16_t)ep->e_type][0];
+                nb += scsizes[(int16_t)ep->e_type][1];
 
                 switch (ep->e_type) {

ram/sedump.c

@@ -77 +77 @@
         x_unrec = FALSE;
 
-        return(evkinds[sep->e_type]);
+        return(evkinds[(int16_t)sep->e_type]);
 }