Changeset e102943 in buchla-68k for iolib

Timestamp:

07/15/2017 11:33:07 AM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

d18a473

Parents:

dade7a0

Message:

No more warnings in iolib.

Location:

iolib

Files:

• dofmt.c (modified) (4 diffs)
• mdump.c (modified) (3 diffs)
• rawio.c (modified) (4 diffs)
• sprintf.c (modified) (1 diff)

iolib/dofmt.c

@@ -32 +32 @@
 #define tonum(x)        ((x)-'0')
 #define todigit(x)      ((x)+'0')
-#define max(a,b)        ((a)>(b)?(a):(b))
-#define min(a,b)        ((a)<(b)?(a):(b))
 
 int32_t dofmt_(int16_t (*putsub)(int16_t c), int8_t *format, va_list args)
@@ -71 +69 @@
                         ;
 
-                if (n = (int32_t)format - (int32_t)bp) {
+                if ((n = (int32_t)format - (int32_t)bp)) {
 
                         count += n;
@@ -168 +166 @@
                 fixed:
 
-                        if (prec < 0)
+                        if (prec < 0) {
                                 if (flzero AND width > 0)
                                         prec = width;
                                 else
                                         prec = 1;
+                        }
 
                         if (length)
@@ -265 +264 @@
 
                 default:
-                        buf[0] = fcode;
+                        buf[0] = (int8_t)fcode;
                         goto c_merge;
 
                 case 'c':
-                        buf[0] = va_arg(args, int16_t);
+                        buf[0] = (int8_t)va_arg(args, int16_t);
 
                 c_merge:

iolib/mdump.c

@@ -50 +50 @@
 */
 
-void mdump(int8_t *begin, int8_t *end, int32_t start)
+void mdump(int8_t *from, int8_t *to, int32_t start)
 {
         int32_t i, ii;
@@ -60 +60 @@
         j = 0;
 
-        if (begin GT end)
+        if (from GT to)
                 return;
 
-        while (begin LE end) {
+        while (from LE to) {
 
-                c = *begin++;
+                c = *from++;
 
                 if (! (i % PERLINE)) {
@@ -86 +86 @@
         }
 
-        if (k = (i % PERLINE)) {
+        if ((k = (int16_t)(i % PERLINE))) {
 
                 k = PERLINE - k;

iolib/rawio.c

@@ -75 +75 @@
         for (i = 0; i < nb; i++) {      /* main read loop */
 
-                c = BIOS(B_GETC, unit) & 0xFF;  /* get a byte from the unit */
+                c = (int8_t)(BIOS(B_GETC, unit) & 0xFF);        /* get a byte from the unit */
 
                 *bp++ = c;      /* add it to the buffer */
@@ -104 +104 @@
         while (bc LT nb) {
 
-                c = BIOS(B_GETC, unit) & 0xFF;
+                c = (int8_t)(BIOS(B_GETC, unit) & 0xFF);
 
                 switch (c) {
@@ -163 +163 @@
         while (bc LT nb) {
 
-                c = BIOS(B_GETC, unit) & 0xFF;
+                c = (int8_t)(BIOS(B_GETC, unit) & 0xFF);
 
                 switch (c) {
@@ -198 +198 @@
         bp = buf;       /* setup buffer pointer */
 
-        while (c = *bp++)       /* send the string, a byte at a time */
+        while ((c = *bp++))     /* send the string, a byte at a time */
                 BIOS(B_PUTC, unit, c);
 }

iolib/sprintf.c

@@ -38 +38 @@
 static int16_t spsub(int16_t c)
 {
-        return((*buff++ = c) & 0xFF);
+        return((*buff++ = (int8_t)c) & 0xFF);
 }