char *strncpy(char *__str1, const char *__str2, size_t max);
int strcmp(const char *str1, const char *str2);
int strncmp(const char *str1, const char *str2, size_t num);
-char *strdup(const char *Str);
+char *_strdup(const char *File, int Line, const char *Str);
char **str_split(const char *__str, char __ch);
int strpos8(const char *str, Uint32 Search);
int ReadUTF8(Uint8 *str, Uint32 *Val);
EXPORT(strncpy);
EXPORT(strcmp);
EXPORT(strncmp);
-EXPORT(strdup);
+//EXPORT(strdup);
+EXPORT(_strdup); // Takes File/Line too
EXPORT(str_split);
EXPORT(strpos8);
EXPORT(DivUp);
if(pos==__maxlen){return pos;}\
if(__s){__s[pos++]=ch;}else{pos++;}\
}while(0)
+#define GETVAL() do {\
+ if(isLongLong) val = va_arg(args, Uint64);\
+ else val = va_arg(args, unsigned int);\
+ }while(0)
/**
* \brief VArg String Number Print Formatted
*/
goto printString;
}
- // Get Argument
- val = va_arg(args, unsigned int);
-
// - Padding Side Flag
if(c == '+') {
bPadLeft = 1;
// - Minimum length
if(c == '*') { // Dynamic length
- minSize = val;
- val = va_arg(args, unsigned int);
+ minSize = va_arg(args, unsigned int);
c = *__format++;
}
else if('1' <= c && c <= '9')
{
c = *__format++;
if(c == 'l') {
- #if BITS == 32
- val |= (Uint64)va_arg(args, Uint) << 32;
- #endif
c = *__format++;
isLongLong = 1;
}
{
case 'd':
case 'i':
+ GETVAL();
if( isLongLong && val >> 63 ) {
PUTCH('-');
val = -val;
itoa(p, val, 10, minSize, pad);
goto printString;
case 'u':
+ GETVAL();
itoa(p, val, 10, minSize, pad);
goto printString;
case 'x':
+ GETVAL();
itoa(p, val, 16, minSize, pad);
goto printString;
case 'o':
+ GETVAL();
itoa(p, val, 8, minSize, pad);
goto printString;
case 'b':
+ GETVAL();
itoa(p, val, 2, minSize, pad);
goto printString;
case 'B': //Boolean
+ val = va_arg(args, unsigned int);
if(val) p = "True";
else p = "False";
goto printString;
// String - Null Terminated Array
case 's':
- p = (char*)(tVAddr)val;
+ p = va_arg(args, char*); // Get Argument
printString:
if(!p) p = "(null)";
len = strlen(p);
break;
case 'C': // Non-Null Terminated Character Array
- p = (char*)(tVAddr)val;
+ p = va_arg(args, char*);
if(!p) goto printString;
while(minSize--) PUTCH(*p++);
break;
// Single Character
case 'c':
default:
+ GETVAL();
PUTCH( (Uint8)val );
break;
}
return *Str1-*Str2;
}
+#if 0
/**
* \fn char *strdup(const char *Str)
* \brief Duplicates a string
{
char *ret;
ret = malloc(strlen(Str)+1);
+ if( !ret ) return NULL;
+ strcpy(ret, Str);
+ return ret;
+}
+#endif
+
+/**
+ * \fn char *_strdup(const char *File, int Line, const char *Str)
+ * \brief Duplicates a string
+ */
+char *_strdup(const char *File, int Line, const char *Str)
+{
+ char *ret;
+ ret = Heap_Allocate(File, Line, strlen(Str)+1);
+ if( !ret ) return NULL;
strcpy(ret, Str);
return ret;
}