int atoi(const char *string)
{
int ret = 0;
+ int bNeg = 0;
+
+ //Log("atoi: (string='%s')", string);
// Clear non-numeric characters
- while( !('0' <= *string && *string <= '9') ) string++;
+ while( !('0' <= *string && *string <= '9') && *string != '-' ) string++;
+ if( *string == '-' ) {
+ bNeg = 1;
+ while( !('0' <= *string && *string <= '9') ) string++;
+ }
if(*string == '0')
{
{
// Hex
string ++;
- for( ;; ) {
- ret *= 16;
- if('0' <= *string && *string <= '9')
+ for( ;; string ++ )
+ {
+ if('0' <= *string && *string <= '9') {
+ ret *= 16;
ret += *string - '0';
- else if('A' <= *string && *string <= 'F')
+ }
+ else if('A' <= *string && *string <= 'F') {
+ ret *= 16;
ret += *string - 'A' + 10;
- else if('a' <= *string && *string <= 'f')
+ }
+ else if('a' <= *string && *string <= 'f') {
+ ret *= 16;
ret += *string - 'a' + 10;
+ }
else
break;
- string ++;
}
}
- else
+ else // Octal
{
- for( ;; )
+ for( ; '0' <= *string && *string <= '7'; string ++ )
{
ret *= 8;
- if('0' <= *string && *string <= '7')
- ret += *string - '0';
- else
- break;
+ ret += *string - '0';
}
}
}
- else
+ else // Decimal
{
for( ; '0' <= *string && *string <= '9'; string++)
{
ret += *string - '0';
}
}
+
+ if(bNeg) ret = -ret;
+
+ //Log("atoi: RETURN %i", ret);
+
return ret;
}
buf[i] = 0;
}
-#define PUTCH(c) do{if(pos==__maxlen)break;if(__s){__s[pos++]=(c);}else{pos++;}}while(0)
+/**
+ * \brief Append a character the the vsnprintf output
+ */
+#define PUTCH(c) do{\
+ char ch=(c);\
+ if(pos==__maxlen){return pos;}\
+ if(__s){__s[pos++]=ch;}else{pos++;}\
+ }while(0)
int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
{
char c, pad = ' ';
- int minSize = 0;
+ int minSize = 0, len;
char tmpBuf[34]; // For Integers
char *p = NULL;
int isLongLong = 0;
Uint64 val;
size_t pos = 0;
+ // Flags
+ int bPadLeft = 0;
+
+ //Log("vsnprintf: (__s=%p, __maxlen=%i, __format='%s', ...)", __s, __maxlen, __format);
while((c = *__format++) != 0)
{
if(c != '%') { PUTCH(c); continue; }
c = *__format++;
+ //Log("pos = %i", pos);
// Literal %
if(c == '%') { PUTCH('%'); continue; }
// Get Argument
val = va_arg(args, Uint);
+ // - Padding Side Flag
+ if(c == '+') {
+ bPadLeft = 1;
+ c = *__format++;
+ }
+
// - Padding
if(c == '0') {
pad = '0';
p = (char*)(Uint)val;
printString:
if(!p) p = "(null)";
+ len = strlen(p);
+ if( !bPadLeft ) while(len++ < minSize) PUTCH(pad);
while(*p) PUTCH(*p++);
+ if( bPadLeft ) while(len++ < minSize) PUTCH(pad);
break;
case 'C': // Non-Null Terminated Character Array
PUTCH( (Uint8)val );
break;
}
-
- if(pos == __maxlen)
- break;
}
if(__s && pos != __maxlen)
__s[pos] = '\0';
-
return pos;
}