From d9aa430817fc4bc60c0aae634153cb7fa6872960 Mon Sep 17 00:00:00 2001 From: Alam Ed Arias Date: Sat, 28 May 2016 19:42:38 -0400 Subject: [PATCH] use memmove in D_MD5PasswordPass() and drop noreturn --- src/d_netcmd.c | 2 +- src/sdl/i_main.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 3dd95bf9..1658d1a6 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -2601,7 +2601,7 @@ static void D_MD5PasswordPass(const UINT8 *buffer, size_t len, const char *salt, if (len > 256-strlen(salt)) len = 256-strlen(salt); - memcpy(tmpbuf, buffer, len); + memmove(tmpbuf, buffer, len); strcpy(&tmpbuf[len], salt); len += strlen(salt); if (len < 256) diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c index 2364281d..ab7631bc 100644 --- a/src/sdl/i_main.c +++ b/src/sdl/i_main.c @@ -144,10 +144,8 @@ void XBoxStartup() myargv = NULL; #else #ifdef FORCESDLMAIN -FUNCNORETURN int SDL_main(int argc, char **argv) #else -FUNCNORETURN int main(int argc, char **argv) #endif { @@ -245,8 +243,6 @@ int main(int argc, char **argv) #endif // return to OS -#if !defined (__GNUC__) return 0; -#endif } #endif