Kernel - Updated makefiles to provide a better version number

[tpg/acess2.git] / Usermode / Libraries / libc.so_src / fileIO.c

diff --git a/Usermode/Libraries/libc.so_src/fileIO.c b/Usermode/Libraries/libc.so_src/fileIO.c
index 60def89..d807a93 100644 (file)
--- a/Usermode/Libraries/libc.so_src/fileIO.c
+++ b/Usermode/Libraries/libc.so_src/fileIO.c
@@ -19,7 +19,7 @@
 #define        _stdout 1\r
 \r
 // === PROTOTYPES ===\r
-EXPORT void    itoa(char *buf, uint64_t num, uint 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
 struct sFILE   *get_file_struct();\r
 \r
 // === GLOBALS ===\r
@@ -131,7 +131,7 @@ EXPORT void fflush(FILE *fp)
        ///\todo Implement\r
 }\r
 \r
-EXPORT long int ftell(FILE *fp)\r
+EXPORT off_t ftell(FILE *fp)\r
 {\r
        if(!fp || !fp->FD)      return -1;\r
        \r
@@ -427,7 +427,7 @@ EXPORT int vsnprintf(char *buf, size_t __maxlen, const char *format, va_list arg
                        _addchar('*');\r
                        _addchar('0');\r
                        _addchar('x');\r
-                       arg = va_arg(args, uint32_t);\r
+                       arg = va_arg(args, intptr_t);\r
                        itoa(tmp, arg, 16, minSize, pad, 0);\r
                        precision = -1;\r
                        goto sprintf_puts;\r
@@ -457,8 +457,7 @@ EXPORT int vsnprintf(char *buf, size_t __maxlen, const char *format, va_list arg
 \r
                // String\r
                case 's':\r
-                       arg = va_arg(args, uint32_t);\r
-                       p = (void*)(intptr_t)arg;\r
+                       p = va_arg(args, char*);\r
                sprintf_puts:\r
                        if(!p)  p = "(null)";\r
                        //_SysDebug("vsnprintf: p = '%s'", p);\r