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

src/Mayaqua/Kernel: remove unused variable, functions

Browse Source 
found by cppcheck

[src/Mayaqua/Kernel.c:1199]: (style) Variable 'new_thread' is assigned a value that is never used.
[src/Mayaqua/Kernel.c:385]: (style) The function 'DelThreadFromThreadList' is never used.
[src/Mayaqua/Kernel.c:1726]: (style) The function 'GetCurrentLocale' is never used.
[src/Mayaqua/Kernel.c:562]: (style) The function 'GetHomeDir' is never used.
[src/Mayaqua/Kernel.c:1644]: (style) The function 'GetSpanStr' is never used.
[src/Mayaqua/Kernel.c:1695]: (style) The function 'GetSpanStrEx' is never used.
[src/Mayaqua/Kernel.c:950]: (style) The function 'GetTimeStr64' is never used.
[src/Mayaqua/Kernel.c:909]: (style) The function 'GetTimeStrEx64' is never used.
[src/Mayaqua/Kernel.c:1924]: (style) The function 'System64ToTime' is never used.
[src/Mayaqua/Kernel.c:1900]: (style) The function 'TimeToSystem64' is never used.
[src/Mayaqua/Kernel.c:470]: (style) The function 'WaitAllThreadsWillBeStopped' is never used.
[src/Mayaqua/Kernel.c:1478]: (style) The function 'GetTimeStr' is never used.
This commit is contained in:
Ilya Shipitsin 2018-09-01 10:25:09 +05:00
parent 0871c0b5d2
commit 56681d41a0
2 changed files with 0 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

191
src/Mayaqua/Kernel.c
View File

@ -381,25 +381,6 @@ LIST *NewThreadList()
return o; return o;
} }
// Remove the thread from the thread list
void DelThreadFromThreadList(LIST *o, THREAD *t)
{
// Validate arguments
if (o == NULL || t == NULL)
{
return;
}
LockList(o);
{
if (Delete(o, t))
{
ReleaseThread(t);
}
}
UnlockList(o);
}
// Add the thread to the thread list // Add the thread to the thread list
void AddThreadToThreadList(LIST *o, THREAD *t) void AddThreadToThreadList(LIST *o, THREAD *t)
{ {
@ -466,21 +447,6 @@ void MaintainThreadList(LIST *o)
UnlockList(o); UnlockList(o);
} }
// Wait until all threads in the thread list will be stopped
void WaitAllThreadsWillBeStopped(LIST *o)
{
// Validate arguments
if (o == NULL)
{
return;
}
while (LIST_NUM(o) != 0)
{
SleepThread(100);
}
}
// Stop all the threads in the thread list // Stop all the threads in the thread list
void StopThreadList(LIST *o) void StopThreadList(LIST *o)
{ {
@ -559,33 +525,6 @@ void GetHomeDirW(wchar_t *path, UINT size)
} }
} }
} }
void GetHomeDir(char *path, UINT size)
{
// Validate arguments
if (path == NULL)
{
return;
}
if (GetEnv("HOME", path, size) == false)
{
char drive[MAX_SIZE];
char hpath[MAX_SIZE];
if (GetEnv("HOMEDRIVE", drive, sizeof(drive)) &&
GetEnv("HOMEPATH", hpath, sizeof(hpath)))
{
Format(path, sizeof(path), "%s%s", drive, hpath);
}
else
{
#ifdef OS_WIN32
Win32GetCurrentDir(path, size);
#else // OS_WIN32
UnixGetCurrentDir(path, size);
#endif // OS_WIN32
}
}
}
// Get the environment variable string // Get the environment variable string
bool GetEnv(char *name, char *data, UINT size) bool GetEnv(char *name, char *data, UINT size)
@ -906,21 +845,6 @@ void GetDateTimeStrEx64(wchar_t *str, UINT size, UINT64 sec64, LOCALE *locale)
UINT64ToSystem(&st, sec64); UINT64ToSystem(&st, sec64);
GetDateTimeStrEx(str, size, &st, locale); GetDateTimeStrEx(str, size, &st, locale);
} }
void GetTimeStrEx64(wchar_t *str, UINT size, UINT64 sec64, LOCALE *locale)
{
SYSTEMTIME st;
if (locale == NULL)
{
locale = &current_locale;
}
if (sec64 == 0 || SystemToLocal64(sec64) == 0 || LocalToSystem64(sec64) == 0)
{
UniStrCpy(str, size, locale->Unknown);
return;
}
UINT64ToSystem(&st, sec64);
GetTimeStrEx(str, size, &st, locale);
}
void GetDateStrEx64(wchar_t *str, UINT size, UINT64 sec64, LOCALE *locale) void GetDateStrEx64(wchar_t *str, UINT size, UINT64 sec64, LOCALE *locale)
{ {
SYSTEMTIME st; SYSTEMTIME st;
@ -947,17 +871,6 @@ void GetTimeStrMilli64(char *str, UINT size, UINT64 sec64)
UINT64ToSystem(&st, sec64); UINT64ToSystem(&st, sec64);
GetTimeStrMilli(str, size, &st); GetTimeStrMilli(str, size, &st);
} }
void GetTimeStr64(char *str, UINT size, UINT64 sec64)
{
SYSTEMTIME st;
if (sec64 == 0 || SystemToLocal64(sec64) == 0 || LocalToSystem64(sec64) == 0)
{
StrCpy(str, size, "(Unknown)");
return;
}
UINT64ToSystem(&st, sec64);
GetTimeStr(str, size, &st);
}
// Convert to a time to be used safely in the current POSIX implementation // Convert to a time to be used safely in the current POSIX implementation
UINT64 SafeTime64(UINT64 sec64) UINT64 SafeTime64(UINT64 sec64)
@ -1171,7 +1084,6 @@ THREAD *NewThreadNamed(THREAD_PROC *thread_proc, void *param, char *name)
THREAD *host = NULL; THREAD *host = NULL;
THREAD_POOL_DATA *pd = NULL; THREAD_POOL_DATA *pd = NULL;
THREAD *ret; THREAD *ret;
bool new_thread = false;
// Validate arguments // Validate arguments
if (thread_proc == NULL) if (thread_proc == NULL)
{ {
@ -1195,8 +1107,6 @@ THREAD *NewThreadNamed(THREAD_PROC *thread_proc, void *param, char *name)
pd->InitFinishEvent = NewEvent(); pd->InitFinishEvent = NewEvent();
host = NewThreadInternal(ThreadPoolProc, pd); host = NewThreadInternal(ThreadPoolProc, pd);
WaitThreadInitInternal(host); WaitThreadInitInternal(host);
new_thread = true;
} }
else else
{ {
@ -1564,19 +1474,6 @@ void GetTimeStrMilli(char *str, UINT size, SYSTEMTIME *st)
st->wHour, st->wMinute, st->wSecond, st->wMilliseconds); st->wHour, st->wMinute, st->wSecond, st->wMilliseconds);
} }
// Get the time string (for example, 12:34:56)
void GetTimeStr(char *str, UINT size, SYSTEMTIME *st)
{
// Validate arguments
if (str == NULL || st == NULL)
{
return;
}
Format(str, size, "%02u:%02u:%02u",
st->wHour, st->wMinute, st->wSecond);
}
// Get the date string (example: 2004/07/23) // Get the date string (example: 2004/07/23)
void GetDateStr(char *str, UINT size, SYSTEMTIME *st) void GetDateStr(char *str, UINT size, SYSTEMTIME *st)
{ {
@ -1640,31 +1537,6 @@ void GetDateTimeStrRFC3339(char *str, UINT size, SYSTEMTIME *st, int timezone_mi
} }
} }
// Get the time string
void GetSpanStr(char *str, UINT size, UINT64 sec64)
{
char tmp[MAX_SIZE];
// Validate arguments
if (str == NULL)
{
return;
}
StrCpy(tmp, sizeof(tmp), "");
if (sec64 >= (UINT64)(1000 * 3600 * 24))
{
Format(tmp, sizeof(tmp), "%u:", (UINT)(sec64 / (UINT64)(1000 * 3600 * 24)));
}
Format(tmp, sizeof(tmp), "%s%02u:%02u:%02u", tmp,
(UINT)(sec64 % (UINT64)(1000 * 60 * 60 * 24)) / (1000 * 60 * 60),
(UINT)(sec64 % (UINT64)(1000 * 60 * 60)) / (1000 * 60),
(UINT)(sec64 % (UINT64)(1000 * 60)) / 1000);
Trim(tmp);
StrCpy(str, size, tmp);
}
// Get the time string (in milliseconds) // Get the time string (in milliseconds)
void GetSpanStrMilli(char *str, UINT size, UINT64 sec64) void GetSpanStrMilli(char *str, UINT size, UINT64 sec64)
{ {
@ -1691,49 +1563,6 @@ void GetSpanStrMilli(char *str, UINT size, UINT64 sec64)
StrCpy(str, size, tmp); StrCpy(str, size, tmp);
} }
// Get the time string (extended)
void GetSpanStrEx(wchar_t *str, UINT size, UINT64 sec64, LOCALE *locale)
{
wchar_t tmp[MAX_SIZE];
// Validate arguments
if (str == NULL)
{
return;
}
locale = (locale != NULL ? locale : &current_locale);
UniStrCpy(tmp, sizeof(tmp), L"");
if (sec64 >= (UINT64)(1000 * 3600 * 24))
{
UniFormat(tmp, sizeof(tmp), L"%u%s ", (UINT)(sec64 / (UINT64)(1000 * 3600 * 24)),
locale->SpanDay);
}
UniFormat(tmp, sizeof(tmp), L"%s%u%s %02u%s %02u%s", tmp,
(UINT)(sec64 % (UINT64)(1000 * 60 * 60 * 24)) / (1000 * 60 * 60),
locale->SpanHour,
(UINT)(sec64 % (UINT64)(1000 * 60 * 60)) / (1000 * 60),
locale->SpanMinute,
(UINT)(sec64 % (UINT64)(1000 * 60)) / 1000,
locale->SpanSecond);
UniTrim(tmp);
UniStrCpy(str, size, tmp);
}
// Get the current locale information
void GetCurrentLocale(LOCALE *locale)
{
// Validate arguments
if (locale == NULL)
{
return;
}
Copy(locale, &current_locale, sizeof(LOCALE));
}
// Set the locale information // Set the locale information
void SetLocale(wchar_t *str) void SetLocale(wchar_t *str)
{ {
@ -1896,16 +1725,6 @@ void TimeToSystem(SYSTEMTIME *st, time_64t t)
TmToSystem(st, &tmp); TmToSystem(st, &tmp);
} }
// Convert the time_t to 64-bit SYSTEMTIME
UINT64 TimeToSystem64(time_64t t)
{
SYSTEMTIME st;
TimeToSystem(&st, t);
return SystemToUINT64(&st);
}
// Convert the SYSTEMTIME to time_t // Convert the SYSTEMTIME to time_t
time_64t SystemToTime(SYSTEMTIME *st) time_64t SystemToTime(SYSTEMTIME *st)
{ {
@ -1920,16 +1739,6 @@ time_64t SystemToTime(SYSTEMTIME *st)
return TmToTime(&t); return TmToTime(&t);
} }
// Convert a 64-bit SYSTEMTIME to a time_t
time_64t System64ToTime(UINT64 i)
{
SYSTEMTIME st;
UINT64ToSystem(&st, i);
return SystemToTime(&st);
}
// Convert the tm to time_t // Convert the tm to time_t
time_64t TmToTime(struct tm *t) time_64t TmToTime(struct tm *t)
{ {

11
src/Mayaqua/Kernel.h
View File

@ -196,11 +196,9 @@ void SetThreadName(UINT thread_id, char *name, void *param);
struct tm * c_gmtime_r(const time_64t* timep, struct tm *tm); struct tm * c_gmtime_r(const time_64t* timep, struct tm *tm);
time_64t c_mkgmtime(struct tm *tm); time_64t c_mkgmtime(struct tm *tm);
time_64t System64ToTime(UINT64 i);
void TmToSystem(SYSTEMTIME *st, struct tm *t); void TmToSystem(SYSTEMTIME *st, struct tm *t);
void SystemToTm(struct tm *t, SYSTEMTIME *st); void SystemToTm(struct tm *t, SYSTEMTIME *st);
void TimeToSystem(SYSTEMTIME *st, time_64t t); void TimeToSystem(SYSTEMTIME *st, time_64t t);
UINT64 TimeToSystem64(time_64t t);
time_64t SystemToTime(SYSTEMTIME *st); time_64t SystemToTime(SYSTEMTIME *st);
time_64t TmToTime(struct tm *t); time_64t TmToTime(struct tm *t);
void TimeToTm(struct tm *t, time_64t time); void TimeToTm(struct tm *t, time_64t time);
@ -221,7 +219,6 @@ void LocalTime(SYSTEMTIME *st);
void SystemTime(SYSTEMTIME *st); void SystemTime(SYSTEMTIME *st);
void SetLocale(wchar_t *str); void SetLocale(wchar_t *str);
bool LoadLocale(LOCALE *locale, wchar_t *str); bool LoadLocale(LOCALE *locale, wchar_t *str);
void GetCurrentLocale(LOCALE *locale);
void GetDateTimeStr(char *str, UINT size, SYSTEMTIME *st); void GetDateTimeStr(char *str, UINT size, SYSTEMTIME *st);
void GetDateTimeStrMilli(char *str, UINT size, SYSTEMTIME *st); void GetDateTimeStrMilli(char *str, UINT size, SYSTEMTIME *st);
void GetDateStr(char *str, UINT size, SYSTEMTIME *st); void GetDateStr(char *str, UINT size, SYSTEMTIME *st);
@ -229,7 +226,6 @@ void GetDateTimeStrEx(wchar_t *str, UINT size, SYSTEMTIME *st, LOCALE *locale);
void GetTimeStrEx(wchar_t *str, UINT size, SYSTEMTIME *st, LOCALE *locale); void GetTimeStrEx(wchar_t *str, UINT size, SYSTEMTIME *st, LOCALE *locale);
void GetDateStrEx(wchar_t *str, UINT size, SYSTEMTIME *st, LOCALE *locale); void GetDateStrEx(wchar_t *str, UINT size, SYSTEMTIME *st, LOCALE *locale);
void GetTimeStrMilli(char *str, UINT size, SYSTEMTIME *st); void GetTimeStrMilli(char *str, UINT size, SYSTEMTIME *st);
void GetTimeStr(char *str, UINT size, SYSTEMTIME *st);
UINT Tick(); UINT Tick();
UINT TickRealtime(); UINT TickRealtime();
UINT TickRealtimeManual(); UINT TickRealtimeManual();
@ -244,10 +240,8 @@ void GetDateTimeStrMilli64ForFileName(char *str, UINT size, UINT64 sec64);
void GetDateTimeStrMilliForFileName(char *str, UINT size, SYSTEMTIME *tm); void GetDateTimeStrMilliForFileName(char *str, UINT size, SYSTEMTIME *tm);
void GetDateStr64(char *str, UINT size, UINT64 sec64); void GetDateStr64(char *str, UINT size, UINT64 sec64);
void GetDateTimeStrEx64(wchar_t *str, UINT size, UINT64 sec64, LOCALE *locale); void GetDateTimeStrEx64(wchar_t *str, UINT size, UINT64 sec64, LOCALE *locale);
void GetTimeStrEx64(wchar_t *str, UINT size, UINT64 sec64, LOCALE *locale);
void GetDateStrEx64(wchar_t *str, UINT size, UINT64 sec64, LOCALE *locale); void GetDateStrEx64(wchar_t *str, UINT size, UINT64 sec64, LOCALE *locale);
void GetTimeStrMilli64(char *str, UINT size, UINT64 sec64); void GetTimeStrMilli64(char *str, UINT size, UINT64 sec64);
void GetTimeStr64(char *str, UINT size, UINT64 sec64);
void GetDateTimeStrRFC3339(char *str, UINT size, SYSTEMTIME *st, int timezone_min); void GetDateTimeStrRFC3339(char *str, UINT size, SYSTEMTIME *st, int timezone_min);
UINT64 SafeTime64(UINT64 sec64); UINT64 SafeTime64(UINT64 sec64);
bool Run(char *filename, char *arg, bool hide, bool wait); bool Run(char *filename, char *arg, bool hide, bool wait);
@ -257,26 +251,21 @@ void HashInstanceNameLocal(char *name, UINT size, char *instance_name);
INSTANCE *NewSingleInstance(char *instance_name); INSTANCE *NewSingleInstance(char *instance_name);
INSTANCE *NewSingleInstanceEx(char *instance_name, bool user_local); INSTANCE *NewSingleInstanceEx(char *instance_name, bool user_local);
void FreeSingleInstance(INSTANCE *inst); void FreeSingleInstance(INSTANCE *inst);
void GetSpanStr(char *str, UINT size, UINT64 sec64);
void GetSpanStrEx(wchar_t *str, UINT size, UINT64 sec64, LOCALE *locale);
void GetSpanStrMilli(char *str, UINT size, UINT64 sec64); void GetSpanStrMilli(char *str, UINT size, UINT64 sec64);
void GetMemInfo(MEMINFO *info); void GetMemInfo(MEMINFO *info);
bool GetEnv(char *name, char *data, UINT size); bool GetEnv(char *name, char *data, UINT size);
bool GetEnvW(wchar_t *name, wchar_t *data, UINT size); bool GetEnvW(wchar_t *name, wchar_t *data, UINT size);
bool GetEnvW_ForWin32(wchar_t *name, wchar_t *data, UINT size); bool GetEnvW_ForWin32(wchar_t *name, wchar_t *data, UINT size);
bool GetEnvW_ForUnix(wchar_t *name, wchar_t *data, UINT size); bool GetEnvW_ForUnix(wchar_t *name, wchar_t *data, UINT size);
void GetHomeDir(char *path, UINT size);
void GetHomeDirW(wchar_t *path, UINT size); void GetHomeDirW(wchar_t *path, UINT size);
void AbortExit(); void AbortExit();
void AbortExitEx(char *msg); void AbortExitEx(char *msg);
void YieldCpu(); void YieldCpu();
LIST *NewThreadList(); LIST *NewThreadList();
void AddThreadToThreadList(LIST *o, THREAD *t); void AddThreadToThreadList(LIST *o, THREAD *t);
void DelThreadFromThreadList(LIST *o, THREAD *t);
void MaintainThreadList(LIST *o); void MaintainThreadList(LIST *o);
void FreeThreadList(LIST *o); void FreeThreadList(LIST *o);
void StopThreadList(LIST *o); void StopThreadList(LIST *o);
void WaitAllThreadsWillBeStopped(LIST *o);
UINT GetNumberOfCpu(); UINT GetNumberOfCpu();
#endif // KERNEL_H #endif // KERNEL_H