diff --git a/src/d_netfil.c b/src/d_netfil.c
index 5e7f59310c84bca583253276bee4927a995cf377..bd7089609f8ed2ff9ac23064173019bc28671416 100644
--- a/src/d_netfil.c
+++ b/src/d_netfil.c
@@ -716,7 +716,7 @@ void SV_FileSendTicker(void)
if (ram)
M_Memcpy(p->data, &f->id.ram[transfer[i].position], size);
else if (fread(p->data, 1, size, transfer[i].currentfile) != size)
- I_Error("SV_FileSendTicker: can't read %s byte on %s at %d because %s", sizeu1(size), f->id.filename, transfer[i].position, strerror(ferror(transfer[i].currentfile)));
+ I_Error("SV_FileSendTicker: can't read %s byte on %s at %d because %s", sizeu1(size), f->id.filename, transfer[i].position, M_FileError(transfer[i].currentfile));
p->position = LONG(transfer[i].position);
// Put flag so receiver knows the total size
if (transfer[i].position + size == f->size)
@@ -794,7 +794,7 @@ void Got_Filetxpak(void)
// We can receive packet in the wrong order, anyway all os support gaped file
fseek(file->file, pos, SEEK_SET);
if (fwrite(netbuffer->u.filetxpak.data,size,1,file->file) != 1)
- I_Error("Can't write to %s: %s\n",filename, strerror(ferror(file->file)));
+ I_Error("Can't write to %s: %s\n",filename, M_FileError(file->file));
file->currentsize += size;
// Finished?
diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c
index b1222ce672fbc64c4487b6c46cb31498a9de7944..6bda1988a53479b388557e20cf6ab0e207793ce1 100644
--- a/src/lua_playerlib.c
+++ b/src/lua_playerlib.c
@@ -744,7 +744,7 @@ static int power_get(lua_State *L)
UINT16 *powers = *((UINT16 **)luaL_checkudata(L, 1, META_POWERS));
powertype_t p = luaL_checkinteger(L, 2);
if (p >= NUMPOWERS)
- return luaL_error(L, LUA_QL("powertype_t") " cannot be %u", p);
+ return luaL_error(L, LUA_QL("powertype_t") " cannot be %d", (INT16)p);
lua_pushinteger(L, powers[p]);
return 1;
}
@@ -756,7 +756,7 @@ static int power_set(lua_State *L)
powertype_t p = luaL_checkinteger(L, 2);
UINT16 i = (UINT16)luaL_checkinteger(L, 3);
if (p >= NUMPOWERS)
- return luaL_error(L, LUA_QL("powertype_t") " cannot be %u", p);
+ return luaL_error(L, LUA_QL("powertype_t") " cannot be %d", (INT16)p);
if (hud_running)
return luaL_error(L, "Do not alter player_t in HUD rendering code!");
powers[p] = i;
diff --git a/src/m_argv.c b/src/m_argv.c
index 117ec78339cf9768cab2110da40d00d619178c37..bb43ad57cef30eee074bfc7db6111300eb6afc20 100644
--- a/src/m_argv.c
+++ b/src/m_argv.c
@@ -16,6 +16,7 @@
#include "doomdef.h"
#include "command.h"
#include "m_argv.h"
+#include "m_misc.h"
/** \brief number of arg
*/
@@ -161,7 +162,7 @@ void M_FindResponseFile(void)
if (!file)
I_Error("No more free memory for the response file");
if (fread(file, size, 1, handle) != 1)
- I_Error("Couldn't read response file because %s", strerror(ferror(handle)));
+ I_Error("Couldn't read response file because %s", M_FileError(handle));
fclose(handle);
// keep all the command line arguments following @responsefile
diff --git a/src/m_fixed.h b/src/m_fixed.h
index 370633c1f6b0de4752f575bc3ab5929fd0a329cd..08bc958841cba10fa9d7b2db2f11d98d8cb0f5bc 100644
--- a/src/m_fixed.h
+++ b/src/m_fixed.h
@@ -201,14 +201,7 @@ FUNCMATH FUNCINLINE static ATTRINLINE fixed_t FixedDiv(fixed_t a, fixed_t b)
*/
FUNCMATH FUNCINLINE static ATTRINLINE fixed_t FixedRem(fixed_t x, fixed_t y)
{
- const boolean n = x < 0;
- x = abs(x);
- while (x >= y)
- x -= y;
- if (n)
- return -x;
- else
- return x;
+ return x % y;
}
/** \brief The FixedSqrt function
diff --git a/src/m_misc.c b/src/m_misc.c
index 20d5f1de4d61fa804e0bafbefedd074365442d9c..5cfb20f0fed98578f370d365d4e62854a9c7d155 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -23,6 +23,8 @@
#include <unistd.h>
#endif
+#include <errno.h>
+
// Extended map support.
#include <ctype.h>
@@ -2441,3 +2443,13 @@ void M_SetupMemcpy(void)
M_Memcpy = cpu_cpy;
#endif
}
+
+/** Return the appropriate message for a file error or end of file.
+*/
+const char *M_FileError(FILE *fp)
+{
+ if (ferror(fp))
+ return strerror(errno);
+ else
+ return "end-of-file";
+}
diff --git a/src/m_misc.h b/src/m_misc.h
index 7038e3e48d94cbed3c1bbb9ee71be9f35e33a942..c37865ff3e6eafec831e8c16f850694d576ec865 100644
--- a/src/m_misc.h
+++ b/src/m_misc.h
@@ -94,6 +94,8 @@ void strcatbf(char *s1, const char *s2, const char *s3);
void M_SetupMemcpy(void);
+const char *M_FileError(FILE *handle);
+
// counting bits, for weapon ammo code, usually
FUNCMATH UINT8 M_CountBits(UINT32 num, UINT8 size);
diff --git a/src/w_wad.c b/src/w_wad.c
index c3f38e7376c912e9d1a91cbcd65c3fc6a8aea379..0cd2175ecf394af5144e5bb75fd94c1842ec9505 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -383,7 +383,7 @@ static lumpinfo_t* ResGetLumpsWad (FILE* handle, UINT16* nlmp, const char* filen
// read the header
if (fread(&header, 1, sizeof header, handle) < sizeof header)
{
- CONS_Alert(CONS_ERROR, M_GetText("Can't read wad header because %s\n"), strerror(ferror(handle)));
+ CONS_Alert(CONS_ERROR, M_GetText("Can't read wad header because %s\n"), M_FileError(handle));
return NULL;
}
@@ -406,7 +406,7 @@ static lumpinfo_t* ResGetLumpsWad (FILE* handle, UINT16* nlmp, const char* filen
if (fseek(handle, header.infotableofs, SEEK_SET) == -1
|| fread(fileinfo, 1, i, handle) < i)
{
- CONS_Alert(CONS_ERROR, M_GetText("Corrupt wadfile directory (%s)\n"), strerror(ferror(handle)));
+ CONS_Alert(CONS_ERROR, M_GetText("Corrupt wadfile directory (%s)\n"), M_FileError(handle));
free(fileinfov);
return NULL;
}
@@ -427,7 +427,7 @@ static lumpinfo_t* ResGetLumpsWad (FILE* handle, UINT16* nlmp, const char* filen
handle) < sizeof realsize)
{
I_Error("corrupt compressed file: %s; maybe %s", /// \todo Avoid the bailout?
- filename, strerror(ferror(handle)));
+ filename, M_FileError(handle));
}
realsize = LONG(realsize);
if (realsize != 0)
@@ -565,7 +565,7 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp)
fseek(handle, -4, SEEK_CUR);
if (fread(&zend, 1, sizeof zend, handle) < sizeof zend)
{
- CONS_Alert(CONS_ERROR, "Corrupt central directory (%s)\n", strerror(ferror(handle)));
+ CONS_Alert(CONS_ERROR, "Corrupt central directory (%s)\n", M_FileError(handle));
return NULL;
}
numlumps = zend.entries;
@@ -582,7 +582,7 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp)
if (fread(zentry, 1, sizeof(zentry_t), handle) < sizeof(zentry_t))
{
- CONS_Alert(CONS_ERROR, "Failed to read central directory (%s)\n", strerror(ferror(handle)));
+ CONS_Alert(CONS_ERROR, "Failed to read central directory (%s)\n", M_FileError(handle));
Z_Free(lumpinfo);
free(zentries);
return NULL;
@@ -602,7 +602,7 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp)
fullname = malloc(zentry->namelen + 1);
if (fgets(fullname, zentry->namelen + 1, handle) != fullname)
{
- CONS_Alert(CONS_ERROR, "Unable to read lumpname (%s)\n", strerror(ferror(handle)));
+ CONS_Alert(CONS_ERROR, "Unable to read lumpname (%s)\n", M_FileError(handle));
Z_Free(lumpinfo);
free(zentries);
free(fullname);