Merge pull request #226 from mstorsjo/crt-safe-merge
Merge the encoder/decoder crt_util_safe_x.h into the common lib
This commit is contained in:
volvet
commit
4d22d91692
@ -890,6 +890,10 @@
|
||||
RelativePath="..\..\..\common\cpu.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\common\crt_util_safe_x.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\decoder\core\src\deblocking.cpp"
|
||||
>
|
||||
|
||||
@ -399,6 +399,10 @@
|
||||
RelativePath="..\..\..\common\cpu.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\common\crt_util_safe_x.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\encoder\core\src\deblocking.cpp"
|
||||
>
|
||||
|
||||
258
codec/common/crt_util_safe_x.cpp
Normal file
258
codec/common/crt_util_safe_x.cpp
Normal file
@ -0,0 +1,258 @@
|
||||
/*!
|
||||
* \copy
|
||||
* Copyright (c) 2009-2013, Cisco Systems
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
||||
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
*
|
||||
* \file crt_utils_safe_x.cpp
|
||||
*
|
||||
* \brief common tool/function utilization
|
||||
*
|
||||
* \date 03/10/2009 Created
|
||||
*
|
||||
*************************************************************************************
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
#include <time.h>
|
||||
#if defined(_WIN32)
|
||||
#include <windows.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/timeb.h>
|
||||
#ifndef _MSC_VER
|
||||
#include <sys/time.h>
|
||||
#ifndef HAVE_STRNLEN
|
||||
#define strnlen(a,b) strlen(a)
|
||||
#endif //!HAVE_STRNLEN
|
||||
#endif //!_MSC_VER
|
||||
#else
|
||||
#include <sys/time.h>
|
||||
#include <sys/timeb.h>
|
||||
#endif //_WIN32
|
||||
|
||||
#include "macros.h"
|
||||
#include "crt_util_safe_x.h" // Safe CRT routines like utils for cross platforms
|
||||
|
||||
#if defined(_WIN32) && defined(_MSC_VER)
|
||||
|
||||
#if defined(_MSC_VER) && (_MSC_VER>=1500)
|
||||
|
||||
int32_t WelsSnprintf (str_t* pBuffer, int32_t iSizeOfBuffer, const str_t* kpFormat, ...) {
|
||||
va_list pArgPtr;
|
||||
int32_t iRc;
|
||||
|
||||
va_start (pArgPtr, kpFormat);
|
||||
|
||||
iRc = vsnprintf_s (pBuffer, iSizeOfBuffer, _TRUNCATE, kpFormat, pArgPtr);
|
||||
|
||||
va_end (pArgPtr);
|
||||
|
||||
return iRc;
|
||||
}
|
||||
|
||||
str_t* WelsStrncpy (str_t* pDest, int32_t iSizeInBytes, const str_t* kpSrc, int32_t iCount) {
|
||||
strncpy_s (pDest, iSizeInBytes, kpSrc, iCount);
|
||||
|
||||
return pDest;
|
||||
}
|
||||
|
||||
int32_t WelsStrnlen (const str_t* kpStr, int32_t iMaxlen) {
|
||||
return strnlen_s (kpStr, iMaxlen);
|
||||
}
|
||||
|
||||
int32_t WelsVsprintf (str_t* pBuffer, int32_t iSizeOfBuffer, const str_t* kpFormat, va_list pArgPtr) {
|
||||
return vsprintf_s (pBuffer, iSizeOfBuffer, kpFormat, pArgPtr);
|
||||
}
|
||||
|
||||
WelsFileHandle* WelsFopen (const str_t* kpFilename, const str_t* kpMode) {
|
||||
WelsFileHandle* pFp = NULL;
|
||||
if (fopen_s (&pFp, kpFilename, kpMode) != 0) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return pFp;
|
||||
}
|
||||
|
||||
int32_t WelsFclose (WelsFileHandle* pFp) {
|
||||
return fclose (pFp);
|
||||
}
|
||||
|
||||
int32_t WelsGetTimeOfDay (SWelsTime* pTp) {
|
||||
return _ftime_s (pTp);
|
||||
}
|
||||
|
||||
int32_t WelsStrftime (str_t* pBuffer, int32_t iSize, const str_t* kpFormat, const SWelsTime* kpTp) {
|
||||
struct tm sTimeNow;
|
||||
|
||||
localtime_s (&sTimeNow, &kpTp->time);
|
||||
|
||||
return strftime (pBuffer, iSize, kpFormat, &sTimeNow);
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
int32_t WelsSnprintf (str_t* pBuffer, int32_t iSizeOfBuffer, const str_t* kpFormat, ...) {
|
||||
va_list pArgPtr;
|
||||
int32_t iRc;
|
||||
|
||||
va_start (pArgPtr, kpFormat);
|
||||
|
||||
iRc = vsprintf (pBuffer, kpFormat, pArgPtr); //confirmed_safe_unsafe_usage
|
||||
|
||||
va_end (pArgPtr);
|
||||
|
||||
return iRc;
|
||||
}
|
||||
|
||||
str_t* WelsStrncpy (str_t* pDest, int32_t iSizeInBytes, const str_t* kpSrc, int32_t iCount) {
|
||||
strncpy (pDest, kpSrc, iCount); //confirmed_safe_unsafe_usage
|
||||
|
||||
return pDest;
|
||||
}
|
||||
|
||||
int32_t WelsStrnlen (const str_t* kpStr, int32_t iMaxlen) {
|
||||
return strlen (kpStr); //confirmed_safe_unsafe_usage
|
||||
}
|
||||
|
||||
int32_t WelsVsprintf (str_t* pBuffer, int32_t iSizeOfBuffer, const str_t* kpFormat, va_list pArgPtr) {
|
||||
return vsprintf (pBuffer, kpFormat, pArgPtr); //confirmed_safe_unsafe_usage
|
||||
}
|
||||
|
||||
|
||||
WelsFileHandle* WelsFopen (const str_t* kpFilename, const str_t* kpMode) {
|
||||
return fopen (kpFilename, kpMode);
|
||||
}
|
||||
|
||||
int32_t WelsFclose (WelsFileHandle* pFp) {
|
||||
return fclose (pFp);
|
||||
}
|
||||
|
||||
int32_t WelsGetTimeOfDay (SWelsTime* pTp) {
|
||||
_ftime (pTp);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int32_t WelsStrftime (str_t* pBuffer, int32_t iSize, const str_t* kpFormat, const SWelsTime* kpTp) {
|
||||
struct tm* pTnow;
|
||||
|
||||
pTnow = localtime (&kpTp->time);
|
||||
|
||||
return strftime (pBuffer, iSize, kpFormat, pTnow);
|
||||
}
|
||||
|
||||
|
||||
#endif // _MSC_VER
|
||||
|
||||
#else //GCC
|
||||
|
||||
int32_t WelsSnprintf (str_t* pBuffer, int32_t iSizeOfBuffer, const str_t* kpFormat, ...) {
|
||||
va_list pArgPtr;
|
||||
int32_t iRc;
|
||||
|
||||
va_start (pArgPtr, kpFormat);
|
||||
|
||||
iRc = vsnprintf (pBuffer, iSizeOfBuffer, kpFormat, pArgPtr);
|
||||
|
||||
va_end (pArgPtr);
|
||||
|
||||
return iRc;
|
||||
}
|
||||
|
||||
str_t* WelsStrncpy (str_t* pDest, int32_t iSizeInBytes, const str_t* kpSrc, int32_t iCount) {
|
||||
return strncpy (pDest, kpSrc, iCount); //confirmed_safe_unsafe_usage
|
||||
}
|
||||
|
||||
#if !defined(MACOS) && !defined(UNIX) && !defined(APPLE_IOS)
|
||||
int32_t WelsStrnlen (const str_t* kpStr, int32_t iMaxlen) {
|
||||
return strnlen (kpStr, iMaxlen); //confirmed_safe_unsafe_usage
|
||||
}
|
||||
#else
|
||||
int32_t WelsStrnlen (const str_t* kpString, int32_t iMaxlen) {
|
||||
// In mac os, there is no strnlen in string.h, we can only use strlen instead of strnlen or
|
||||
// implement strnlen by ourself
|
||||
|
||||
#if 1
|
||||
return strlen (kpString); //confirmed_safe_unsafe_usage
|
||||
#else
|
||||
const str_t* kpSrc;
|
||||
for (kpSrc = kpString; iMaxlen-- && *kpSrc != '\0'; ++kpSrc)
|
||||
return kpSrc - kpString;
|
||||
#endif
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
int32_t WelsVsprintf (str_t* pBuffer, int32_t iSizeOfBuffer, const str_t* kpFormat, va_list pArgPtr) {
|
||||
return vsprintf (pBuffer, kpFormat, pArgPtr); //confirmed_safe_unsafe_usage
|
||||
}
|
||||
|
||||
WelsFileHandle* WelsFopen (const str_t* kpFilename, const str_t* kpMode) {
|
||||
return fopen (kpFilename, kpMode);
|
||||
}
|
||||
|
||||
int32_t WelsFclose (WelsFileHandle* pFp) {
|
||||
return fclose (pFp);
|
||||
}
|
||||
|
||||
int32_t WelsGetTimeOfDay (SWelsTime* pTp) {
|
||||
struct timeval sTv;
|
||||
|
||||
if (gettimeofday (&sTv, NULL)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
pTp->time = sTv.tv_sec;
|
||||
pTp->millitm = (uint16_t)sTv.tv_usec / 1000;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int32_t WelsStrftime (str_t* pBuffer, int32_t iSize, const str_t* kpFormat, const SWelsTime* kpTp) {
|
||||
struct tm* pTnow;
|
||||
|
||||
pTnow = localtime (&kpTp->time);
|
||||
|
||||
return strftime (pBuffer, iSize, kpFormat, pTnow);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
int32_t WelsFwrite (const void_t* kpBuffer, int32_t iSize, int32_t iCount, WelsFileHandle* pFp) {
|
||||
return fwrite (kpBuffer, iSize, iCount, pFp);
|
||||
}
|
||||
|
||||
uint16_t WelsGetMillsecond (const SWelsTime* kpTp) {
|
||||
return kpTp->millitm;
|
||||
}
|
||||
|
||||
int32_t WelsFflush (WelsFileHandle* pFp) {
|
||||
return fflush (pFp);
|
||||
}
|
||||
@ -43,17 +43,60 @@
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
#include <math.h>
|
||||
|
||||
#include <time.h>
|
||||
|
||||
#if defined(_WIN32)
|
||||
#include <windows.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/timeb.h>
|
||||
#else
|
||||
#include <sys/timeb.h>
|
||||
#include <sys/time.h>
|
||||
#include "typedefs.h"
|
||||
#endif//WIN32
|
||||
#endif//_WIN32
|
||||
|
||||
#include "typedefs.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define WELS_FILE_SEEK_SET SEEK_SET
|
||||
#define WELS_FILE_SEEK_CUR SEEK_CUR
|
||||
#define WESL_FILE_SEEK_END SEEK_END
|
||||
|
||||
typedef FILE WelsFileHandle;
|
||||
|
||||
#ifdef _WIN32
|
||||
typedef struct _timeb SWelsTime;
|
||||
#else
|
||||
typedef struct timeb SWelsTime;
|
||||
#endif
|
||||
|
||||
int32_t WelsSnprintf (str_t* buffer, int32_t sizeOfBuffer, const str_t* format, ...);
|
||||
str_t* WelsStrncpy (str_t* dest, int32_t sizeInBytes, const str_t* src, int32_t count);
|
||||
str_t* WelsStrcat (str_t* dest, int32_t sizeInBytes, str_t* src);
|
||||
int32_t WelsStrnlen (const str_t* str, int32_t maxlen);
|
||||
int32_t WelsVsprintf (str_t* buffer, int32_t sizeOfBuffer, const str_t* format, va_list argptr);
|
||||
|
||||
WelsFileHandle* WelsFopen (const str_t* filename, const str_t* mode);
|
||||
int32_t WelsFclose (WelsFileHandle* fp);
|
||||
int32_t WelsFread (void* buffer, int32_t size, int32_t count, WelsFileHandle* fp);
|
||||
int32_t WelsFwrite (const void* buffer, int32_t size, int32_t count, WelsFileHandle* fp);
|
||||
int32_t WelsFseek (WelsFileHandle* fp, int32_t offset, int32_t origin);
|
||||
int32_t WelsFflush (WelsFileHandle* fp);
|
||||
|
||||
int32_t WelsGetTimeOfDay (SWelsTime* tp);
|
||||
int32_t WelsStrftime (str_t* buffer, int32_t size, const str_t* format, const SWelsTime* tp);
|
||||
uint16_t WelsGetMillsecond (const SWelsTime* tp);
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* Safe Lib specific errno codes. These can be added to the errno.h file
|
||||
@ -2,6 +2,7 @@ COMMON_PREFIX=COMMON
|
||||
COMMON_SRCDIR=codec/common
|
||||
COMMON_CPP_SRCS=\
|
||||
$(COMMON_SRCDIR)/./cpu.cpp\
|
||||
$(COMMON_SRCDIR)/./crt_util_safe_x.cpp\
|
||||
$(COMMON_SRCDIR)/./deblocking_common.cpp\
|
||||
$(COMMON_SRCDIR)/./logging.cpp\
|
||||
$(COMMON_SRCDIR)/./WelsThreadLib.cpp\
|
||||
|
||||
@ -1,104 +0,0 @@
|
||||
/*!
|
||||
* \copy
|
||||
* Copyright (c) 2010-2013, Cisco Systems
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
||||
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
*
|
||||
* \file crt_util_safe_x.h
|
||||
*
|
||||
* \brief Safe CRT like util for cross platfroms support
|
||||
*
|
||||
* \date 06/04/2010 Created
|
||||
*
|
||||
*************************************************************************************
|
||||
*/
|
||||
#ifndef WELS_CRT_UTIL_SAFE_CROSS_PLATFORMS_H__
|
||||
#define WELS_CRT_UTIL_SAFE_CROSS_PLATFORMS_H__
|
||||
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
#include <math.h>
|
||||
#include <time.h>
|
||||
|
||||
#if defined(_WIN32)
|
||||
#include <windows.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/timeb.h>
|
||||
#else
|
||||
#include <sys/timeb.h>
|
||||
#include <sys/time.h>
|
||||
#include "typedefs.h"
|
||||
#endif//_WIN32
|
||||
|
||||
#include "typedefs.h"
|
||||
|
||||
namespace WelsDec {
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define WELS_FILE_SEEK_SET SEEK_SET
|
||||
#define WELS_FILE_SEEK_CUR SEEK_CUR
|
||||
#define WESL_FILE_SEEK_END SEEK_END
|
||||
|
||||
typedef FILE WelsFileHandle;
|
||||
|
||||
#ifdef _WIN32
|
||||
typedef struct _timeb SWelsTime;
|
||||
#else
|
||||
typedef struct timeb SWelsTime;
|
||||
#endif
|
||||
|
||||
int32_t WelsSnprintf (str_t* buffer, int32_t sizeOfBuffer, const str_t* format, ...);
|
||||
str_t* WelsStrncpy (str_t* dest, int32_t sizeInBytes, const str_t* src, int32_t count);
|
||||
str_t* WelsStrcat (str_t* dest, int32_t sizeInBytes, str_t* src);
|
||||
int32_t WelsStrnlen (const str_t* str, int32_t maxlen);
|
||||
int32_t WelsVsprintf (str_t* buffer, int32_t sizeOfBuffer, const str_t* format, va_list argptr);
|
||||
|
||||
WelsFileHandle* WelsFopen (const str_t* filename, const str_t* mode);
|
||||
int32_t WelsFclose (WelsFileHandle* fp);
|
||||
int32_t WelsFread (void* buffer, int32_t size, int32_t count, WelsFileHandle* fp);
|
||||
int32_t WelsFwrite (const void* buffer, int32_t size, int32_t count, WelsFileHandle* fp);
|
||||
int32_t WelsFseek (WelsFileHandle* fp, int32_t offset, int32_t origin);
|
||||
int32_t WelsFflush (WelsFileHandle* fp);
|
||||
|
||||
int32_t WelsGetTimeOfDay (SWelsTime* tp);
|
||||
int32_t WelsStrftime (str_t* buffer, int32_t size, const str_t* format, const SWelsTime* tp);
|
||||
uint16_t WelsGetMillsecond (const SWelsTime* tp);
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
} // namespace WelsDec
|
||||
|
||||
#endif//WELS_CRT_UTIL_SAFE_CROSS_PLATFORMS_H__
|
||||
@ -38,32 +38,8 @@
|
||||
*************************************************************************************
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
#include <time.h>
|
||||
#if defined(_WIN32)
|
||||
#include <windows.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/timeb.h>
|
||||
#ifndef _MSC_VER
|
||||
#include <sys/time.h>
|
||||
#ifndef HAVE_STRNLEN
|
||||
#define strnlen(a,b) strlen(a)
|
||||
#endif //!HAVE_STRNLEN
|
||||
#endif //!_MSC_VER
|
||||
#else
|
||||
#include <sys/time.h>
|
||||
#include <sys/timeb.h>
|
||||
#endif //_WIN32
|
||||
|
||||
#include "utils.h"
|
||||
#include "macros.h"
|
||||
#include "wels_const.h"
|
||||
#include "cpu_core.h"
|
||||
#include "decoder_context.h"
|
||||
#include "crt_util_safe_x.h" // Safe CRT routines like utils for cross platforms
|
||||
#include "mem_align.h"
|
||||
|
||||
namespace WelsDec {
|
||||
|
||||
@ -82,202 +58,4 @@ void_t WelsLog (void_t* pPtr, int32_t iLevel, const char* kpFmt, ...) {
|
||||
va_end (pVl);
|
||||
}
|
||||
|
||||
|
||||
#if defined(_WIN32) && defined(_MSC_VER)
|
||||
|
||||
#if defined(_MSC_VER) && (_MSC_VER>=1500)
|
||||
|
||||
int32_t WelsSnprintf (str_t* pBuffer, int32_t iSizeOfBuffer, const str_t* kpFormat, ...) {
|
||||
va_list pArgPtr;
|
||||
int32_t iRc;
|
||||
|
||||
va_start (pArgPtr, kpFormat);
|
||||
|
||||
iRc = vsnprintf_s (pBuffer, iSizeOfBuffer, _TRUNCATE, kpFormat, pArgPtr);
|
||||
|
||||
va_end (pArgPtr);
|
||||
|
||||
return iRc;
|
||||
}
|
||||
|
||||
str_t* WelsStrncpy (str_t* pDest, int32_t iSizeInBytes, const str_t* kpSrc, int32_t iCount) {
|
||||
strncpy_s (pDest, iSizeInBytes, kpSrc, iCount);
|
||||
|
||||
return pDest;
|
||||
}
|
||||
|
||||
int32_t WelsStrnlen (const str_t* kpStr, int32_t iMaxlen) {
|
||||
return strnlen_s (kpStr, iMaxlen);
|
||||
}
|
||||
|
||||
int32_t WelsVsprintf (str_t* pBuffer, int32_t iSizeOfBuffer, const str_t* kpFormat, va_list pArgPtr) {
|
||||
return vsprintf_s (pBuffer, iSizeOfBuffer, kpFormat, pArgPtr);
|
||||
}
|
||||
|
||||
WelsFileHandle* WelsFopen (const str_t* kpFilename, const str_t* kpMode) {
|
||||
WelsFileHandle* pFp = NULL;
|
||||
if (fopen_s (&pFp, kpFilename, kpMode) != 0) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return pFp;
|
||||
}
|
||||
|
||||
int32_t WelsFclose (WelsFileHandle* pFp) {
|
||||
return fclose (pFp);
|
||||
}
|
||||
|
||||
int32_t WelsGetTimeOfDay (SWelsTime* pTp) {
|
||||
return _ftime_s (pTp);
|
||||
}
|
||||
|
||||
int32_t WelsStrftime (str_t* pBuffer, int32_t iSize, const str_t* kpFormat, const SWelsTime* kpTp) {
|
||||
struct tm sTimeNow;
|
||||
|
||||
localtime_s (&sTimeNow, &kpTp->time);
|
||||
|
||||
return strftime (pBuffer, iSize, kpFormat, &sTimeNow);
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
int32_t WelsSnprintf (str_t* pBuffer, int32_t iSizeOfBuffer, const str_t* kpFormat, ...) {
|
||||
va_list pArgPtr;
|
||||
int32_t iRc;
|
||||
|
||||
va_start (pArgPtr, kpFormat);
|
||||
|
||||
iRc = vsprintf (pBuffer, kpFormat, pArgPtr); //confirmed_safe_unsafe_usage
|
||||
|
||||
va_end (pArgPtr);
|
||||
|
||||
return iRc;
|
||||
}
|
||||
|
||||
str_t* WelsStrncpy (str_t* pDest, int32_t iSizeInBytes, const str_t* kpSrc, int32_t iCount) {
|
||||
strncpy (pDest, kpSrc, iCount); //confirmed_safe_unsafe_usage
|
||||
|
||||
return pDest;
|
||||
}
|
||||
|
||||
int32_t WelsStrnlen (const str_t* kpStr, int32_t iMaxlen) {
|
||||
return strlen (kpStr); //confirmed_safe_unsafe_usage
|
||||
}
|
||||
|
||||
int32_t WelsVsprintf (str_t* pBuffer, int32_t iSizeOfBuffer, const str_t* kpFormat, va_list pArgPtr) {
|
||||
return vsprintf (pBuffer, kpFormat, pArgPtr); //confirmed_safe_unsafe_usage
|
||||
}
|
||||
|
||||
|
||||
WelsFileHandle* WelsFopen (const str_t* kpFilename, const str_t* kpMode) {
|
||||
return fopen (kpFilename, kpMode);
|
||||
}
|
||||
|
||||
int32_t WelsFclose (WelsFileHandle* pFp) {
|
||||
return fclose (pFp);
|
||||
}
|
||||
|
||||
int32_t WelsGetTimeOfDay (SWelsTime* pTp) {
|
||||
_ftime (pTp);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int32_t WelsStrftime (str_t* pBuffer, int32_t iSize, const str_t* kpFormat, const SWelsTime* kpTp) {
|
||||
struct tm* pTnow;
|
||||
|
||||
pTnow = localtime (&kpTp->time);
|
||||
|
||||
return strftime (pBuffer, iSize, kpFormat, pTnow);
|
||||
}
|
||||
|
||||
|
||||
#endif // _MSC_VER
|
||||
|
||||
#else //GCC
|
||||
|
||||
int32_t WelsSnprintf (str_t* pBuffer, int32_t iSizeOfBuffer, const str_t* kpFormat, ...) {
|
||||
va_list pArgPtr;
|
||||
int32_t iRc;
|
||||
|
||||
va_start (pArgPtr, kpFormat);
|
||||
|
||||
iRc = vsnprintf (pBuffer, iSizeOfBuffer, kpFormat, pArgPtr);
|
||||
|
||||
va_end (pArgPtr);
|
||||
|
||||
return iRc;
|
||||
}
|
||||
|
||||
str_t* WelsStrncpy (str_t* pDest, int32_t iSizeInBytes, const str_t* kpSrc, int32_t iCount) {
|
||||
return strncpy (pDest, kpSrc, iCount); //confirmed_safe_unsafe_usage
|
||||
}
|
||||
|
||||
#if !defined(MACOS) && !defined(UNIX) && !defined(APPLE_IOS)
|
||||
int32_t WelsStrnlen (const str_t* kpStr, int32_t iMaxlen) {
|
||||
return strnlen (kpStr, iMaxlen); //confirmed_safe_unsafe_usage
|
||||
}
|
||||
#else
|
||||
int32_t WelsStrnlen (const str_t* kpString, int32_t iMaxlen) {
|
||||
// In mac os, there is no strnlen in string.h, we can only use strlen instead of strnlen or
|
||||
// implement strnlen by ourself
|
||||
|
||||
#if 1
|
||||
return strlen (kpString); //confirmed_safe_unsafe_usage
|
||||
#else
|
||||
const str_t* kpSrc;
|
||||
for (kpSrc = kpString; iMaxlen-- && *kpSrc != '\0'; ++kpSrc)
|
||||
return kpSrc - kpString;
|
||||
#endif
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
int32_t WelsVsprintf (str_t* pBuffer, int32_t iSizeOfBuffer, const str_t* kpFormat, va_list pArgPtr) {
|
||||
return vsprintf (pBuffer, kpFormat, pArgPtr); //confirmed_safe_unsafe_usage
|
||||
}
|
||||
|
||||
WelsFileHandle* WelsFopen (const str_t* kpFilename, const str_t* kpMode) {
|
||||
return fopen (kpFilename, kpMode);
|
||||
}
|
||||
|
||||
int32_t WelsFclose (WelsFileHandle* pFp) {
|
||||
return fclose (pFp);
|
||||
}
|
||||
|
||||
int32_t WelsGetTimeOfDay (SWelsTime* pTp) {
|
||||
struct timeval sTv;
|
||||
|
||||
if (gettimeofday (&sTv, NULL)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
pTp->time = sTv.tv_sec;
|
||||
pTp->millitm = (uint16_t)sTv.tv_usec / 1000;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int32_t WelsStrftime (str_t* pBuffer, int32_t iSize, const str_t* kpFormat, const SWelsTime* kpTp) {
|
||||
struct tm* pTnow;
|
||||
|
||||
pTnow = localtime (&kpTp->time);
|
||||
|
||||
return strftime (pBuffer, iSize, kpFormat, pTnow);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
int32_t WelsFwrite (const void_t* kpBuffer, int32_t iSize, int32_t iCount, WelsFileHandle* pFp) {
|
||||
return fwrite (kpBuffer, iSize, iCount, pFp);
|
||||
}
|
||||
|
||||
uint16_t WelsGetMillsecond (const SWelsTime* kpTp) {
|
||||
return kpTp->millitm;
|
||||
}
|
||||
|
||||
int32_t WelsFflush (WelsFileHandle* pFp) {
|
||||
return fflush (pFp);
|
||||
}
|
||||
|
||||
} // namespace WelsDec
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user