Mercurial > hg > dmlib

changeset 554:d4b84101e480

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove useless (Uint8 *) typecasts now that dmf_{read,write}_str() uses void.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 23 Nov 2012 15:38:32 +0200
parents b60220fd1669
children 31652085440a
files dmtimeline.c dmtimelinew.c jloadxm.c
diffstat 3 files changed, 21 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/dmtimeline.c	Fri Nov 23 15:31:41 2012 +0200
+++ b/dmtimeline.c	Fri Nov 23 15:38:32 2012 +0200
@@ -4,7 +4,7 @@
 static BOOL dmLoadFloatValue(DMResource *res, DMFloat *val)
 {
     char tmp[DT_FLOAT_STORE_SIZE + 1];
-    if (!dmf_read_str(res, (Uint8 *) tmp, DT_FLOAT_STORE_SIZE))
+    if (!dmf_read_str(res, &tmp, DT_FLOAT_STORE_SIZE))
         return FALSE;
 
     tmp[DT_FLOAT_STORE_SIZE] = 0;
@@ -89,7 +89,7 @@
     DMFTimelineEventParam hdr;
     Uint16 len;
 
-    if (!dmf_read_str(res, (Uint8 *) &hdr.name, sizeof(hdr.name)) ||
+    if (!dmf_read_str(res, &hdr.name, sizeof(hdr.name)) ||
         !dmf_read_le32(res, &hdr.type))
         return DMERR_FREAD;
 
@@ -113,7 +113,7 @@
                 return DMERR_FREAD;
 
             param->vstr = dmMalloc((unsigned int)len + 1);
-            if (!dmf_read_str(res, (Uint8 *) param->vstr, len))
+            if (!dmf_read_str(res, param->vstr, len))
                 return DMERR_FREAD;
 
             param->vstr[len] = 0;
@@ -135,7 +135,7 @@
     // Get basic event data
     if (!dmf_read_le32(res, &hdr.start) ||
         !dmf_read_le32(res, &hdr.duration) ||
-        !dmf_read_str(res, (Uint8 *) &hdr.effectName, sizeof(hdr.effectName)) ||
+        !dmf_read_str(res, &hdr.effectName, sizeof(hdr.effectName)) ||
         !dmf_read_le32(res, &hdr.nparams))
         return DMERR_FREAD;
 
@@ -196,7 +196,7 @@
     if ((*ptrack = track = dmMalloc0(sizeof(DMTimelineTrack))) == NULL)
         return DMERR_MALLOC;
 
-    if (!dmf_read_str(res, (Uint8 *) &hdr.name, sizeof(hdr.name)))
+    if (!dmf_read_str(res, &hdr.name, sizeof(hdr.name)))
         return DMERR_FREAD;
 
     hdr.enabled = dmfgetc(res);
@@ -236,13 +236,13 @@
         return DMERR_MALLOC;
 
     // Read and check header
-    if (!dmf_read_str(res, (Uint8 *) &hdr.magic, sizeof(hdr.magic)))
+    if (!dmf_read_str(res, &hdr.magic, sizeof(hdr.magic)))
         return DMERR_FREAD;
 
     if (memcmp(hdr.magic, DT_MAGIC_ID, sizeof(hdr.magic)) != 0)
         return DMERR_INVALID_DATA;
 
-    if (!dmf_read_str(res, (Uint8 *) &hdr.name, sizeof(hdr.name)) ||
+    if (!dmf_read_str(res, &hdr.name, sizeof(hdr.name)) ||
         !dmf_read_le32(res, &hdr.ntracks) ||
         !dmf_read_le32(res, &hdr.duration))
         return DMERR_FREAD;
--- a/dmtimelinew.c	Fri Nov 23 15:31:41 2012 +0200
+++ b/dmtimelinew.c	Fri Nov 23 15:38:32 2012 +0200
@@ -6,7 +6,7 @@
 {
     char tmp[DT_FLOAT_STORE_SIZE];
     snprintf(tmp, DT_FLOAT_STORE_SIZE, "%f", val);
-    return !dmf_write_str(res, (Uint8 *) tmp, DT_FLOAT_STORE_SIZE);
+    return !dmf_write_str(res, tmp, DT_FLOAT_STORE_SIZE);
 }
 
 
@@ -89,7 +89,7 @@
     strncpy(hdr.name, param->name, sizeof(hdr.name));
     hdr.type = param->type;
 
-    if (!dmf_write_str(res, (Uint8 *) hdr.name, sizeof(hdr.name)) ||
+    if (!dmf_write_str(res, hdr.name, sizeof(hdr.name)) ||
         !dmf_write_le32(res, hdr.type))
         return DMERR_FWRITE;
 
@@ -108,7 +108,7 @@
             if (!dmf_write_le16(res, len))
                 return DMERR_FWRITE;
 
-            if (!dmf_write_str(res, (Uint8 *) param->vstr, len))
+            if (!dmf_write_str(res, param->vstr, len))
                 return DMERR_FWRITE;
             break;
     }
@@ -129,7 +129,7 @@
 
     if (!dmf_write_le32(res, hdr.start) ||
         !dmf_write_le32(res, hdr.duration) ||
-        !dmf_write_str(res, (Uint8 *) hdr.effectName, sizeof(hdr.effectName)) ||
+        !dmf_write_str(res, hdr.effectName, sizeof(hdr.effectName)) ||
         !dmf_write_le32(res, hdr.nparams))
         return DMERR_FWRITE;
 
@@ -152,7 +152,7 @@
     hdr.enabled = track->enabled;
     hdr.nevents = track->nevents;
 
-    if (!dmf_write_str(res, (Uint8 *) &hdr.name, sizeof(hdr.name)))
+    if (!dmf_write_str(res, hdr.name, sizeof(hdr.name)))
         return DMERR_FWRITE;
 
     dmfputc(hdr.enabled, res);
@@ -182,8 +182,8 @@
     hdr.ntracks = tl->ntracks;
     hdr.duration = tl->duration;
     
-    if (!dmf_write_str(res, (Uint8 *) hdr.magic, sizeof(hdr.magic)) ||
-        !dmf_write_str(res, (Uint8 *) hdr.name, sizeof(hdr.name)) ||
+    if (!dmf_write_str(res, hdr.magic, sizeof(hdr.magic)) ||
+        !dmf_write_str(res, hdr.name, sizeof(hdr.name)) ||
         !dmf_write_le32(res, hdr.ntracks) ||
         !dmf_write_le32(res, hdr.duration))
         return DMERR_FWRITE;
--- a/jloadxm.c	Fri Nov 23 15:31:41 2012 +0200
+++ b/jloadxm.c	Fri Nov 23 15:38:32 2012 +0200
@@ -288,7 +288,7 @@
     // Get instrument header #1
     pos = dmftell(inFile);
     dmf_read_le32(inFile, &xmI1.headSize);
-    dmf_read_str(inFile, (Uint8 *) &xmI1.instName, sizeof(xmI1.instName));
+    dmf_read_str(inFile, &xmI1.instName, sizeof(xmI1.instName));
     xmI1.instType = dmfgetc(inFile);
     dmf_read_le16(inFile, &xmI1.nsamples);
 
@@ -312,7 +312,7 @@
 
         // Get instrument header #2
         dmf_read_le32(inFile, &xmI2.headSize);
-        dmf_read_str(inFile, (Uint8 *) &xmI2.sNumForNotes, sizeof(xmI2.sNumForNotes));
+        dmf_read_str(inFile, &xmI2.sNumForNotes, sizeof(xmI2.sNumForNotes));
 
         for (i = 0; i < XM_MaxEnvPoints; i++)
         {
@@ -400,7 +400,7 @@
             xmS.panning = dmfgetc(inFile);
             xmS.relNote = (signed char) dmfgetc(inFile);
             xmS.ARESERVED = dmfgetc(inFile);
-            dmf_read_str(inFile, (Uint8 *) &xmS.sampleName, sizeof(xmS.sampleName));
+            dmf_read_str(inFile, &xmS.sampleName, sizeof(xmS.sampleName));
 
             if (xmS.size > 0)
             {
@@ -601,10 +601,10 @@
 
     /* Get XM-header and check it
      */
-    dmf_read_str(inFile, (Uint8 *) &xmH.idMagic, sizeof(xmH.idMagic));
-    dmf_read_str(inFile, (Uint8 *) &xmH.songName, sizeof(xmH.songName));
+    dmf_read_str(inFile, &xmH.idMagic, sizeof(xmH.idMagic));
+    dmf_read_str(inFile, &xmH.songName, sizeof(xmH.songName));
     xmH.unUsed1A = dmfgetc(inFile);
-    dmf_read_str(inFile, (Uint8 *) &xmH.trackerName, sizeof(xmH.trackerName));
+    dmf_read_str(inFile, &xmH.trackerName, sizeof(xmH.trackerName));
     dmf_read_le16(inFile, &xmH.version);
     dmf_read_le32(inFile, &xmH.headSize);
     dmf_read_le16(inFile, &xmH.norders);
@@ -615,7 +615,7 @@
     dmf_read_le16(inFile, &xmH.flags);
     dmf_read_le16(inFile, &xmH.defSpeed);
     dmf_read_le16(inFile, &xmH.defTempo);
-    dmf_read_str(inFile, (Uint8 *)&xmH.orderList, sizeof(xmH.orderList));
+    dmf_read_str(inFile, &xmH.orderList, sizeof(xmH.orderList));
 
 
     // Check the fields, none of these are considered fatal