Changeset 8973acd in buchla-68k for libcio/write.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/write.c (modified) (10 diffs)

libcio/write.c

@@ -12 +12 @@
 /* write routine dispatch table */
 
-static  int16_t (*wr_tab[])(io_arg arg, int8_t *buff, int16_t len) = {
+static  int16_t (*wr_tab[])(io_arg arg, void *buff, int16_t len) = {
 
         _badfio,        /* 0 - invalid entry */
@@ -25 +25 @@
 */
 
-int16_t _putsec(struct fcb *fp, int8_t *buf, uint16_t len)
+int16_t _putsec(struct fcb *fp, void *buf, int16_t len)
 {
 #if DEBUGIT
@@ -92 +92 @@
 */
 
-int16_t _filewr(struct fcb *fp, int8_t *buffer, uint16_t len)
+int16_t _filewr(io_arg arg, void *buffer, int16_t len)
 {
-        register uint16_t j, k, l;
+        struct fcb *fp;
+        int8_t *buffer8;
+        register int16_t j, k, l;
         int16_t clustr;
-        register int32_t curpos;
-
-        curpos = fp->offset + (fp->curlsn << FILESHFT); /* get position */
+        register int32_t cpos;
+
+        fp = (struct fcb *)arg;
+        buffer8 = buffer;
+
+        cpos = fp->offset + ((int32_t)fp->curlsn << FILESHFT);  /* get position */
 
         if (fp->de.bclust EQ 0) {       /* see if we need to allocate */
@@ -104 +109 @@
 #if DEBUGIT
         if (fsdebug)
-                if (curpos)
+                if (cpos)
                         printf("_filewr():  ERROR - bclust EQ 0 and curpos (%ld) NE 0\n",
-                                curpos);
+                                cpos);
 #endif
 
@@ -115 +120 @@
                 }
 
-                fp->de.bclust = micons(clustr);         /* update FCB */
+                fp->de.bclust = micon16((uint16_t)clustr);      /* update FCB */
                 _ptcl12(_thefat, clustr, 0x0FF8);       /* update FAT */
                 _fatmod = TRUE;
@@ -137 +142 @@
         if (fsdebug)
                 printf("_filewr():  init pos=%ld, len=%u, curcls=%u, offset=%u\n",
-                        curpos, len, fp->curcls, fp->offset);
+                        cpos, len, fp->curcls, fp->offset);
 #endif
 
@@ -145 +150 @@
                         l = len;
 
-                if (_putsec(fp, buffer, l))     /* fill up the sector */
+                if (_putsec(fp, buffer8, l))    /* fill up the sector */
                         return(-1);
         }
 
-        if (k = (len - l) / BPSEC) {    /* write out any full sectors */
-
-                if ((j = blkwr(fp, buffer + l, k)) NE 0) {
+        if ((k = (len - l) / BPSEC)) {  /* write out any full sectors */
+
+                if ((j = blkwr(fp, buffer8 + l, k)) NE 0) {
 
                         l += (k - j) * BPSEC;   /* update amount written */
 
-                        if ((curpos + l) > fp->curlen)  /* udpate file length */
-                                fp->de.flen = miconl(fp->curlen = curpos + l);
+                        if ((cpos + l) > fp->curlen)    /* udpate file length */
+                                fp->de.flen = micon32((uint32_t)(fp->curlen = cpos + l));
 
 #if DEBUGIT
@@ -172 +177 @@
         if (l < len) {                  /* write out partial sector at end */
 
-                if (_putsec(fp, buffer + l, len - l)) {
-
-                        if ((curpos + l) > fp->curlen)  /* update file length */
-                                fp->de.flen = miconl(fp->curlen = curpos + l);
+                if (_putsec(fp, buffer8 + l, len - l)) {
+
+                        if ((cpos + l) > fp->curlen)    /* update file length */
+                                fp->de.flen = micon32((uint32_t)(fp->curlen = cpos + l));
 
 #if DEBUGIT
@@ -187 +192 @@
         }
 
-        if ((curpos + len) > fp->curlen)                /* update file length */
-                fp->de.flen = miconl(fp->curlen = curpos + len);
+        if ((cpos + len) > fp->curlen)          /* update file length */
+                fp->de.flen = micon32((uint32_t)(fp->curlen = cpos + len));
 
 #if DEBUGIT
@@ -205 +210 @@
 */
 
-int16_t write(int16_t fd, int8_t *buff, uint16_t len)
+int16_t write(int16_t fd, void *buff, int16_t len)
 {
         register struct channel *chp;