commit 7c788ae737e72490c5686436499b93bf00024f56
author sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sun Jan 22 01:09:37 2006 +0000
committer sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sun Jan 22 01:09:37 2006 +0000
tree 0a5e604da097db00b76375d2d6d41ffc22096a74
parent e80ac0081dbc23a332f432a30d52cdccdd41fa38

Get rid of compiler warnings.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5580 a5019735-40e9-0310-863c-91ae7b9d1cf9

massif/hp2ps/HpFile.c

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

massif/hp2ps/Main.c

diff --git a/massif/hp2ps/Main.c b/massif/hp2ps/Main.c
index 7dfffcd..d740f33 100644
--- a/massif/hp2ps/Main.c
+++ b/massif/hp2ps/Main.c
@@ -66,9 +66,7 @@
 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]));

massif/hp2ps/Main.h

diff --git a/massif/hp2ps/Main.h b/massif/hp2ps/Main.h
index 5fa954e..c743f78 100644
--- 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

massif/hp2ps/Shade.c

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

massif/hp2ps/Utilities.c

diff --git a/massif/hp2ps/Utilities.c b/massif/hp2ps/Utilities.c
index 754cc8a..f9915bb 100644
--- 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 @@
   size_t n;
 {
     void *r;
-    extern void *realloc();
 
     r = realloc(p, n);
     if (!r) {