Skip to content
Permalink
Browse files

fix some compilation warnings

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
Merged #396
  • Loading branch information
denisfa authored and rkitover committed Mar 25, 2019
1 parent d919728 commit 5540790ff1f29548e4221ba80564cc8e7934de91
Showing with 14,193 additions and 13,929 deletions.
  1. +4 −0 fex/7z_C/7zAlloc.c
  2. +7 −1 fex/fex/Data_Reader.cpp
  3. +7,461 −7,461 headers/stb/stb_image.h
  4. +2 −2 src/Util.cpp
  5. +2 −0 src/Util.h
  6. +1,366 −1,366 src/common/ConfigManager.cpp
  7. +183 −183 src/common/ConfigManager.h
  8. +1 −1 src/common/SoundDriver.h
  9. +1 −1 src/common/SoundSDL.cpp
  10. +1 −1 src/common/SoundSDL.h
  11. +1 −1 src/common/iniparser.c
  12. +10 −6 src/filters/interframe.cpp
  13. +1 −1 src/filters/interframe.hpp
  14. +37 −37 src/filters/xBRZ/config.h
  15. +1,227 −1,225 src/filters/xBRZ/xbrz.cpp
  16. +102 −102 src/filters/xBRZ/xbrz.h
  17. +5 −9 src/gb/GB.cpp
  18. +3 −3 src/gb/gbCheats.cpp
  19. +10 −1 src/gb/gbMemory.cpp
  20. +1 −1 src/gb/gbSGB.cpp
  21. +871 −868 src/gba/BreakpointStructures.cpp
  22. +20 −20 src/gba/Cheats.cpp
  23. +9 −9 src/gba/GBA.cpp
  24. +1 −0 src/gba/GBA.h
  25. +7 −4 src/gba/GBALink.cpp
  26. +1 −0 src/gba/GBASockClient.cpp
  27. +1 −1 src/gba/GBAinline.h
  28. +1,753 −1,753 src/gba/debugger-expr-yacc.cpp
  29. +585 −584 src/gba/ereader.cpp
  30. +9 −9 src/gba/ereader.h
  31. +17 −4 src/gba/remote.cpp
  32. +79 −79 src/gba/remote.h
  33. +6 −0 src/libretro/SoundRetro.cpp
  34. +1 −0 src/libretro/SoundRetro.h
  35. +1 −1 src/libretro/UtilRetro.cpp
  36. +11 −1 src/sdl/SDL.cpp
  37. +1 −0 src/sdl/expr.cpp
  38. +3 −0 src/sdl/exprNode.cpp
  39. +1 −0 src/sdl/filters.cpp
  40. +13 −9 src/wx/cmdevents.cpp
  41. +1 −1 src/wx/copy-events.cmake
  42. +5 −5 src/wx/faudio.cpp
  43. +27 −2 src/wx/gfxviewers.cpp
  44. +86 −34 src/wx/guiinit.cpp
  45. +4 −1 src/wx/openal.cpp
  46. +69 −58 src/wx/opts.cpp
  47. +8 −0 src/wx/opts.h
  48. +18 −14 src/wx/panel.cpp
  49. +12 −6 src/wx/sys.cpp
  50. +36 −5 src/wx/viewers.cpp
  51. +27 −18 src/wx/viewsupt.cpp
  52. +2 −0 src/wx/viewsupt.h
  53. +11 −4 src/wx/widgets/joyedit.cpp
  54. +16 −15 src/wx/widgets/keyedit.cpp
  55. +7 −2 src/wx/widgets/sdljoy.cpp
  56. +4 −0 src/wx/widgets/wx/joyedit.h
  57. +1 −0 src/wx/widgets/wx/keyedit.h
  58. +7 −3 src/wx/widgets/wx/wxmisc.h
  59. +2 −1 src/wx/widgets/wxmisc.cpp
  60. +30 −16 src/wx/wxvbam.cpp
  61. +5 −0 src/wx/wxvbam.h
@@ -20,6 +20,7 @@ int g_allocCountTemp = 0;

void* SzAlloc(void* p, size_t size)
{
(void)p; // unused param
if (size == 0)
return 0;
#ifdef _SZ_ALLOC_DEBUG
@@ -31,6 +32,7 @@ void* SzAlloc(void* p, size_t size)

void SzFree(void* p, void* address)
{
(void)p; // unused param
#ifdef _SZ_ALLOC_DEBUG
if (address != 0) {
g_allocCount--;
@@ -42,6 +44,7 @@ void SzFree(void* p, void* address)

void* SzAllocTemp(void* p, size_t size)
{
(void)p; // unused param
if (size == 0)
return 0;
#ifdef _SZ_ALLOC_DEBUG
@@ -56,6 +59,7 @@ void* SzAllocTemp(void* p, size_t size)

void SzFreeTemp(void* p, void* address)
{
(void)p; // unused param
#ifdef _SZ_ALLOC_DEBUG
if (address != 0) {
g_allocCountTemp--;
@@ -325,24 +325,30 @@ size_t utf8_encode_char( unsigned wide, char * target )
target[5] = 0x80 | ( wide & 0x3F );
wide = wide >> 6;
wide |= 0x4000000;
break;
case 5:
target[4] = 0x80 | ( wide & 0x3F );
wide = wide >> 6;
wide |= 0x200000;
break;
case 4:
target[3] = 0x80 | ( wide & 0x3F );
wide = wide >> 6;
wide |= 0x10000;
break;
case 3:
target[2] = 0x80 | ( wide & 0x3F );
wide = wide >> 6;
wide |= 0x800;
break;
case 2:
target[1] = 0x80 | ( wide & 0x3F );
wide = wide >> 6;
wide |= 0xC0;
case 1:
break;
case 1:
target[0] = wide;
break;
}

return count;

0 comments on commit 5540790

Please sign in to comment.
You can’t perform that action at this time.