AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-22 17:39:53 +03:00
Code Releases Activity

Merge PR #607: resolve several trivial issues found by Coverity

Browse Source
This commit is contained in:
Davide Beatrici 2018-08-05 16:54:45 +02:00 committed by GitHub
commit 564a3df4fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Cedar/Interop_OpenVPN.c
View File

@ -343,13 +343,8 @@ void OvsProceccRecvPacket(OPENVPN_SERVER *s, UDPPACKET *p, UINT protocol)
data += sizeof(UINT); data += sizeof(UINT);
size -= sizeof(UINT); size -= sizeof(UINT);
if (size >= sizeof(ping_signature) && if (size < sizeof(ping_signature) ||
Cmp(data, ping_signature, sizeof(ping_signature)) == 0) Cmp(data, ping_signature, sizeof(ping_signature)) != 0)
{
// Ignore since a ping packet has been received
DoNothing();
}
else
{ {
// Receive a packet!! // Receive a packet!!
if (se->Ipc != NULL) if (se->Ipc != NULL)

12
src/Mayaqua/Kernel.c
View File

@ -171,7 +171,6 @@ L"- - $ : : $ Sun Mon Tue Wed Thu Fri Sat : : : $ (None)";
static LOCALE current_locale; static LOCALE current_locale;
LOCK *tick_manual_lock = NULL; LOCK *tick_manual_lock = NULL;
UINT g_zero = 0;
#define MONSPERYEAR 12 #define MONSPERYEAR 12
#define DAYSPERNYEAR 365 #define DAYSPERNYEAR 365
@ -1166,12 +1165,6 @@ void SetThreadName(UINT thread_id, char *name, void *param)
#endif // OS_WIN32 #endif // OS_WIN32
} }
// Do Nothing
UINT DoNothing()
{
return g_zero;
}
// Thread creation (pool) // Thread creation (pool)
THREAD *NewThreadNamed(THREAD_PROC *thread_proc, void *param, char *name) THREAD *NewThreadNamed(THREAD_PROC *thread_proc, void *param, char *name)
{ {
@ -1185,11 +1178,6 @@ THREAD *NewThreadNamed(THREAD_PROC *thread_proc, void *param, char *name)
return NULL; return NULL;
} }
if (IsTrackingEnabled() == false)
{
DoNothing();
}
Inc(thread_count); Inc(thread_count);
LockSk(thread_pool); LockSk(thread_pool);

1
src/Mayaqua/Kernel.h
View File

@ -270,7 +270,6 @@ void GetHomeDirW(wchar_t *path, UINT size);
void AbortExit(); void AbortExit();
void AbortExitEx(char *msg); void AbortExitEx(char *msg);
void YieldCpu(); void YieldCpu();
UINT DoNothing();
LIST *NewThreadList(); LIST *NewThreadList();
void AddThreadToThreadList(LIST *o, THREAD *t); void AddThreadToThreadList(LIST *o, THREAD *t);
void DelThreadFromThreadList(LIST *o, THREAD *t); void DelThreadFromThreadList(LIST *o, THREAD *t);

5
src/Mayaqua/Network.c
View File

@ -9206,8 +9206,6 @@ void Win32NetworkTest()
for (i = 0;i < (int)(LIST_NUM(o));i++) for (i = 0;i < (int)(LIST_NUM(o));i++)
{ {
IP_ADAPTER_INDEX_MAP *a = LIST_DATA(o, i); IP_ADAPTER_INDEX_MAP *a = LIST_DATA(o, i);
DoNothing();
} }
ReleaseList(o); ReleaseList(o);
@ -14327,9 +14325,8 @@ void ConnectThreadForTcp(THREAD *thread, void *param)
{ {
ReleaseSock(p->CancelDisconnectSock); ReleaseSock(p->CancelDisconnectSock);
p->CancelDisconnectSock = NULL; p->CancelDisconnectSock = NULL;
LABEL_CANCEL:
DoNothing();
} }
LABEL_CANCEL:
Unlock(p->CancelLock); Unlock(p->CancelLock);
if (ssl_ret == false) if (ssl_ret == false)

2
src/Mayaqua/Tracking.c
View File

@ -875,7 +875,7 @@ void GetCallStackStr(char *str, UINT size, CALLSTACK_DATA *s)
if (s->name == NULL) if (s->name == NULL)
{ {
Format(tmp, sizeof(tmp), "0x%p ---", UINT64_TO_POINTER(s->offset)); Format(tmp, sizeof(tmp), "0x%02x ---", UINT64_TO_POINTER(s->offset));
} }
else else
{ {

21
src/Mayaqua/Unix.c
View File

@ -1111,27 +1111,20 @@ void UnixGetOsInfo(OS_INFO *info)
} }
Zero(info, sizeof(OS_INFO)); Zero(info, sizeof(OS_INFO));
info->OsType = OSTYPE_UNIX_UNKNOWN;
#ifdef UNIX_SOLARIS #ifdef UNIX_SOLARIS
info->OsType = OSTYPE_SOLARIS; info->OsType = OSTYPE_SOLARIS;
#endif // UNIX_SOLARIS #elif UNIX_CYGWIN
#ifdef UNIX_CYGWIN
info->OsType = OSTYPE_CYGWIN; info->OsType = OSTYPE_CYGWIN;
#endif // UNIX_CYGWIN #elif UNIX_MACOS
#ifdef UNIX_MACOS
info->OsType = OSTYPE_MACOS_X; info->OsType = OSTYPE_MACOS_X;
#endif // UNIX_MACOS #elif UNIX_BSD
#ifdef UNIX_BSD
info->OsType = OSTYPE_BSD; info->OsType = OSTYPE_BSD;
#endif // UNIX_BSD #elif UNIX_LINUX
#ifdef UNIX_LINUX
info->OsType = OSTYPE_LINUX; info->OsType = OSTYPE_LINUX;
#endif // UNIX_LINUX #else
info->OsType = OSTYPE_UNIX_UNKNOWN;
#endif
info->OsServicePack = 0; info->OsServicePack = 0;