Removed checks already done by WINPR_ASSERT
This commit is contained in:
parent
64280aa13c
commit
ccfe0c129e
@ -1464,8 +1464,6 @@ static UINT drdynvc_virtual_channel_event_initialized(drdynvcPlugin* drdynvc, LP
|
||||
}
|
||||
|
||||
obj = MessageQueue_Object(drdynvc->queue);
|
||||
if (!obj)
|
||||
goto error;
|
||||
obj->fnObjectFree = drdynvc_queue_object_free;
|
||||
drdynvc->channel_mgr = dvcman_new(drdynvc);
|
||||
|
||||
|
@ -1722,8 +1722,6 @@ static UINT rdpdr_virtual_channel_event_connected(rdpdrPlugin* rdpdr, LPVOID pDa
|
||||
}
|
||||
|
||||
obj = MessageQueue_Object(rdpdr->queue);
|
||||
if (!obj)
|
||||
return ERROR_INTERNAL_ERROR;
|
||||
obj->fnObjectFree = queue_free;
|
||||
|
||||
if (!(rdpdr->thread =
|
||||
|
@ -918,8 +918,6 @@ UINT freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS
|
||||
if (!udevman->hotplug_vid_pids)
|
||||
goto fail;
|
||||
obj = ArrayList_Object(udevman->hotplug_vid_pids);
|
||||
if (!obj)
|
||||
goto fail;
|
||||
obj->fnObjectFree = free;
|
||||
obj->fnObjectEquals = udevman_vid_pid_pair_equals;
|
||||
|
||||
|
@ -178,8 +178,6 @@ BOOL xf_event_action_script_init(xfContext* xfc)
|
||||
return FALSE;
|
||||
|
||||
obj = ArrayList_Object(xfc->xevents);
|
||||
if (!obj)
|
||||
return FALSE;
|
||||
obj->fnObjectFree = free;
|
||||
sprintf_s(command, sizeof(command), "%s xevent", xfc->context.settings->ActionScript);
|
||||
actionScript = popen(command, "r");
|
||||
|
@ -72,8 +72,6 @@ static BOOL xf_keyboard_action_script_init(xfContext* xfc)
|
||||
return FALSE;
|
||||
|
||||
obj = ArrayList_Object(xfc->keyCombinations);
|
||||
if (!obj)
|
||||
return FALSE;
|
||||
obj->fnObjectFree = free;
|
||||
sprintf_s(command, sizeof(command), "%s key", xfc->context.settings->ActionScript);
|
||||
keyScript = popen(command, "r");
|
||||
|
@ -1105,14 +1105,10 @@ int xf_rail_init(xfContext* xfc, RailClientContext* rail)
|
||||
goto fail;
|
||||
{
|
||||
wObject* obj = HashTable_KeyObject(xfc->railWindows);
|
||||
if (!obj)
|
||||
goto fail;
|
||||
obj->fnObjectEquals = rail_window_key_equals;
|
||||
}
|
||||
{
|
||||
wObject* obj = HashTable_ValueObject(xfc->railWindows);
|
||||
if (!obj)
|
||||
goto fail;
|
||||
obj->fnObjectFree = rail_window_free;
|
||||
}
|
||||
xfc->railIconCache = RailIconCache_New(xfc->context.settings);
|
||||
|
@ -158,8 +158,6 @@ rdpChannels* freerdp_channels_new(freerdp* instance)
|
||||
goto error;
|
||||
|
||||
obj = MessageQueue_Object(channels->queue);
|
||||
if (!obj)
|
||||
goto error;
|
||||
obj->fnObjectFree = channel_queue_free;
|
||||
|
||||
return channels;
|
||||
|
@ -1084,9 +1084,6 @@ RpcClient* rpc_client_new(rdpContext* context, UINT32 max_recv_frag)
|
||||
goto fail;
|
||||
|
||||
obj = ArrayList_Object(client->ClientCallList);
|
||||
if (!obj)
|
||||
goto fail;
|
||||
|
||||
obj->fnObjectFree = rpc_array_client_call_free;
|
||||
return client;
|
||||
fail:
|
||||
|
@ -129,13 +129,12 @@ void shadow_subsystem_uninit(rdpShadowSubsystem* subsystem)
|
||||
wObject* obj2;
|
||||
/* Release resource in messages before free */
|
||||
obj1 = MessageQueue_Object(subsystem->MsgPipe->In);
|
||||
obj2 = MessageQueue_Object(subsystem->MsgPipe->Out);
|
||||
if (obj1)
|
||||
obj1->fnObjectFree = shadow_subsystem_free_queued_message;
|
||||
MessageQueue_Clear(subsystem->MsgPipe->In);
|
||||
|
||||
if (obj2)
|
||||
obj2->fnObjectFree = shadow_subsystem_free_queued_message;
|
||||
obj1->fnObjectFree = shadow_subsystem_free_queued_message;
|
||||
MessageQueue_Clear(subsystem->MsgPipe->In);
|
||||
|
||||
obj2 = MessageQueue_Object(subsystem->MsgPipe->Out);
|
||||
obj2->fnObjectFree = shadow_subsystem_free_queued_message;
|
||||
MessageQueue_Clear(subsystem->MsgPipe->Out);
|
||||
MessagePipe_Free(subsystem->MsgPipe);
|
||||
subsystem->MsgPipe = NULL;
|
||||
|
Loading…
Reference in New Issue
Block a user