update for HEAD-2003021201

[reactos.git] / lib / msvcrt / stdio / vfprintf.c

diff --git a/lib/msvcrt/stdio/vfprintf.c b/lib/msvcrt/stdio/vfprintf.c
index c24cceb..971c5f1 100644 (file)
--- a/lib/msvcrt/stdio/vfprintf.c
+++ b/lib/msvcrt/stdio/vfprintf.c
@@ -11,36 +11,34 @@ int _isinf(double x);
 
 
 
-int
-__vfprintf (FILE *fp, const char *fmt0, va_list args);
+int __vfprintf(FILE*, const char*, va_list);
 
-int
-vfprintf(FILE *f, const char *fmt, va_list ap)
+
+int vfprintf(FILE* f, const char* fmt, va_list ap)
 {
-  int len;
-  char localbuf[BUFSIZ];
+    int len;
+    char localbuf[BUFSIZ];
 
 #if 0
-  __fileno_lock(fileno(f));
+    __fileno_lock(fileno(f));
 #endif
-  if (f->_flag & _IONBF)
-  {
-    f->_flag &= ~_IONBF;
-    f->_ptr = f->_base = localbuf;
-    f->_bufsiz = BUFSIZ;
-    len = __vfprintf(f,fmt, ap);
-    (void)fflush(f);
-    f->_flag |= _IONBF;
-    f->_base = NULL;
-    f->_bufsiz = 0;
-    f->_cnt = 0;
-  }
-  else
-    len = __vfprintf(f,fmt, ap);
+    if (f->_flag & _IONBF) {
+        f->_flag &= ~_IONBF;
+        f->_ptr = f->_base = localbuf;
+        f->_bufsiz = BUFSIZ;
+        len = __vfprintf(f, fmt, ap);
+        (void)fflush(f);
+        f->_flag |= _IONBF;
+        f->_base = NULL;
+        f->_bufsiz = 0;
+        f->_cnt = 0;
+    } else {
+        len = __vfprintf(f,fmt, ap);
+    }
 #if 0
-  __fileno_unlock(fileno(f));
+    __fileno_unlock(fileno(f));
 #endif
-  return (ferror(f) ? EOF : len);
+    return (ferror(f) ? EOF : len);
 }
 
 
@@ -89,15 +87,15 @@ static int skip_atoi(const char **s)
 }
 
 
-static int do_div(long long *n,int base)
+static int do_div(LONGLONG *n,int base)
 {
-       int __res = ((unsigned long long) *n) % (unsigned) base;
-       *n = ((unsigned long long) *n) / (unsigned) base;
+       int __res = ((ULONGLONG) *n) % (unsigned) base;
+       *n = ((ULONGLONG) *n) / (unsigned) base;
        return __res;
 }
 
 
-static int number(FILE * f, long long num, int base, int size, int precision ,int type)
+static int number(FILE * f, LONGLONG num, int base, int size, int precision ,int type)
 {
        char c,sign,tmp[66];
        const char *digits="0123456789abcdefghijklmnopqrstuvwxyz";
@@ -688,7 +686,7 @@ static int stringw(FILE *f, const wchar_t* sw, int len, int field_width, int pre
 int __vfprintf(FILE *f, const char *fmt, va_list args)
 {
        int len;
-       unsigned long long num;
+       ULONGLONG num;
        int i, base;
        long double _ldouble;
        double _double;
@@ -1052,7 +1050,7 @@ int __vfprintf(FILE *f, const char *fmt, va_list args)
                }
 
                if (qualifier == 'I')
-                       num = va_arg(args, unsigned long long);
+                       num = va_arg(args, ULONGLONG);
                else if (qualifier == 'l')
                        num = va_arg(args, unsigned long);
                else if (qualifier == 'h') {