From: Armin Novak Date: Tue, 3 Apr 2018 11:06:41 +0000 (+0200) Subject: Removed all calls to WLog_Init and WLog_Uninit X-Git-Tag: 2.0.0-rc2~16^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e0d112d548f23e49279eb978c7bcc735ed2fd720;p=platform%2Fupstream%2Ffreerdp.git Removed all calls to WLog_Init and WLog_Uninit Since the calls are no longer required remove their usage. --- diff --git a/channels/rail/client/rail_main.c b/channels/rail/client/rail_main.c index 3a0b038..6671f48 100644 --- a/channels/rail/client/rail_main.c +++ b/channels/rail/client/rail_main.c @@ -849,7 +849,6 @@ BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS pEntryPoints, PVOID p isFreerdp = TRUE; } - WLog_Init(); rail->log = WLog_Get("com.freerdp.channels.rail.client"); WLog_Print(rail->log, WLOG_DEBUG, "VirtualChannelEntryEx"); CopyMemory(&(rail->channelEntryPoints), pEntryPoints, diff --git a/channels/serial/client/serial_main.c b/channels/serial/client/serial_main.c index b8f73e6..cdaf7e3 100644 --- a/channels/serial/client/serial_main.c +++ b/channels/serial/client/serial_main.c @@ -840,7 +840,6 @@ UINT DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints) if ((name && name[0]) && (path && path[0])) { wLog* log; - WLog_Init(); log = WLog_Get("com.freerdp.channel.serial.client"); WLog_Print(log, WLOG_DEBUG, "initializing"); #ifndef __linux__ /* to be removed */ diff --git a/client/common/client.c b/client/common/client.c index fce5bba..2c8bbbb 100644 --- a/client/common/client.c +++ b/client/common/client.c @@ -58,7 +58,6 @@ rdpContext* freerdp_client_context_new(RDP_CLIENT_ENTRY_POINTS* pEntryPoints) if (!pEntryPoints) return NULL; - WLog_Init(); IFCALL(pEntryPoints->GlobalInit); instance = freerdp_new(); @@ -116,7 +115,6 @@ void freerdp_client_context_free(rdpContext* context) free(instance->pClientEntryPoints); freerdp_free(instance); } - WLog_Uninit(); } int freerdp_client_start(rdpContext* context) diff --git a/libfreerdp/cache/glyph.c b/libfreerdp/cache/glyph.c index 0292e0e..80cfa6b 100644 --- a/libfreerdp/cache/glyph.c +++ b/libfreerdp/cache/glyph.c @@ -688,7 +688,6 @@ rdpGlyphCache* glyph_cache_new(rdpSettings* settings) if (!glyphCache) return NULL; - WLog_Init(); glyphCache->log = WLog_Get("com.freerdp.cache.glyph"); glyphCache->settings = settings; glyphCache->context = ((freerdp*) settings->instance)->update->context; diff --git a/libfreerdp/codec/nsc.c b/libfreerdp/codec/nsc.c index b5e1c25..567b72c 100644 --- a/libfreerdp/codec/nsc.c +++ b/libfreerdp/codec/nsc.c @@ -281,7 +281,6 @@ NSC_CONTEXT* nsc_context_new(void) if (!context->priv) goto error_priv; - WLog_Init(); context->priv->log = WLog_Get("com.freerdp.codec.nsc"); WLog_OpenAppender(context->priv->log); context->BitmapData = NULL; diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c index c95ad85..b7b0873 100644 --- a/libfreerdp/codec/rfx.c +++ b/libfreerdp/codec/rfx.c @@ -220,7 +220,6 @@ RFX_CONTEXT* rfx_context_new(BOOL encoder) if (!priv) goto error_priv; - WLog_Init(); priv->log = WLog_Get("com.freerdp.codec.rfx"); WLog_OpenAppender(priv->log); #ifdef WITH_DEBUG_RFX diff --git a/libfreerdp/core/update.c b/libfreerdp/core/update.c index 5ff57d5..8088794 100644 --- a/libfreerdp/core/update.c +++ b/libfreerdp/core/update.c @@ -2057,7 +2057,6 @@ rdpUpdate* update_new(rdpRdp* rdp) if (!update) return NULL; - WLog_Init(); update->log = WLog_Get("com.freerdp.core.update"); update->bitmap_update.count = 64; update->bitmap_update.rectangles = (BITMAP_DATA*) calloc( diff --git a/libfreerdp/primitives/test/TestPrimitivesYUV.c b/libfreerdp/primitives/test/TestPrimitivesYUV.c index 0994521..7d68659 100644 --- a/libfreerdp/primitives/test/TestPrimitivesYUV.c +++ b/libfreerdp/primitives/test/TestPrimitivesYUV.c @@ -879,7 +879,6 @@ int TestPrimitivesYUV(int argc, char* argv[]) int rc = -1; prim_test_setup(FALSE); primitives_t* prims = primitives_get(); - WLog_Init(); for (x = 0; x < 10; x++) { @@ -974,7 +973,6 @@ int TestPrimitivesYUV(int argc, char* argv[]) rc = 0; end: - WLog_Uninit(); return rc; } diff --git a/winpr/include/winpr/wlog.h b/winpr/include/winpr/wlog.h index c8ad36e..242f1df 100644 --- a/winpr/include/winpr/wlog.h +++ b/winpr/include/winpr/wlog.h @@ -182,7 +182,9 @@ WINPR_API BOOL WLog_Layout_SetPrefixFormat(wLog* log, wLogLayout* layout, WINPR_API wLog* WLog_GetRoot(void); WINPR_API wLog* WLog_Get(LPCSTR name); +/** Deprecated */ WINPR_API BOOL WLog_Init(void); +/** Deprecated */ WINPR_API BOOL WLog_Uninit(void); typedef BOOL (*wLogCallbackMessage_t)(const wLogMessage* msg); diff --git a/winpr/libwinpr/utils/test/TestWLog.c b/winpr/libwinpr/utils/test/TestWLog.c index 1162db4..e3fc86d 100644 --- a/winpr/libwinpr/utils/test/TestWLog.c +++ b/winpr/libwinpr/utils/test/TestWLog.c @@ -21,8 +21,6 @@ int TestWLog(int argc, char* argv[]) goto out; } - WLog_Init(); - root = WLog_GetRoot(); WLog_SetLogAppenderType(root, WLOG_APPENDER_BINARY); @@ -56,8 +54,6 @@ int TestWLog(int argc, char* argv[]) WLog_CloseAppender(root); - WLog_Uninit(); - if ((wlog_file = GetCombinedPath(tmp_path, "test_w.log"))) DeleteFileA(wlog_file); diff --git a/winpr/libwinpr/utils/test/TestWLogCallback.c b/winpr/libwinpr/utils/test/TestWLogCallback.c index e073e94..378f312 100644 --- a/winpr/libwinpr/utils/test/TestWLogCallback.c +++ b/winpr/libwinpr/utils/test/TestWLogCallback.c @@ -92,7 +92,6 @@ int TestWLogCallback(int argc, char* argv[]) wLogCallbacks callbacks; function = __FUNCTION__; - WLog_Init(); root = WLog_GetRoot(); @@ -130,8 +129,6 @@ int TestWLogCallback(int argc, char* argv[]) WLog_CloseAppender(root); - WLog_Uninit(); - return success ? 0 : -1; }