Changeset 8973acd in buchla-68k for libcio/read.c

Timestamp:

07/15/2017 03:12:10 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

ea232f9

Parents:

7d0d347

Message:

No more warnings in libcio.

File:

• libcio/read.c (modified) (5 diffs)

libcio/read.c

@@ -38 +38 @@
 #include "ram.h"
 
-static int16_t (*t_read[])(io_arg arg, int8_t *buff, int16_t len) = {
+static int16_t (*t_read[])(io_arg arg, void *buff, int16_t len) = {
 
         _badfio,        /* 0 - invalid type */
@@ -52 +52 @@
 */
 
-int16_t read(int16_t fd, int8_t *buff, uint16_t len)
+int16_t read(int16_t fd, void *buff, int16_t len)
 {
         register struct channel *chp;
@@ -73 +73 @@
 */
 
-int16_t _getsec(struct fcb *fp, int8_t *buf, uint16_t len)
+int16_t _getsec(struct fcb *fp, void *buf, int16_t len)
 {
         if ((errno = ReadRN(fp, Wrkbuf)) NE 0)  /* get current sector */
@@ -98 +98 @@
 */
 
-int16_t _filerd(struct fcb *fp, int8_t *buffer, uint16_t len)
+int16_t _filerd(io_arg arg, void *buffer, int16_t len)
 {
-        register uint16_t l;
-        register uint16_t j, k;
-        register int32_t curpos, newpos;
+        struct fcb *fp;
+        int8_t *buffer8;
+        register int16_t l;
+        register int16_t j, k;
+        register int32_t cpos, npos;
+
+        fp = (struct fcb *)arg;
+        buffer8 = buffer;
 
         l = 0;
-        curpos = fp->offset + (fp->curlsn << FILESHFT);
-        newpos = curpos + len;
+        cpos = fp->offset + ((int32_t)fp->curlsn << FILESHFT);
+        npos = cpos + len;
 
 #if     DEBUGIT
         if (fsdebug)
                 printf("_filerd():  len=%u, curpos=%ld, newpos=%ld, curlen=%ld\n",
-                        len, curpos, newpos, fp->curlen);
+                        len, cpos, npos, fp->curlen);
 #endif
 
-        if (newpos GT fp->curlen) {
+        if (npos GT fp->curlen) {
 
-                len = fp->curlen - curpos;
+                len = (int16_t)(fp->curlen - cpos);
 
 #if     DEBUGIT
@@ -129 +134 @@
                         l = len;
 
-                if (_getsec(fp, buffer, l))     /* read what we can */
+                if (_getsec(fp, buffer8, l))    /* read what we can */
                         return(len);    /* return if ERROR */
         }
 
-        if (k = (len - l) / BPSEC)              /* see what we still need */
-                        if ((j = blkrd(fp, buffer + l, k)) NE 0)
+        if ((k = (len - l) / BPSEC)) {          /* see what we still need */
+                if ((j = blkrd(fp, buffer8 + l, k)) NE 0)
                         return((k - j) * BPSEC + l);    /* return bytes read */
+        }
 
         l += k * BPSEC;                 /* adjust l by what we just read */
 
         if (l < len)    /* see if we still need a partial sector */
-                if (_getsec(fp, buffer + l, len - l))   /* read partial sector */
+                if (_getsec(fp, buffer8 + l, len - l))  /* read partial sector */
                         return(l);              /* return if ERROR or EOF */