#define _stdout 1\r
\r
// === PROTOTYPES ===\r
-EXPORT void itoa(char *buf, uint64_t num, int base, int minLength, char pad, int bSigned);\r
+EXPORT void itoa(char *buf, uint64_t num, uint base, int minLength, char pad, int bSigned);\r
struct sFILE *get_file_struct();\r
\r
// === GLOBALS ===\r
\r
//sprintfv\r
/**\r
- \fn EXPORT void vsnprintf(char *buf, const char *format, va_list args)\r
- \brief Prints a formatted string to a buffer\r
- \param buf Pointer - Destination Buffer\r
- \param format String - Format String\r
- \param args VarArgs List - Arguments\r
-*/\r
+ * \fn EXPORT void vsnprintf(char *buf, const char *format, va_list args)\r
+ * \brief Prints a formatted string to a buffer\r
+ * \param buf Pointer - Destination Buffer\r
+ * \param format String - Format String\r
+ * \param args VarArgs List - Arguments\r
+ */\r
EXPORT int vsnprintf(char *buf, size_t __maxlen, const char *format, va_list args)\r
{\r
- char tmp[33];\r
+ char tmp[65];\r
int c, minSize;\r
int pos = 0;\r
char *p;\r
buf[pos+2] = 'x';\r
}\r
pos += 3;\r
+ arg = va_arg(args, uint32_t);\r
+ itoa(tmp, arg, 16, minSize, pad, 0);\r
+ goto sprintf_puts;\r
// Fall through to hex\r
// Unsigned Hexadecimal\r
case 'x':\r
p = (void*)(intptr_t)arg;\r
sprintf_puts:\r
if(!p) p = "(null)";\r
+ //_SysDebug("vsnprintf: p = '%s'", p);\r
if(buf) {\r
while(*p) {\r
if(pos < __maxlen) buf[pos] = *p;\r
}\r
if(buf && pos < __maxlen) buf[pos] = '\0';\r
\r
+ //_SysDebug("vsnprintf: buf = '%s'", buf);\r
+ \r
return pos;\r
}\r
\r
/**\r
* \fn static void itoa(char *buf, uint64_t num, int base, int minLength, char pad, int bSigned)\r
* \brief Convert an integer into a character string\r
+ * \param buf Destination Buffer\r
+ * \param num Number to convert\r
+ * \param base Base-n number output\r
+ * \param minLength Minimum length of output\r
+ * \param pad Padding used to ensure minLength\r
+ * \param bSigned Signed number output?\r
*/\r
-EXPORT void itoa(char *buf, uint64_t num, int base, int minLength, char pad, int bSigned)\r
+EXPORT void itoa(char *buf, uint64_t num, size_t base, int minLength, char pad, int bSigned)\r
{\r
- char tmpBuf[32];\r
+ char tmpBuf[64];\r
int pos=0, i;\r
\r
if(!buf) return;\r
- if(base > 16) {\r
+ if(base > 16 || base < 2) {\r
buf[0] = 0;\r
return;\r
}\r
} else\r
bSigned = 0;\r
\r
+ // Encode into reversed string\r
while(num > base-1) {\r
- tmpBuf[pos] = cUCDIGITS[ num % base ];\r
- num = (long) num / base; // Shift {number} right 1 digit\r
- pos++;\r
+ tmpBuf[pos++] = cUCDIGITS[ num % base ];\r
+ num = (uint64_t) num / (uint64_t)base; // Shift {number} right 1 digit\r
}\r
\r
tmpBuf[pos++] = cUCDIGITS[ num % base ]; // Last digit of {number}\r
if(bSigned) tmpBuf[pos++] = '-'; // Append sign symbol if needed\r
+ \r
i = 0;\r
minLength -= pos;\r
while(minLength-- > 0) buf[i++] = pad;\r