3 files changed, 5 insertions, 12 deletions
diff --git a/src/backend/optimizer/geqo/geqo_eval.c b/src/backend/optimizer/geqo/geqo_eval.c
index ebbc7f65cd..7ec449f2e9 100644
--- a/src/backend/optimizer/geqo/geqo_eval.c
+++ b/src/backend/optimizer/geqo/geqo_eval.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_eval.c,v 1.11 1997/06/10 07:53:53 vadim Exp $
+ * $Id: geqo_eval.c,v 1.12 1997/08/12 22:53:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -55,14 +55,7 @@ static Rel *gimme_clauseless_join(Rel *outer_rel, Rel *inner_rel);
 static Rel *init_join_rel(Rel *outer_rel, Rel *inner_rel, JInfo *joininfo);
 static List *new_join_tlist(List *tlist, List *other_relids, int first_resdomno);
 static List *new_joininfo_list(List *joininfo_list, List *join_relids);
-static void add_superrels(Rel *rel, Rel *super_rel);
-static bool nonoverlap_rels(Rel *rel1, Rel *rel2);
-static bool nonoverlap_sets(List *s1, List *s2);
 static void geqo_joinrel_size(Rel *joinrel, Rel *outer_rel, Rel *inner_rel);
-
-static void geqo_add_new_joininfos(Query *root, List *joinrels, List *outerrels);
-static List *geqo_final_join_rels(List *join_rel_list);
-
 static Rel *geqo_nth(int stop, List *rels);
 
 /*    
diff --git a/src/backend/optimizer/geqo/geqo_params.c b/src/backend/optimizer/geqo/geqo_params.c
index 2e759996ee..3bb8257fca 100644
--- a/src/backend/optimizer/geqo/geqo_params.c
+++ b/src/backend/optimizer/geqo/geqo_params.c
@@ -5,7 +5,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
-* $Id: geqo_params.c,v 1.3 1997/07/24 20:12:15 momjian Exp $
+* $Id: geqo_params.c,v 1.4 1997/08/12 22:53:09 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -280,7 +280,7 @@ next_token(FILE *fp, char *buf, int bufsz)
     while (c == ' ' || c == '\t') c = getc(fp);
 
     /* Put back the char that was non-whitespace (putting back EOF is ok) */
-    (void) ungetc(c, fp);
+    ungetc(c, fp);
 
     /* If we ended with a newline, return that, otherwise return 0 */
     return (c == '\n' ? '\n' : 0);
diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c
index db836e9ab1..f5b70e43a0 100644
--- a/src/backend/optimizer/path/indxpath.c
+++ b/src/backend/optimizer/path/indxpath.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.7 1997/03/18 18:39:40 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.8 1997/08/12 22:53:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1020,7 +1020,7 @@ clause_pred_clause_test(Expr *predicate, Node *clause)
 			 BOOL_TYPEID, /* opresulttype */
 			 0,	/* opsize */
 			 NULL);	/* op_fcache */
-    (void) replace_opid(test_oper);
+    replace_opid(test_oper);
 
     test_expr = make_opclause(test_oper,
 			      copyObject(clause_const),