[project @ 2002-10-15 13:18:51 by simonmar]

[ghc-hetmet.git] / ghc / rts / RtsUtils.c

diff --git a/ghc/rts/RtsUtils.c b/ghc/rts/RtsUtils.c
index e077204..69a1450 100644 (file)
--- a/ghc/rts/RtsUtils.c
+++ b/ghc/rts/RtsUtils.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: RtsUtils.c,v 1.24 2002/02/14 16:55:07 sof Exp $
+ * $Id: RtsUtils.c,v 1.28 2002/10/05 22:31:04 panne Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -31,6 +31,8 @@
 #include <sys/time.h>
 #endif
 
+#include <stdlib.h>
+#include <string.h>
 #include <stdarg.h>
 
 /* variable-argument error function. */
@@ -49,6 +51,7 @@ void barf(char *s, ...)
   fprintf(stderr, "\n");
   fflush(stderr);
   stg_exit(EXIT_INTERNAL_ERROR);
+  va_end(ap);
 }
 
 void prog_belch(char *s, ...)
@@ -61,6 +64,7 @@ void prog_belch(char *s, ...)
   } 
   vfprintf(stderr, s, ap);
   fprintf(stderr, "\n");
+  va_end(ap);
 }
 
 void belch(char *s, ...)
@@ -70,6 +74,7 @@ void belch(char *s, ...)
   /* don't fflush(stdout); WORKAROUND bug in Linux glibc */
   vfprintf(stderr, s, ap);
   fprintf(stderr, "\n");
+  va_end(ap);
 }
 
 /* result-checking malloc wrappers. */
@@ -183,7 +188,7 @@ nat stg_strlen(char *s)
    ToDo: put this somewhere sensible.
    -------------------------------------------------------------------------  */
 
-I_ __GenSymCounter = 0;
+static I_ __GenSymCounter = 0;
 
 I_
 genSymZh(void)
@@ -295,21 +300,21 @@ char *
 ullong_format_string(ullong x, char *s, rtsBool with_commas)
 {
     if (x < (ullong)1000) 
-       sprintf(s, "%d", (nat)x);
+       sprintf(s, "%lu", (lnat)x);
     else if (x < (ullong)1000000)
-       sprintf(s, (with_commas) ? "%ld,%3.3ld" : "%ld%3.3ld",
-               (nat)((x)/(ullong)1000),
-               (nat)((x)%(ullong)1000));
+       sprintf(s, (with_commas) ? "%lu,%3.3lu" : "%lu%3.3lu",
+               (lnat)((x)/(ullong)1000),
+               (lnat)((x)%(ullong)1000));
     else if (x < (ullong)1000000000)
-       sprintf(s, (with_commas) ? "%ld,%3.3ld,%3.3ld" :  "%ld%3.3ld%3.3ld",
-               (nat)((x)/(ullong)1000000),
-               (nat)((x)/(ullong)1000%(ullong)1000),
-               (nat)((x)%(ullong)1000));
+       sprintf(s, (with_commas) ? "%lu,%3.3lu,%3.3lu" :  "%lu%3.3lu%3.3lu",
+               (lnat)((x)/(ullong)1000000),
+               (lnat)((x)/(ullong)1000%(ullong)1000),
+               (lnat)((x)%(ullong)1000));
     else
-       sprintf(s, (with_commas) ? "%ld,%3.3ld,%3.3ld,%3.3ld" : "%ld%3.3ld%3.3ld%3.3ld",
-               (nat)((x)/(ullong)1000000000),
-               (nat)((x)/(ullong)1000000%(ullong)1000),
-               (nat)((x)/(ullong)1000%(ullong)1000), 
-               (nat)((x)%(ullong)1000));
+       sprintf(s, (with_commas) ? "%lu,%3.3lu,%3.3lu,%3.3lu" : "%lu%3.3lu%3.3lu%3.3lu",
+               (lnat)((x)/(ullong)1000000000),
+               (lnat)((x)/(ullong)1000000%(ullong)1000),
+               (lnat)((x)/(ullong)1000%(ullong)1000), 
+               (lnat)((x)%(ullong)1000));
     return s;
 }