actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2150 from natano/SM-fix-BinaryToHex

Browse Source 
Fix BinaryToHex()
This commit is contained in:
Crystal Squirrel
2021-10-01 00:32:12 +01:00
committed by GitHub
parent 9ffaae7e15 baa5de4cd2
commit b8fc345fd3
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RageUtil.cpp
+15 -3
View File
@@ -225,11 +225,11 @@ bool IsHexVal( const RString &s )
return true;
}
RString BinaryToHex( const void *pData_, int iNumBytes )
RString BinaryToHex( const void *pData_, size_t iNumBytes )
{
const unsigned char *pData = (const unsigned char *) pData_;
RString s;
for( int i=0; i<iNumBytes; i++ )
for( size_t i=0; i<iNumBytes; i++ )
{
unsigned val = pData[i];
s += ssprintf( "%02x", val );
@@ -2481,7 +2481,19 @@ LuaFunction( URLEncode, URLEncode( SArg(1) ) );
LuaFunction( PrettyPercent, PrettyPercent( FArg(1), FArg(2) ) );
//LuaFunction( IsHexVal, IsHexVal( SArg(1) ) );
LuaFunction( lerp, lerp(FArg(1), FArg(2), FArg(3)) );
LuaFunction( BinaryToHex, BinaryToHex( SArg(1) ) );
int LuaFunc_BinaryToHex(lua_State* L);
int LuaFunc_BinaryToHex(lua_State* L)
{
size_t l;
const char *s = luaL_checklstring(L, 1, &l);
RString hex = BinaryToHex(s, l);
LuaHelpers::Push(L, hex);
return 1;
}
LUAFUNC_REGISTER_COMMON(BinaryToHex);
int LuaFunc_commify(lua_State* L);
int LuaFunc_commify(lua_State* L)
src/RageUtil.h
+1 -1
View File
@@ -352,7 +352,7 @@ float fmodfp( float x, float y );
int power_of_two( int input );
bool IsAnInt( const RString &s );
bool IsHexVal( const RString &s );
RString BinaryToHex( const void *pData_, int iNumBytes );
RString BinaryToHex( const void *pData_, size_t iNumBytes );
RString BinaryToHex( const RString &sString );
bool HexToBinary( const RString &s, unsigned char *stringOut );
bool HexToBinary( const RString &s, RString *sOut );