From 44eebbb6e025966af9f189c3113b7f073dac8af1 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 7 Mar 2018 14:47:06 +0100 Subject: [PATCH] Fixed compiler warnings. --- channels/echo/server/echo_main.c | 4 ++-- client/X11/xf_client.c | 2 +- libfreerdp/codec/progressive.c | 8 ++++---- server/shadow/X11/x11_shadow.c | 2 +- server/shadow/shadow_client.c | 2 +- winpr/libwinpr/synch/test/TestSynchCritical.c | 12 ++++++------ 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/channels/echo/server/echo_main.c b/channels/echo/server/echo_main.c index 9c91d69..b3f8eb0 100644 --- a/channels/echo/server/echo_main.c +++ b/channels/echo/server/echo_main.c @@ -206,8 +206,8 @@ static DWORD WINAPI echo_server_thread_func(LPVOID arg) { WLog_ERR(TAG, "Stream_New failed!"); WTSVirtualChannelClose(echo->echo_channel); - ExitThread((DWORD)ERROR_NOT_ENOUGH_MEMORY); - return NULL; + ExitThread(ERROR_NOT_ENOUGH_MEMORY); + return ERROR_NOT_ENOUGH_MEMORY; } while (ready) diff --git a/client/X11/xf_client.c b/client/X11/xf_client.c index e6a8c92..05ee012 100644 --- a/client/X11/xf_client.c +++ b/client/X11/xf_client.c @@ -1314,7 +1314,7 @@ static void xf_post_disconnect(freerdp* instance) } if ((xfc->window != NULL) && (xfc->drawable == xfc->window->handle)) - xfc->drawable = NULL; + xfc->drawable = 0; else xf_DestroyDummyWindow(xfc, xfc->drawable); diff --git a/libfreerdp/codec/progressive.c b/libfreerdp/codec/progressive.c index c7c287e..d3dc5c3 100644 --- a/libfreerdp/codec/progressive.c +++ b/libfreerdp/codec/progressive.c @@ -1684,7 +1684,7 @@ INT32 progressive_decompress(PROGRESSIVE_CONTEXT* progressive, if (region->numRects > progressive->cRects) { - BYTE* tmpBuf = (RFX_RECT*) realloc(progressive->rects, + RFX_RECT* tmpBuf = (RFX_RECT*) realloc(progressive->rects, region->numRects * sizeof(RFX_RECT)); if (!tmpBuf) return -1016; @@ -1713,7 +1713,7 @@ INT32 progressive_decompress(PROGRESSIVE_CONTEXT* progressive, if (region->numQuant > progressive->cQuant) { - BYTE* tmpBuf = (RFX_COMPONENT_CODEC_QUANT*) realloc( + RFX_COMPONENT_CODEC_QUANT* tmpBuf = (RFX_COMPONENT_CODEC_QUANT*) realloc( progressive->quantVals, region->numQuant * sizeof(RFX_COMPONENT_CODEC_QUANT)); if (!tmpBuf) @@ -1746,7 +1746,7 @@ INT32 progressive_decompress(PROGRESSIVE_CONTEXT* progressive, if (region->numProgQuant > progressive->cProgQuant) { - BYTE* tmpBuf = (RFX_PROGRESSIVE_CODEC_QUANT*) realloc( + RFX_PROGRESSIVE_CODEC_QUANT* tmpBuf = (RFX_PROGRESSIVE_CODEC_QUANT*) realloc( progressive->quantProgVals, region->numProgQuant * sizeof(RFX_PROGRESSIVE_CODEC_QUANT)); if (!tmpBuf) @@ -1779,7 +1779,7 @@ INT32 progressive_decompress(PROGRESSIVE_CONTEXT* progressive, if (progressive->cTiles < surface->gridSize) { - BYTE* tmpBuf = (RFX_PROGRESSIVE_TILE**) realloc(progressive->tiles, + RFX_PROGRESSIVE_TILE** tmpBuf = (RFX_PROGRESSIVE_TILE**) realloc(progressive->tiles, surface->gridSize * sizeof(RFX_PROGRESSIVE_TILE*)); if (!tmpBuf) return -1025; diff --git a/server/shadow/X11/x11_shadow.c b/server/shadow/X11/x11_shadow.c index 98fb732..d3a07f9 100644 --- a/server/shadow/X11/x11_shadow.c +++ b/server/shadow/X11/x11_shadow.c @@ -919,7 +919,7 @@ static DWORD WINAPI x11_shadow_subsystem_thread(LPVOID arg) } ExitThread(0); - return NULL; + return 0; } static int x11_shadow_subsystem_base_init(x11ShadowSubsystem* subsystem) diff --git a/server/shadow/shadow_client.c b/server/shadow/shadow_client.c index d24764f..94337c9 100644 --- a/server/shadow/shadow_client.c +++ b/server/shadow/shadow_client.c @@ -719,7 +719,7 @@ static UINT shadow_client_rdpgfx_caps_advertise(RdpgfxServerContext* context, if (settings) { flags = pdu.capsSet->flags; - settings->GfxAVC444v2 = settings->GfxAVC444 = settings->GfxAVC444 = FALSE; + settings->GfxAVC444v2 = settings->GfxAVC444 = FALSE; settings->GfxThinClient = (flags & RDPGFX_CAPS_FLAG_THINCLIENT); settings->GfxSmallCache = (flags & RDPGFX_CAPS_FLAG_SMALL_CACHE); #ifndef WITH_GFX_H264 diff --git a/winpr/libwinpr/synch/test/TestSynchCritical.c b/winpr/libwinpr/synch/test/TestSynchCritical.c index 3ae971d..3c1ab0e 100644 --- a/winpr/libwinpr/synch/test/TestSynchCritical.c +++ b/winpr/libwinpr/synch/test/TestSynchCritical.c @@ -55,25 +55,25 @@ static DWORD WINAPI TestSynchCritical_Test1(LPVOID arg) rc = 1; if (!TestSynchCritical_TriggerAndCheckRaceCondition(hThread, rc)) - return (PVOID)1; + return 1; /* add some random recursion level */ j = rand()%5; for (i=0; i