morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Replaced memset/ZeroMemory with initializer

Browse Source 
* Addes WINPR_ASSERT on many occations
* Replaced memset with array initializer
* Replaced ZeroMemory with array initializer
This commit is contained in:
akallabeth
2022-10-13 16:25:36 +02:00
committed by Pascal Nowack
parent 57d2a27980
commit 43c5289928
78 changed files with 353 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/Android/Studio/freeRDPCore/src/main/cpp/android_cliprdr.c
View File

@@ -42,7 +42,7 @@ UINT android_cliprdr_send_client_format_list(CliprdrClientContext* cliprdr)
UINT32* pFormatIds;
const char* formatName;
CLIPRDR_FORMAT* formats;
CLIPRDR_FORMAT_LIST formatList;
CLIPRDR_FORMAT_LIST formatList = { 0 };
if (!cliprdr)
return ERROR_INVALID_PARAMETER;
@@ -52,7 +52,6 @@ UINT android_cliprdr_send_client_format_list(CliprdrClientContext* cliprdr)
if (!afc || !afc->cliprdr)
return ERROR_INVALID_PARAMETER;
ZeroMemory(&formatList, sizeof(CLIPRDR_FORMAT_LIST));
pFormatIds = NULL;
numFormats = ClipboardGetFormatIds(afc->clipboard, &pFormatIds);
formats = (CLIPRDR_FORMAT*)calloc(numFormats, sizeof(CLIPRDR_FORMAT));
@@ -95,7 +94,7 @@ static UINT android_cliprdr_send_client_format_data_request(CliprdrClientContext
UINT32 formatId)
{
UINT rc = ERROR_INVALID_PARAMETER;
CLIPRDR_FORMAT_DATA_REQUEST formatDataRequest;
CLIPRDR_FORMAT_DATA_REQUEST formatDataRequest = { 0 };
androidContext* afc;
if (!cliprdr)
@@ -106,7 +105,6 @@ static UINT android_cliprdr_send_client_format_data_request(CliprdrClientContext
if (!afc || !afc->clipboardRequestEvent || !cliprdr->ClientFormatDataRequest)
goto fail;
ZeroMemory(&formatDataRequest, sizeof(CLIPRDR_FORMAT_DATA_REQUEST));
formatDataRequest.common.msgType = CB_FORMAT_DATA_REQUEST;
formatDataRequest.common.msgFlags = 0;
formatDataRequest.requestedFormatId = formatId;
@@ -336,7 +334,7 @@ android_cliprdr_server_format_data_request(CliprdrClientContext* cliprdr,
BYTE* data;
UINT32 size;
UINT32 formatId;
CLIPRDR_FORMAT_DATA_RESPONSE response;
CLIPRDR_FORMAT_DATA_RESPONSE response = { 0 };
androidContext* afc;
if (!cliprdr || !formatDataRequest || !cliprdr->ClientFormatDataResponse)
@@ -347,7 +345,6 @@ android_cliprdr_server_format_data_request(CliprdrClientContext* cliprdr,
if (!afc)
return ERROR_INVALID_PARAMETER;
ZeroMemory(&response, sizeof(CLIPRDR_FORMAT_DATA_RESPONSE));
formatId = formatDataRequest->requestedFormatId;
data = (BYTE*)ClipboardGetData(afc->clipboard, formatId, &size);
response.common.msgFlags = CB_RESPONSE_OK;

3
client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c
View File

@@ -553,7 +553,10 @@ static void android_client_free(freerdp* instance, rdpContext* context)
static int RdpClientEntry(RDP_CLIENT_ENTRY_POINTS* pEntryPoints)
{
WINPR_ASSERT(pEntryPoints);
ZeroMemory(pEntryPoints, sizeof(RDP_CLIENT_ENTRY_POINTS));
pEntryPoints->Version = RDP_CLIENT_INTERFACE_VERSION;
pEntryPoints->Size = sizeof(RDP_CLIENT_ENTRY_POINTS_V1);
pEntryPoints->GlobalInit = NULL;