Cleanup of compiler warnings.

This commit is contained in:
Bruce Momjian 1998-04-06 02:38:26 +00:00
parent 6d708c6900
commit 645146260e
4 changed files with 9 additions and 10 deletions

View File

@ -5,7 +5,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * 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" #include "optimizer/geqo_recombination.h"
static int compare(void *arg1, void *arg2); static int compare(const void *arg1, const void *arg2);
/* /*
* alloc-pool-- * alloc-pool--
@ -136,7 +136,7 @@ sort_pool(Pool *pool)
* don't change them! * don't change them!
*/ */
static int static int
compare(void *arg1, void *arg2) compare(const void *arg1, const void *arg2)
{ {
Chromosome chromo1 = *(Chromosome *) arg1; Chromosome chromo1 = *(Chromosome *) arg1;
Chromosome chromo2 = *(Chromosome *) arg2; Chromosome chromo2 = *(Chromosome *) arg2;

View File

@ -256,7 +256,7 @@ int cflags;
#ifdef MB #ifdef MB
p->next = wcp; p->next = wcp;
#else #else
p->next = pattern; /* convenience; we do not modify it */ p->next = (pg_wchar *)pattern; /* convenience; we do not modify it */
#endif #endif
p->end = p->next + len; p->end = p->next + len;
p->error = 0; p->error = 0;

View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * 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 static int
itemidcompare(void *itemidp1, void *itemidp2) itemidcompare(const void *itemidp1, const void *itemidp2)
{ {
if (((struct itemIdSortData *) itemidp1)->itemiddata.lp_off == if (((struct itemIdSortData *) itemidp1)->itemiddata.lp_off ==
((struct itemIdSortData *) itemidp2)->itemiddata.lp_off) ((struct itemIdSortData *) itemidp2)->itemiddata.lp_off)

View File

@ -91,7 +91,7 @@ main(int argc, char *const argv[])
/* after the options there must not be anything but filenames */ /* after the options there must not be anything but filenames */
for (fnr = optind; fnr < argc; fnr++) for (fnr = optind; fnr < argc; fnr++)
{ {
char *output_filename, *ptr2ext; char *ptr2ext;
input_filename = mm_alloc(strlen(argv[fnr]) + 5); 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 */ if (out_option == 0)/* calculate the output name */
{ {
output_filename = strdup(input_filename); char *output_filename = strdup(input_filename);
ptr2ext = strrchr(output_filename, '.'); ptr2ext = strrchr(output_filename, '.');
/* make extension = .c */ /* make extension = .c */
@ -128,6 +128,7 @@ main(int argc, char *const argv[])
free(input_filename); free(input_filename);
continue; continue;
} }
free(output_filename);
} }
yyin = fopen(input_filename, "r"); yyin = fopen(input_filename, "r");
@ -149,8 +150,6 @@ main(int argc, char *const argv[])
if (out_option == 0) if (out_option == 0)
fclose(yyout); fclose(yyout);
} }
free(output_filename);
free(input_filename); free(input_filename);
} }
} }