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

winpr: fixes and cleanup

Browse Source 
Integrated notes and issues for the pending pull request
* wf_info:
 * cleanup: remove unnecessary breaks
 * fix typo
 * change usage of calloc
* print.c: fix incorrect check
* makecert.c: cleanup includes
This commit is contained in:
Bernhard Miklautz
2015-04-07 11:05:28 +02:00
parent 850de59b55
commit 12e1d94567
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/Windows/wf_info.c
View File

@@ -48,16 +48,13 @@ int wf_info_lock(wfInfo* wfi)
case WAIT_ABANDONED:
case WAIT_OBJECT_0:
return TRUE;
break;
case WAIT_TIMEOUT:
return FALSE;
break;
case WAIT_FAILED:
WLog_ERR(TAG, "wf_info_lock failed with 0x%08X", GetLastError());
return -1;
break;
}
return -1;
@@ -74,16 +71,13 @@ int wf_info_try_lock(wfInfo* wfi, DWORD dwMilliseconds)
case WAIT_ABANDONED:
case WAIT_OBJECT_0:
return TRUE;
break;
case WAIT_TIMEOUT:
return FALSE;
break;
case WAIT_FAILED:
WLog_ERR(TAG, "wf_info_try_lock failed with 0x%08X", GetLastError());
return -1;
break;
}
return -1;
@@ -143,7 +137,7 @@ wfInfo* wf_info_init()
return NULL;
}
wfi->peers = (freerdp_peer**) calloc(1, sizeof(freerdp_peer*) * WF_INFO_MAXPEERS);
wfi->peers = (freerdp_peer**) calloc(WF_INFO_MAXPEERS, sizeof(freerdp_peer*));
if (!wfi->peers)
{
WLog_ERR(TAG, "Failed to allocate memory for peer");
@@ -222,7 +216,7 @@ void wf_info_peer_register(wfInfo* wfi, wfPeerContext* context)
return;
}
#endif
//look trhough the array of peers until an empty slot
//look through the array of peers until an empty slot
for(i=0; i<WF_INFO_MAXPEERS; ++i)
{
//empty index will be our peer id

2
winpr/libwinpr/utils/print.c
View File

@@ -117,7 +117,7 @@ char* winpr_BinToHexString(const BYTE* data, int length, BOOL space)
char bin2hex[] = "0123456789ABCDEF";
n = space ? 3 : 2;
p = (char*) malloc((length + 1) * n);
if (p)
if (!p)
return NULL;
for (i = 0; i < length; i++)

2
winpr/tools/makecert/makecert.c
View File

@@ -22,14 +22,12 @@
#include <stdlib.h>
#include <winpr/crt.h>
#include <winpr/file.h>
#include <winpr/path.h>
#include <winpr/cmdline.h>
#include <winpr/sysinfo.h>
#include <openssl/conf.h>
#include <openssl/pem.h>
#include <openssl/err.h>
#include <openssl/pkcs12.h>
#include <openssl/x509v3.h>