Get rid of compiler warnings.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5580

diff --git a/massif/hp2ps/HpFile.c b/massif/hp2ps/HpFile.c
index ae7d6cdf074c3b5bcf7975751e2176d05a93f29e..c19b6aae972fa0b8615b5d278ef4700bd8a455fb 100644 (file)
--- a/massif/hp2ps/HpFile.c
+++ b/massif/hp2ps/HpFile.c
@@ -446,8 +446,7 @@ IsIdChar(ch)
 static struct entry* hashtable[ N_HASH ];
 
 static intish
-Hash(s)
-  char *s;
+Hash(char* s)
 {
     int r;
  
@@ -466,7 +465,7 @@ Hash(s)
  */
  
 static struct chunk*
-MakeChunk()
+MakeChunk(void)
 {
     struct chunk* ch;
     struct datapoint* d;

diff --git a/massif/hp2ps/Main.c b/massif/hp2ps/Main.c
index 7dfffcde60bb2e31368b3ae7116ca975fe8c6d9f..d740f33aebbe4205952bf3cf0fac6104f5bc5473 100644 (file)
--- a/massif/hp2ps/Main.c
+++ b/massif/hp2ps/Main.c
@@ -66,9 +66,7 @@ intish nidents;
 floatish THRESHOLD_PERCENT = DEFAULT_THRESHOLD;
 int TWENTY = DEFAULT_TWENTY;
 
-int main(argc, argv)
-int argc;
-char* argv[];
+int main(int argc, char* argv[])
 {
 
     programname = copystring(Basename(argv[0]));

diff --git a/massif/hp2ps/Main.h b/massif/hp2ps/Main.h
index 5fa954eb4d449223b6dea7c99fab57d8a193c80d..c743f780859c01ef97624ab5b73700c4b9e41a86 100644 (file)
--- a/massif/hp2ps/Main.h
+++ b/massif/hp2ps/Main.h
@@ -7,11 +7,11 @@
 
 //#include "config.h"
 
-#ifdef __STDC__
+//#ifdef __STDC__
 #define PROTO(x)       x
-#else
-#define PROTO(x)       ()
-#endif
+//#else
+//#define PROTO(x)     ()
+//#endif
 
 /* our own ASSERT macro (for C) */
 #ifndef DEBUG

diff --git a/massif/hp2ps/Shade.c b/massif/hp2ps/Shade.c
index 0c1a3be09dec179b36546c5428b169059fe616b8..e828eba867b0000570bd4e7140df1c7b52a9a713 100644 (file)
--- a/massif/hp2ps/Shade.c
+++ b/massif/hp2ps/Shade.c
@@ -108,9 +108,7 @@ ThinkOfAShade()
 }
 
 static floatish
-extract_colour(shade,factor)
-  floatish shade;
-  intish factor;
+extract_colour(floatish shade, intish factor)
 {
     intish i,j;
 

diff --git a/massif/hp2ps/Utilities.c b/massif/hp2ps/Utilities.c
index 754cc8a01a965bac3e6180b126451af30d6ebf9f..f9915bb94f85d385790b4210b9459d93fb1fa555 100644 (file)
--- a/massif/hp2ps/Utilities.c
+++ b/massif/hp2ps/Utilities.c
@@ -4,14 +4,14 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 #include "Main.h"
 #include "Error.h"
+#include "Utilities.h"
 
-extern void* malloc();
 
 char*
-Basename(name)
-  char* name;
+Basename(char* name)
 {
     char* t;
 
@@ -101,7 +101,6 @@ xrealloc(p, n)
   size_t n;
 {
     void *r;
-    extern void *realloc();
 
     r = realloc(p, n);
     if (!r) {