Cleanup of compiler warnings.

4 files changed, 9 insertions, 10 deletions

diff --git a/src/backend/optimizer/geqo/geqo_pool.c b/src/backend/optimizer/geqo/geqo_pool.c
index bd797045215..5d13b48b254 100644
--- a/src/backend/optimizer/geqo/geqo_pool.c
+++ b/src/backend/optimizer/geqo/geqo_pool.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_pool.c,v 1.6 1998/03/30 16:46:35 momjian Exp $
+ * $Id: geqo_pool.c,v 1.7 1998/04/06 02:38:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,7 +42,7 @@
 #include "optimizer/geqo_recombination.h"
 
 
-static int	compare(void *arg1, void *arg2);
+static int	compare(const void *arg1, const void *arg2);
 
 /*
  * alloc-pool--
@@ -136,7 +136,7 @@ sort_pool(Pool *pool)
  *	 don't change them!
  */
 static int
-compare(void *arg1, void *arg2)
+compare(const void *arg1, const void *arg2)
 {
 	Chromosome	chromo1 = *(Chromosome *) arg1;
 	Chromosome	chromo2 = *(Chromosome *) arg2;
diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c
index 6b7c472f1b9..a54e70ad2ed 100644
--- a/src/backend/regex/regcomp.c
+++ b/src/backend/regex/regcomp.c
@@ -256,7 +256,7 @@ int			cflags;
 #ifdef MB
 	p->next = wcp;
 #else
-	p->next = pattern; /* convenience; we do not modify it */
+	p->next = (pg_wchar *)pattern; /* convenience; we do not modify it */
 #endif
 	p->end = p->next + len;
 	p->error = 0;
diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c
index 9be7d8c64bf..ae648c0fc45 100644
--- a/src/backend/storage/page/bufpage.c
+++ b/src/backend/storage/page/bufpage.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.15 1998/03/30 16:47:18 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.16 1998/04/06 02:38:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -257,7 +257,7 @@ struct itemIdSortData
 };
 
 static int
-itemidcompare(void *itemidp1, void *itemidp2)
+itemidcompare(const void *itemidp1, const void *itemidp2)
 {
 	if (((struct itemIdSortData *) itemidp1)->itemiddata.lp_off ==
 		((struct itemIdSortData *) itemidp2)->itemiddata.lp_off)
diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c
index 321406f85bc..a97b74e748b 100644
--- a/src/interfaces/ecpg/preproc/ecpg.c
+++ b/src/interfaces/ecpg/preproc/ecpg.c
@@ -91,7 +91,7 @@ main(int argc, char *const argv[])
 		/* after the options there must not be anything but filenames */
 		for (fnr = optind; fnr < argc; fnr++)
 		{
-			char	   *output_filename, *ptr2ext;
+			char	*ptr2ext;
 
 			input_filename = mm_alloc(strlen(argv[fnr]) + 5);
 
@@ -113,7 +113,7 @@ main(int argc, char *const argv[])
 
 			if (out_option == 0)/* calculate the output name */
 			{
-				output_filename = strdup(input_filename);
+				char *output_filename = strdup(input_filename);
 				
 				ptr2ext = strrchr(output_filename, '.');
 				/* make extension = .c */
@@ -128,6 +128,7 @@ main(int argc, char *const argv[])
 					free(input_filename);
 					continue;
 				}
+				free(output_filename);
 			}
 
 			yyin = fopen(input_filename, "r");
@@ -149,8 +150,6 @@ main(int argc, char *const argv[])
 				if (out_option == 0)
 					fclose(yyout);
 			}
-
-			free(output_filename);
 			free(input_filename);
 		}
 	}