X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcore%2Ffunctions.cpp;h=f75902d5bdaa3a0b486803874eb26c899da9f834;hb=9fa68da11c56250017da9735e4a5dd3fd3b2021b;hp=6a660dfe396b9387d44a9e3a2cd84e9aa8410589;hpb=706c5ba5c35199816446453e6e144200cf79265b;p=anna.git diff --git a/source/core/functions.cpp b/source/core/functions.cpp index 6a660df..f75902d 100644 --- a/source/core/functions.cpp +++ b/source/core/functions.cpp @@ -94,13 +94,12 @@ throw() { string functions::asString(const S64 number) throw() { char aux [24]; - sprintf(aux, "%lld", number); - /*#ifdef __anna64__ + //sprintf(aux, "%lld", number); + #ifdef __anna64__ sprintf (aux, "%ld", number); #else sprintf (aux, "%lld", number); #endif - */ return string(aux); } @@ -114,14 +113,12 @@ throw() { string functions::asString(const U64 number) throw() { char aux [16]; - sprintf(aux, "%llu", number); - /* + //sprintf(aux, "%llu", number); #ifdef __anna64__ sprintf (aux, "%lu", number); #else sprintf (aux, "%llu", number); #endif - */ return string(aux); } @@ -171,14 +168,12 @@ throw() { string functions::asHexString(const S64 number) throw() { char aux [32]; - sprintf(aux, "0x%llx", number); - /* + //sprintf(aux, "0x%llx", number); #ifdef __anna64__ sprintf (aux, "0x%lx", number); #else sprintf (aux, "0x%llx", number); #endif - */ return string(aux); } @@ -310,14 +305,12 @@ throw(RuntimeException) { S64 functions::asInteger64(const char* str) throw() { S64 number = 0; - sscanf(str, "%lld", &number); - /* + //sscanf(str, "%lld", &number); #ifdef __anna64__ sscanf (str, "%ld", &number); #else sscanf (str, "%lld", &number); #endif - */ return number; } @@ -416,8 +409,8 @@ throw() { int r = -1; // r will be lg(v) unsigned int t, tt; // temporaries - if(tt = v >> 16) { - r = (t = tt >> 8) ? 24 + LogTable256[t] : 16 + LogTable256[tt]; + if((tt = v >> 16)) { + r = ((t = tt >> 8)) ? 24 + LogTable256[t] : 16 + LogTable256[tt]; } else { r = (t = v >> 8) ? 8 + LogTable256[t] : LogTable256[v]; }