mirror of
https://github.com/bkaradzic/bx.git
synced 2026-02-19 13:33:00 +01:00
Fixed assert macros, and improved error handling.
This commit is contained in:
16
src/os.cpp
16
src/os.cpp
@@ -3,7 +3,6 @@
|
||||
* License: https://github.com/bkaradzic/bx#license-bsd-2-clause
|
||||
*/
|
||||
|
||||
#include "bx_p.h"
|
||||
#include <bx/string.h>
|
||||
#include <bx/os.h>
|
||||
#include <bx/uint32_t.h>
|
||||
@@ -209,7 +208,7 @@ namespace bx
|
||||
{
|
||||
const int32_t symbolMax = _symbol.getLength()+1;
|
||||
char* symbol = (char*)alloca(symbolMax);
|
||||
bx::strCopy(symbol, symbolMax, _symbol);
|
||||
strCopy(symbol, symbolMax, _symbol);
|
||||
|
||||
#if BX_PLATFORM_WINDOWS
|
||||
return (void*)::GetProcAddress( (HMODULE)_handle, symbol);
|
||||
@@ -229,7 +228,7 @@ namespace bx
|
||||
{
|
||||
const int32_t nameMax = _name.getLength()+1;
|
||||
char* name = (char*)alloca(nameMax);
|
||||
bx::strCopy(name, nameMax, _name);
|
||||
strCopy(name, nameMax, _name);
|
||||
|
||||
#if BX_PLATFORM_WINDOWS
|
||||
DWORD len = ::GetEnvironmentVariableA(name, _out, *_inOutSize);
|
||||
@@ -267,14 +266,14 @@ namespace bx
|
||||
{
|
||||
const int32_t nameMax = _name.getLength()+1;
|
||||
char* name = (char*)alloca(nameMax);
|
||||
bx::strCopy(name, nameMax, _name);
|
||||
strCopy(name, nameMax, _name);
|
||||
|
||||
char* value = NULL;
|
||||
if (!_value.isEmpty() )
|
||||
{
|
||||
int32_t valueMax = _value.getLength()+1;
|
||||
value = (char*)alloca(valueMax);
|
||||
bx::strCopy(value, valueMax, _value);
|
||||
strCopy(value, valueMax, _value);
|
||||
}
|
||||
|
||||
#if BX_PLATFORM_WINDOWS
|
||||
@@ -344,7 +343,7 @@ namespace bx
|
||||
int32_t len = 0;
|
||||
for(uint32_t ii = 0; NULL != _argv[ii]; ++ii)
|
||||
{
|
||||
len += snprintf(&temp[len], bx::uint32_imax(0, total-len)
|
||||
len += snprintf(&temp[len], uint32_imax(0, total-len)
|
||||
, "%s "
|
||||
, _argv[ii]
|
||||
);
|
||||
@@ -373,4 +372,9 @@ namespace bx
|
||||
#endif // BX_PLATFORM_LINUX || BX_PLATFORM_HURD
|
||||
}
|
||||
|
||||
void exit(int32_t _exitCode)
|
||||
{
|
||||
::exit(_exitCode);
|
||||
}
|
||||
|
||||
} // namespace bx
|
||||
|
||||
Reference in New Issue
Block a user