mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed all calls to WLog_Init and WLog_Uninit

Browse Source 
Since the calls are no longer required remove their usage.
This commit is contained in:
Armin Novak 2018-04-03 13:06:41 +02:00
parent d249335708
commit e0d112d548
11 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
channels/rail/client/rail_main.c
View File

@ -849,7 +849,6 @@ BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS pEntryPoints, PVOID p
isFreerdp = TRUE; isFreerdp = TRUE;
} }
WLog_Init();
rail->log = WLog_Get("com.freerdp.channels.rail.client"); rail->log = WLog_Get("com.freerdp.channels.rail.client");
WLog_Print(rail->log, WLOG_DEBUG, "VirtualChannelEntryEx"); WLog_Print(rail->log, WLOG_DEBUG, "VirtualChannelEntryEx");
CopyMemory(&(rail->channelEntryPoints), pEntryPoints, CopyMemory(&(rail->channelEntryPoints), pEntryPoints,

1
channels/serial/client/serial_main.c
View File

@ -840,7 +840,6 @@ UINT DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)
if ((name && name[0]) && (path && path[0])) if ((name && name[0]) && (path && path[0]))
{ {
wLog* log; wLog* log;
WLog_Init();
log = WLog_Get("com.freerdp.channel.serial.client"); log = WLog_Get("com.freerdp.channel.serial.client");
WLog_Print(log, WLOG_DEBUG, "initializing"); WLog_Print(log, WLOG_DEBUG, "initializing");
#ifndef __linux__ /* to be removed */ #ifndef __linux__ /* to be removed */

2
client/common/client.c
View File

@ -58,7 +58,6 @@ rdpContext* freerdp_client_context_new(RDP_CLIENT_ENTRY_POINTS* pEntryPoints)
if (!pEntryPoints) if (!pEntryPoints)
return NULL; return NULL;
WLog_Init();
IFCALL(pEntryPoints->GlobalInit); IFCALL(pEntryPoints->GlobalInit);
instance = freerdp_new(); instance = freerdp_new();
@ -116,7 +115,6 @@ void freerdp_client_context_free(rdpContext* context)
free(instance->pClientEntryPoints); free(instance->pClientEntryPoints);
freerdp_free(instance); freerdp_free(instance);
} }
WLog_Uninit();
} }
int freerdp_client_start(rdpContext* context) int freerdp_client_start(rdpContext* context)

1
libfreerdp/cache/glyph.c vendored
View File

@ -688,7 +688,6 @@ rdpGlyphCache* glyph_cache_new(rdpSettings* settings)
if (!glyphCache) if (!glyphCache)
return NULL; return NULL;
WLog_Init();
glyphCache->log = WLog_Get("com.freerdp.cache.glyph"); glyphCache->log = WLog_Get("com.freerdp.cache.glyph");
glyphCache->settings = settings; glyphCache->settings = settings;
glyphCache->context = ((freerdp*) settings->instance)->update->context; glyphCache->context = ((freerdp*) settings->instance)->update->context;

1
libfreerdp/codec/nsc.c
View File

@ -281,7 +281,6 @@ NSC_CONTEXT* nsc_context_new(void)
if (!context->priv) if (!context->priv)
goto error_priv; goto error_priv;
WLog_Init();
context->priv->log = WLog_Get("com.freerdp.codec.nsc"); context->priv->log = WLog_Get("com.freerdp.codec.nsc");
WLog_OpenAppender(context->priv->log); WLog_OpenAppender(context->priv->log);
context->BitmapData = NULL; context->BitmapData = NULL;

1
libfreerdp/codec/rfx.c
View File

@ -220,7 +220,6 @@ RFX_CONTEXT* rfx_context_new(BOOL encoder)
if (!priv) if (!priv)
goto error_priv; goto error_priv;
WLog_Init();
priv->log = WLog_Get("com.freerdp.codec.rfx"); priv->log = WLog_Get("com.freerdp.codec.rfx");
WLog_OpenAppender(priv->log); WLog_OpenAppender(priv->log);
#ifdef WITH_DEBUG_RFX #ifdef WITH_DEBUG_RFX

1
libfreerdp/core/update.c
View File

@ -2057,7 +2057,6 @@ rdpUpdate* update_new(rdpRdp* rdp)
if (!update) if (!update)
return NULL; return NULL;
WLog_Init();
update->log = WLog_Get("com.freerdp.core.update"); update->log = WLog_Get("com.freerdp.core.update");
update->bitmap_update.count = 64; update->bitmap_update.count = 64;
update->bitmap_update.rectangles = (BITMAP_DATA*) calloc( update->bitmap_update.rectangles = (BITMAP_DATA*) calloc(

2
libfreerdp/primitives/test/TestPrimitivesYUV.c
View File

@ -879,7 +879,6 @@ int TestPrimitivesYUV(int argc, char* argv[])
int rc = -1; int rc = -1;
prim_test_setup(FALSE); prim_test_setup(FALSE);
primitives_t* prims = primitives_get(); primitives_t* prims = primitives_get();
WLog_Init();
for (x = 0; x < 10; x++) for (x = 0; x < 10; x++)
{ {
@ -974,7 +973,6 @@ int TestPrimitivesYUV(int argc, char* argv[])
rc = 0; rc = 0;
end: end:
WLog_Uninit();
return rc; return rc;
} }

2
winpr/include/winpr/wlog.h
View File

@ -182,7 +182,9 @@ WINPR_API BOOL WLog_Layout_SetPrefixFormat(wLog* log, wLogLayout* layout,
WINPR_API wLog* WLog_GetRoot(void); WINPR_API wLog* WLog_GetRoot(void);
WINPR_API wLog* WLog_Get(LPCSTR name); WINPR_API wLog* WLog_Get(LPCSTR name);
/** Deprecated */
WINPR_API BOOL WLog_Init(void); WINPR_API BOOL WLog_Init(void);
/** Deprecated */
WINPR_API BOOL WLog_Uninit(void); WINPR_API BOOL WLog_Uninit(void);
typedef BOOL (*wLogCallbackMessage_t)(const wLogMessage* msg); typedef BOOL (*wLogCallbackMessage_t)(const wLogMessage* msg);

4
winpr/libwinpr/utils/test/TestWLog.c
View File

@ -21,8 +21,6 @@ int TestWLog(int argc, char* argv[])
goto out; goto out;
} }
WLog_Init();
root = WLog_GetRoot(); root = WLog_GetRoot();
WLog_SetLogAppenderType(root, WLOG_APPENDER_BINARY); WLog_SetLogAppenderType(root, WLOG_APPENDER_BINARY);
@ -56,8 +54,6 @@ int TestWLog(int argc, char* argv[])
WLog_CloseAppender(root); WLog_CloseAppender(root);
WLog_Uninit();
if ((wlog_file = GetCombinedPath(tmp_path, "test_w.log"))) if ((wlog_file = GetCombinedPath(tmp_path, "test_w.log")))
DeleteFileA(wlog_file); DeleteFileA(wlog_file);

3
winpr/libwinpr/utils/test/TestWLogCallback.c
View File

@ -92,7 +92,6 @@ int TestWLogCallback(int argc, char* argv[])
wLogCallbacks callbacks; wLogCallbacks callbacks;
function = __FUNCTION__; function = __FUNCTION__;
WLog_Init();
root = WLog_GetRoot(); root = WLog_GetRoot();
@ -130,8 +129,6 @@ int TestWLogCallback(int argc, char* argv[])
WLog_CloseAppender(root); WLog_CloseAppender(root);
WLog_Uninit();
return success ? 0 : -1; return success ? 0 : -1;
} }