summaryrefslogtreecommitdiff
path: root/apps/plugins/doom/d_deh.c
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2017-01-16 00:10:38 +0100
committerGerrit Rockbox <gerrit@rockbox.org>2017-02-04 17:24:47 +0100
commitd7871914acd2ed77f43344e36e08944524a67d9e (patch)
tree7bcef243d9b53c3703c305b8a5f9f8a8488eabfb /apps/plugins/doom/d_deh.c
parent1245c5fe61f6ca8e1980a33a8b8f7ea4322829fd (diff)
downloadrockbox-d7871914acd2ed77f43344e36e08944524a67d9e.tar.gz
rockbox-d7871914acd2ed77f43344e36e08944524a67d9e.zip
Fix dangerous casts
On Windows 64-bit, the size of long is 32-bit, thus any pointer to long cast is not valid. In any case, one should use intptr_t and ptrdiff_t when casting to integers. This commit attempts to fix all instances reported by GCC. When relevant, I replaced code by the macros PTR_ADD, ALIGN_UP from system.h Change-Id: I2273b0e8465d3c4689824717ed5afa5ed238a2dc
Diffstat (limited to 'apps/plugins/doom/d_deh.c')
-rw-r--r--apps/plugins/doom/d_deh.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/plugins/doom/d_deh.c b/apps/plugins/doom/d_deh.c
index abdaeae9ae..1a399e3b49 100644
--- a/apps/plugins/doom/d_deh.c
+++ b/apps/plugins/doom/d_deh.c
@@ -2082,7 +2082,7 @@ void deh_procSounds(DEHFILE *fpin, int fpout, char *line)
2082 S_sfx[indexnum].priority = (int)value; 2082 S_sfx[indexnum].priority = (int)value;
2083 else 2083 else
2084 if (!strcasecmp(key,deh_sfxinfo[3])) // Zero 1 2084 if (!strcasecmp(key,deh_sfxinfo[3])) // Zero 1
2085 S_sfx[indexnum].link = (sfxinfo_t *)((long) value); 2085 S_sfx[indexnum].link = (sfxinfo_t *)((intptr_t) value);
2086 else 2086 else
2087 if (!strcasecmp(key,deh_sfxinfo[4])) // Zero 2 2087 if (!strcasecmp(key,deh_sfxinfo[4])) // Zero 2
2088 S_sfx[indexnum].pitch = (int)value; 2088 S_sfx[indexnum].pitch = (int)value;
@@ -2091,7 +2091,7 @@ void deh_procSounds(DEHFILE *fpin, int fpout, char *line)
2091 S_sfx[indexnum].volume = (int)value; 2091 S_sfx[indexnum].volume = (int)value;
2092 else 2092 else
2093 if (!strcasecmp(key,deh_sfxinfo[6])) // Zero 4 2093 if (!strcasecmp(key,deh_sfxinfo[6])) // Zero 4
2094 S_sfx[indexnum].data = (void *) ((long) value); // killough 5/3/98: changed cast 2094 S_sfx[indexnum].data = (void *) ((intptr_t) value); // killough 5/3/98: changed cast
2095 else 2095 else
2096 if (!strcasecmp(key,deh_sfxinfo[7])) // Neg. One 1 2096 if (!strcasecmp(key,deh_sfxinfo[7])) // Neg. One 1
2097 S_sfx[indexnum].usefulness = (int)value; 2097 S_sfx[indexnum].usefulness = (int)value;