diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index f5338424c9037fa21c15592dde66f8757fe59fbf..15be274b001b678c5c4bd415ace60c44ec1d1c5d 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -706,7 +706,7 @@ gistSplit(Relation r,
item = (IndexTuple) PageGetItem(p, itemid);
if (i == *(v.spl_left)) {
- (void) gistPageAddItem(giststate, r, left, (Item) item,
+ gistPageAddItem(giststate, r, left, (Item) item,
IndexTupleSize(item),
leftoff, LP_USED, &tmpdentry, &newtup);
leftoff = OffsetNumberNext(leftoff);
@@ -718,7 +718,7 @@ gistSplit(Relation r,
pfree(newtup);
}
else {
- (void) gistPageAddItem(giststate, r, right, (Item) item,
+ gistPageAddItem(giststate, r, right, (Item) item,
IndexTupleSize(item),
rightoff, LP_USED, &tmpdentry, &newtup);
rightoff = OffsetNumberNext(rightoff);
@@ -736,7 +736,7 @@ gistSplit(Relation r,
/* now insert the new index tuple */
if (*(v.spl_left) != FirstOffsetNumber) {
- (void) gistPageAddItem(giststate, r, left, (Item) itup,
+ gistPageAddItem(giststate, r, left, (Item) itup,
IndexTupleSize(itup),
leftoff, LP_USED, &tmpdentry, &newtup);
leftoff = OffsetNumberNext(leftoff);
@@ -747,7 +747,7 @@ gistSplit(Relation r,
if (itup != newtup)
pfree(newtup);
} else {
- (void) gistPageAddItem(giststate, r, right, (Item) itup,
+ gistPageAddItem(giststate, r, right, (Item) itup,
IndexTupleSize(itup),
rightoff, LP_USED, &tmpdentry, &newtup);
rightoff = OffsetNumberNext(rightoff);
@@ -852,7 +852,7 @@ gistentryinserttwo(Relation r, GISTSTACK *stk, IndexTuple ltup,
pfree(res);
gistdoinsert(r, rtup, giststate);
} else {
- (void) gistPageAddItem(giststate, r, p, (Item)ltup,
+ gistPageAddItem(giststate, r, p, (Item)ltup,
IndexTupleSize(ltup), InvalidOffsetNumber,
LP_USED, &tmpentry, &newtup);
WriteBuffer(b);
@@ -863,7 +863,7 @@ gistentryinserttwo(Relation r, GISTSTACK *stk, IndexTuple ltup,
pfree(tmpentry.pred);
if (ltup != newtup)
pfree(newtup);
- (void)gistentryinsert(r, stk, rtup, giststate);
+ gistentryinsert(r, stk, rtup, giststate);
}
}
@@ -919,7 +919,7 @@ gistnewroot(GISTSTATE *giststate, Relation r, IndexTuple lt, IndexTuple rt)
b = ReadBuffer(r, GISTP_ROOT);
GISTInitBuffer(b, 0);
p = BufferGetPage(b);
- (void) gistPageAddItem(giststate, r, p, (Item) lt, IndexTupleSize(lt),
+ gistPageAddItem(giststate, r, p, (Item) lt, IndexTupleSize(lt),
FirstOffsetNumber,
LP_USED, &tmpentry, &newtup);
/* be tidy */
@@ -927,7 +927,7 @@ gistnewroot(GISTSTATE *giststate, Relation r, IndexTuple lt, IndexTuple rt)
pfree(tmpentry.pred);
if (lt != newtup)
pfree(newtup);
- (void) gistPageAddItem(giststate, r, p, (Item) rt, IndexTupleSize(rt),
+ gistPageAddItem(giststate, r, p, (Item) rt, IndexTupleSize(rt),
OffsetNumberNext(FirstOffsetNumber), LP_USED,
&tmpentry, &newtup);
/* be tidy */
@@ -1261,7 +1261,7 @@ char *text_range_out(TXTRANGE *r)
memcpy(upper, VARDATA(TRUPPER(r)), VARSIZE(TRUPPER(r)) - VARHDRSZ);
upper[VARSIZE(TRUPPER(r)) - VARHDRSZ] = '\0';
- (void) sprintf(result, "[%s,%s): %d", lower, upper, r->flag);
+ sprintf(result, "[%s,%s): %d", lower, upper, r->flag);
pfree(lower);
pfree(upper);
return(result);
@@ -1275,7 +1275,7 @@ int_range_out(INTRANGE *r)
if (r == NULL)
return(NULL);
result = (char *)palloc(80);
- (void) sprintf(result, "[%d,%d): %d",r->lower, r->upper, r->flag);
+ sprintf(result, "[%d,%d): %d",r->lower, r->upper, r->flag);
return(result);
}
diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c
index 88e6acf056f91f6bead6be17a985e325f6ec156d..f1233c68b2d43f46ff34853a89c5f9f811d71ce6 100644
--- a/src/backend/access/hash/hashinsert.c
+++ b/src/backend/access/hash/hashinsert.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.7 1996/11/05 09:40:18 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.8 1997/08/12 22:51:30 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -223,7 +223,7 @@ _hash_pgaddtup(Relation rel,
_hash_checkpage(page, LH_BUCKET_PAGE|LH_OVERFLOW_PAGE);
itup_off = OffsetNumberNext(PageGetMaxOffsetNumber(page));
- (void) PageAddItem(page, (Item) hitem, itemsize, itup_off, LP_USED);
+ PageAddItem(page, (Item) hitem, itemsize, itup_off, LP_USED);
/* write the buffer, but hold our lock */
_hash_wrtnorelbuf(rel, buf);
diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c
index 9f9bc42fbebad766e313bfade052ef7bd9986c55..d976c4818c840a61b2aad72aa56dffd7a7ff8cfc 100644
--- a/src/backend/access/hash/hashovfl.c
+++ b/src/backend/access/hash/hashovfl.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.8 1996/11/05 09:40:20 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.9 1997/08/12 22:51:34 momjian Exp $
*
* NOTES
* Overflow pages look like ordinary relation pages.
@@ -315,7 +315,7 @@ _hash_freeovflpage(Relation rel, Buffer ovflbuf)
nextblkno = ovflopaque->hasho_nextblkno;
prevblkno = ovflopaque->hasho_prevblkno;
bucket = ovflopaque->hasho_bucket;
- (void) memset(ovflpage, 0, BufferGetPageSize(ovflbuf));
+ memset(ovflpage, 0, BufferGetPageSize(ovflbuf));
_hash_wrtbuf(rel, ovflbuf);
/*
@@ -436,8 +436,8 @@ _hash_initbitmap(Relation rel,
/* set all of the bits above 'nbits' to 1 */
clearints = ((nbits - 1) >> INT_TO_BIT) + 1;
clearbytes = clearints << INT_TO_BYTE;
- (void) memset((char *) freep, 0, clearbytes);
- (void) memset(((char *) freep) + clearbytes, 0xFF,
+ memset((char *) freep, 0, clearbytes);
+ memset(((char *) freep) + clearbytes, 0xFF,
BMPGSZ_BYTE(metap) - clearbytes);
freep[clearints - 1] = ALL_SET << (nbits & INT_MASK);
@@ -566,7 +566,7 @@ _hash_squeezebucket(Relation rel,
* page.
*/
woffnum = OffsetNumberNext(PageGetMaxOffsetNumber(wpage));
- (void) PageAddItem(wpage, (Item) hitem, itemsz, woffnum, LP_USED);
+ PageAddItem(wpage, (Item) hitem, itemsz, woffnum, LP_USED);
/*
* delete the tuple from the "read" page.
diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c
index b1421f62b388625f832875c7f42d6ae90a461184..338b13ce513af8d14da88158e3681ef11c6566b1 100644
--- a/src/backend/access/hash/hashpage.c
+++ b/src/backend/access/hash/hashpage.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.7 1996/11/05 09:40:21 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.8 1997/08/12 22:51:37 momjian Exp $
*
* NOTES
* Postgres hash pages look like ordinary relation pages. The opaque
@@ -609,7 +609,7 @@ _hash_splitpage(Relation rel,
}
noffnum = OffsetNumberNext(PageGetMaxOffsetNumber(npage));
- (void) PageAddItem(npage, (Item) hitem, itemsz, noffnum, LP_USED);
+ PageAddItem(npage, (Item) hitem, itemsz, noffnum, LP_USED);
_hash_wrtnorelbuf(rel, nbuf);
/*
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 63157734cd7616ab80a41327606cd0921ac3f5c1..e49c1edb4bea9d0468a5fa6e3bb8d40894b35b39 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.12 1997/08/06 02:08:39 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.13 1997/08/12 22:51:40 momjian Exp $
*
*
* INTERFACE ROUTINES
@@ -548,7 +548,7 @@ heap_close(Relation relation)
IncrHeapAccessStat(local_close);
IncrHeapAccessStat(global_close);
- (void) RelationClose(relation);
+ RelationClose(relation);
}
diff --git a/src/backend/access/heap/stats.c b/src/backend/access/heap/stats.c
index 00dac5fabec273813751a99951d812c8a6eccf14..913b09e69135a81bcb8b1cd008533d492c2881e7 100644
--- a/src/backend/access/heap/stats.c
+++ b/src/backend/access/heap/stats.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.9 1996/11/10 02:58:11 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.10 1997/08/12 22:51:44 momjian Exp $
*
* NOTES
* initam should be moved someplace else.
@@ -116,7 +116,7 @@ InitHeapAccessStatistics()
* return to old memory context
* ----------------
*/
- (void) MemoryContextSwitchTo(oldContext);
+ MemoryContextSwitchTo(oldContext);
heap_access_stats = stats;
}
diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c
index 245ff4861a02a2e2f224fb42d060bb4195a34e4f..16f11ca07a4256a160139c5b8f5d589b8097fe85 100644
--- a/src/backend/access/index/indexam.c
+++ b/src/backend/access/index/indexam.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.10 1997/01/10 09:46:25 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.11 1997/08/12 22:51:48 momjian Exp $
*
* INTERFACE ROUTINES
* index_open - open an index relation by relationId
@@ -153,7 +153,7 @@ index_openr(char *relationName)
void
index_close(Relation relation)
{
- (void) RelationClose(relation);
+ RelationClose(relation);
}
/* ----------------
@@ -212,7 +212,7 @@ index_delete(Relation relation, ItemPointer indexItem)
RELATION_CHECKS;
GET_REL_PROCEDURE(delete,amdelete);
- (void) fmgr(procedure, relation, indexItem);
+ fmgr(procedure, relation, indexItem);
}
/* ----------------
@@ -251,7 +251,7 @@ index_rescan(IndexScanDesc scan, bool scanFromEnd, ScanKey key)
SCAN_CHECKS;
GET_SCAN_PROCEDURE(rescan,amrescan);
- (void) fmgr(procedure, scan, scanFromEnd, key);
+ fmgr(procedure, scan, scanFromEnd, key);
}
/* ----------------
@@ -266,7 +266,7 @@ index_endscan(IndexScanDesc scan)
SCAN_CHECKS;
GET_SCAN_PROCEDURE(endscan,amendscan);
- (void) fmgr(procedure, scan);
+ fmgr(procedure, scan);
RelationUnsetRIntentLock(scan->relation);
}
@@ -283,7 +283,7 @@ index_markpos(IndexScanDesc scan)
SCAN_CHECKS;
GET_SCAN_PROCEDURE(markpos,ammarkpos);
- (void) fmgr(procedure, scan);
+ fmgr(procedure, scan);
}
/* ----------------
@@ -298,7 +298,7 @@ index_restrpos(IndexScanDesc scan)
SCAN_CHECKS;
GET_SCAN_PROCEDURE(restrpos,amrestrpos);
- (void) fmgr(procedure, scan);
+ fmgr(procedure, scan);
}
/* ----------------
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
index a78acd0f04b28f470962c2560d91a29221465f32..a0999d5d6ff63db1194077ee7db1636d3a8c796c 100644
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.21 1997/06/10 07:28:50 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.22 1997/08/12 22:51:50 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -915,7 +915,7 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
/* if this is true, the key we just looked at is gone */
if (result > 0)
- (void) _bt_twostep(scan, &buf, ForwardScanDirection);
+ _bt_twostep(scan, &buf, ForwardScanDirection);
}
break;
@@ -931,7 +931,7 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
} while (result >= 0);
if (result < 0)
- (void) _bt_twostep(scan, &buf, BackwardScanDirection);
+ _bt_twostep(scan, &buf, BackwardScanDirection);
}
break;
@@ -966,7 +966,7 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
* No key on this page, but offnum from _bt_binsrch() greater
* maxoff - have to move right. - vadim 12/06/96
*/
- (void) _bt_twostep(scan, &buf, ForwardScanDirection);
+ _bt_twostep(scan, &buf, ForwardScanDirection);
}
}
else if (result < 0)
@@ -981,7 +981,7 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
} while (result < 0);
if (result > 0)
- (void) _bt_twostep(scan, &buf, ForwardScanDirection);
+ _bt_twostep(scan, &buf, ForwardScanDirection);
}
break;
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
index 4290326510b96b13763f36eda956b48dd0e2d27e..060bc996555f5b22377f4eca89e38ad24f9b05a0 100644
--- a/src/backend/access/nbtree/nbtsort.c
+++ b/src/backend/access/nbtree/nbtsort.c
@@ -5,7 +5,7 @@
*
*
* IDENTIFICATION
- * $Id: nbtsort.c,v 1.17 1997/06/06 03:11:46 vadim Exp $
+ * $Id: nbtsort.c,v 1.18 1997/08/12 22:51:52 momjian Exp $
*
* NOTES
*
@@ -364,7 +364,7 @@ _bt_tapereset(BTTapeBlock *tape)
static void
_bt_taperewind(BTTapeBlock *tape)
{
- (void) FileSeek(tape->bttb_fd, 0, SEEK_SET);
+ FileSeek(tape->bttb_fd, 0, SEEK_SET);
}
/*
@@ -511,7 +511,7 @@ _bt_tapenext(BTTapeBlock *tape, char **pos)
static void
_bt_tapeadd(BTTapeBlock *tape, BTItem item, int itemsz)
{
- (void) memcpy(tape->bttb_data + tape->bttb_top, item, itemsz);
+ memcpy(tape->bttb_data + tape->bttb_top, item, itemsz);
++tape->bttb_ntup;
tape->bttb_top += DOUBLEALIGN(itemsz);
}
@@ -535,7 +535,7 @@ _bt_spoolinit(Relation index, int ntapes, bool isunique)
if (btspool == (BTSpool *) NULL || fname == (char *) NULL) {
elog(WARN, "_bt_spoolinit: out of memory");
}
- (void) memset((char *) btspool, 0, sizeof(BTSpool));
+ memset((char *) btspool, 0, sizeof(BTSpool));
btspool->bts_ntapes = ntapes;
btspool->bts_tape = 0;
btspool->isunique = isunique;
@@ -811,7 +811,7 @@ _bt_pagestate(Relation index, int flags, int level, bool doupper)
{
BTPageState *state = (BTPageState *) palloc(sizeof(BTPageState));
- (void) memset((char *) state, 0, sizeof(BTPageState));
+ memset((char *) state, 0, sizeof(BTPageState));
_bt_blnewpage(index, &(state->btps_buf), &(state->btps_page), flags);
state->btps_firstoff = InvalidOffsetNumber;
state->btps_lastoff = P_HIKEY;
@@ -1005,7 +1005,7 @@ _bt_buildadd(Relation index, void *pstate, BTItem bti, int flags)
_bt_pagestate(index, 0, state->btps_level + 1, true);
}
nbti = _bt_minitem(opage, BufferGetBlockNumber(obuf), 0);
- (void) _bt_buildadd(index, state->btps_next, nbti, 0);
+ _bt_buildadd(index, state->btps_next, nbti, 0);
pfree((void *) nbti);
}
@@ -1081,7 +1081,7 @@ _bt_uppershutdown(Relation index, BTPageState *state)
_bt_metaproot(index, blkno, s->btps_level + 1);
} else {
bti = _bt_minitem(s->btps_page, blkno, 0);
- (void) _bt_buildadd(index, s->btps_next, bti, 0);
+ _bt_buildadd(index, s->btps_next, bti, 0);
pfree((void *) bti);
}
}
@@ -1158,7 +1158,7 @@ _bt_merge(Relation index, BTSpool *btspool)
* _bt_taperead will return 0 only if the tape is actually
* at EOF.
*/
- (void) memset((char *) &q, 0, sizeof(BTPriQueue));
+ memset((char *) &q, 0, sizeof(BTPriQueue));
goodtapes = 0;
for (t = 0; t < btspool->bts_ntapes; ++t) {
itape = btspool->bts_itape[t];
@@ -1207,7 +1207,7 @@ _bt_merge(Relation index, BTSpool *btspool)
btisz = BTITEMSZ(bti);
btisz = DOUBLEALIGN(btisz);
if (doleaf) {
- (void) _bt_buildadd(index, state, bti, BTP_LEAF);
+ _bt_buildadd(index, state, bti, BTP_LEAF);
#if defined(FASTBUILD_DEBUG) && defined(FASTBUILD_MERGE)
{
bool isnull;
@@ -1361,7 +1361,7 @@ _bt_upperbuild(Relation index)
d, state->btps_level);
}
#endif /* FASTBUILD_DEBUG && FASTBUILD_MERGE */
- (void) _bt_buildadd(index, state, nbti, 0);
+ _bt_buildadd(index, state, nbti, 0);
pfree((void *) nbti);
}
blk = ropaque->btpo_next;
diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c
index b2a50860e827ac93f63f13ea5e38096e60ed42d4..4cd0580c97331a0b58a018f365c19c3660fa815b 100644
--- a/src/backend/access/rtree/rtree.c
+++ b/src/backend/access/rtree/rtree.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.12 1997/03/14 23:17:46 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.13 1997/08/12 22:51:54 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -501,12 +501,12 @@ dosplit(Relation r,
item = (IndexTuple) PageGetItem(p, itemid);
if (i == *(v.spl_left)) {
- (void) PageAddItem(left, (Item) item, IndexTupleSize(item),
+ PageAddItem(left, (Item) item, IndexTupleSize(item),
leftoff, LP_USED);
leftoff = OffsetNumberNext(leftoff);
v.spl_left++; /* advance in left split vector */
} else {
- (void) PageAddItem(right, (Item) item, IndexTupleSize(item),
+ PageAddItem(right, (Item) item, IndexTupleSize(item),
rightoff, LP_USED);
rightoff = OffsetNumberNext(rightoff);
v.spl_right++; /* advance in right split vector */
@@ -518,12 +518,12 @@ dosplit(Relation r,
/* now insert the new index tuple */
if (*(v.spl_left) != FirstOffsetNumber) {
- (void) PageAddItem(left, (Item) itup, IndexTupleSize(itup),
+ PageAddItem(left, (Item) itup, IndexTupleSize(itup),
leftoff, LP_USED);
leftoff = OffsetNumberNext(leftoff);
ItemPointerSet(&(res->pointerData), lbknum, leftoff);
} else {
- (void) PageAddItem(right, (Item) itup, IndexTupleSize(itup),
+ PageAddItem(right, (Item) itup, IndexTupleSize(itup),
rightoff, LP_USED);
rightoff = OffsetNumberNext(rightoff);
ItemPointerSet(&(res->pointerData), rbknum, rightoff);
@@ -617,7 +617,7 @@ rtintinsert(Relation r,
WriteBuffer(b); /* don't forget to release buffer! - 01/31/94 */
pfree(res);
} else {
- (void) PageAddItem(p, (Item) rtup, IndexTupleSize(rtup),
+ PageAddItem(p, (Item) rtup, IndexTupleSize(rtup),
PageGetMaxOffsetNumber(p), LP_USED);
WriteBuffer(b);
ldatum = (((char *) ltup) + sizeof(IndexTupleData));
@@ -640,9 +640,9 @@ rtnewroot(Relation r, IndexTuple lt, IndexTuple rt)
b = ReadBuffer(r, P_ROOT);
RTInitBuffer(b, 0);
p = BufferGetPage(b);
- (void) PageAddItem(p, (Item) lt, IndexTupleSize(lt),
+ PageAddItem(p, (Item) lt, IndexTupleSize(lt),
FirstOffsetNumber, LP_USED);
- (void) PageAddItem(p, (Item) rt, IndexTupleSize(rt),
+ PageAddItem(p, (Item) rt, IndexTupleSize(rt),
OffsetNumberNext(FirstOffsetNumber), LP_USED);
WriteBuffer(b);
}
diff --git a/src/backend/access/transam/transsup.c b/src/backend/access/transam/transsup.c
index 5f9b4c0a66c08fbbb8e8520ea41433b753f06e52..4eed0b87888a3850bea70572cc7b21cf04250528 100644
--- a/src/backend/access/transam/transsup.c
+++ b/src/backend/access/transam/transsup.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.7 1996/12/14 05:20:39 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.8 1997/08/12 22:51:57 momjian Exp $
*
* NOTES
* This file contains support functions for the high
@@ -641,7 +641,7 @@ TransGetLastRecordedTransaction(Relation relation,
baseXid = blockNumber * TP_NumXidStatusPerBlock;
/* XXX ???? xid won't get returned! - AY '94 */
- (void) TransBlockGetLastTransactionIdStatus(block, baseXid, &xid);
+ TransBlockGetLastTransactionIdStatus(block, baseXid, &xid);
ReleaseBuffer(buffer);
diff --git a/src/backend/access/transam/varsup.c b/src/backend/access/transam/varsup.c
index 42dfa4a5e6699195991cc07db40837c028e1b98c..2bf74210d4a683b354b45120b874e494c79de748 100644
--- a/src/backend/access/transam/varsup.c
+++ b/src/backend/access/transam/varsup.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.7 1997/01/16 07:59:11 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.8 1997/08/12 22:51:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -159,7 +159,7 @@ VariableRelationPutNextXid(TransactionId xid)
flushmode = SetBufferWriteMode (BUFFER_FLUSH_WRITE);
WriteBuffer(buf);
- (void) SetBufferWriteMode (flushmode);
+ SetBufferWriteMode (flushmode);
}
/* --------------------------------
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index a983e23ba924c0d7711e225616fd0950622124a5..227c793a37e95e3b2b8d5c7ea7fbc55f8b96b272 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.10 1997/04/02 03:38:02 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.11 1997/08/12 22:52:01 momjian Exp $
*
* NOTES
* Transaction aborts can now occur two ways:
@@ -506,7 +506,7 @@ AtStart_Memory()
* tell system to allocate in the blank portal context
* ----------------
*/
- (void) MemoryContextSwitchTo(portalContext);
+ MemoryContextSwitchTo(portalContext);
StartPortalAllocMode(DefaultAllocMode, 0);
}
@@ -612,7 +612,7 @@ AtCommit_Memory()
* ----------------
*/
EndPortalAllocMode();
- (void) MemoryContextSwitchTo(TopMemoryContext);
+ MemoryContextSwitchTo(TopMemoryContext);
}
/* ----------------------------------------------------------------
@@ -691,7 +691,7 @@ AtAbort_Memory()
* portal memory context (until the next transaction).
* ----------------
*/
- (void) MemoryContextSwitchTo(TopMemoryContext);
+ MemoryContextSwitchTo(TopMemoryContext);
}
/* ----------------------------------------------------------------
diff --git a/src/backend/access/transam/xid.c b/src/backend/access/transam/xid.c
index 4c508b3899db613861b1bbc0cffb3726f4f93681..db3dd1b8c36c59a8439533ec52ae3993db378055 100644
--- a/src/backend/access/transam/xid.c
+++ b/src/backend/access/transam/xid.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.5 1996/11/10 02:59:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.6 1997/08/12 22:52:02 momjian Exp $
*
* OLD COMMENTS
* XXX WARNING
@@ -59,7 +59,7 @@ xidout(TransactionId transactionId)
/* maximum 32 bit unsigned integer representation takes 10 chars */
representation = palloc(11);
- (void)sprintf(representation, "%u", transactionId);
+ sprintf(representation, "%u", transactionId);
return (representation);
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index 054c7e1f5980efb7cb9f2325d8f3d53d13f9b24a..4d8cfbd740603b111c451608b5f83f192f6a8387 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -7,7 +7,7 @@
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.18 1997/06/25 21:12:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.19 1997/08/12 22:52:04 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1082,7 +1082,7 @@ index_register(char *heap,
ILHead = newind;
- (void) MemoryContextSwitchTo(oldcxt);
+ MemoryContextSwitchTo(oldcxt);
}
void
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index 81d2e1127cfb23400d8320fc6b8f982d275f6818..61c38d0dd99cd0de0aeef1d3ca4207dd1fbc23f6 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.14 1997/06/04 08:59:22 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.15 1997/08/12 22:52:07 momjian Exp $
*
* INTERFACE ROUTINES
* heap_creatr() - Create an uncataloged heap relation
@@ -1312,7 +1312,7 @@ heap_destroy(char *relname)
*/
if ( !(rdesc->rd_istemp) || !(rdesc->rd_tmpunlinked) )
{
- (void) smgrunlink(rdesc->rd_rel->relsmgr, rdesc);
+ smgrunlink(rdesc->rd_rel->relsmgr, rdesc);
}
rdesc->rd_tmpunlinked = TRUE;
@@ -1336,7 +1336,7 @@ heap_destroyr(Relation rdesc)
ReleaseRelationBuffers(rdesc);
if ( !(rdesc->rd_istemp) || !(rdesc->rd_tmpunlinked) )
{
- (void) smgrunlink(rdesc->rd_rel->relsmgr, rdesc);
+ smgrunlink(rdesc->rd_rel->relsmgr, rdesc);
}
rdesc->rd_tmpunlinked = TRUE;
heap_close(rdesc);
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 13f74ae1997d9fc9faf5e2fcd015c32880196bd4..89497ee6eb596e519ae1d3ebde095f4b39b7cd68 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.15 1997/04/05 03:36:21 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.16 1997/08/12 22:52:09 momjian Exp $
*
*
* INTERFACE ROUTINES
@@ -654,8 +654,8 @@ AppendAttributeTuples(Relation indexRelation, int numatts)
* initialize null[], replace[] and value[]
* ----------------
*/
- (void) memset(nullv, ' ', Natts_pg_attribute);
- (void) memset(replace, ' ', Natts_pg_attribute);
+ memset(nullv, ' ', Natts_pg_attribute);
+ memset(replace, ' ', Natts_pg_attribute);
/* ----------------
* create the first attribute tuple.
@@ -935,7 +935,7 @@ UpdateIndexPredicate(Oid indexoid, Node *oldPred, Node *predicate)
newtup = heap_modifytuple(tuple, buffer, pg_index, values, nulls, replace);
- (void) heap_replace(pg_index, &(newtup->t_ctid), newtup);
+ heap_replace(pg_index, &(newtup->t_ctid), newtup);
heap_close(pg_index);
pfree(predText);
@@ -1429,7 +1429,7 @@ UpdateStats(Oid relid, long reltuples, bool hasindex)
newtup = heap_modifytuple(htup, buffer, pg_class, values,
nulls, replace);
- (void) heap_replace(pg_class, &(newtup->t_ctid), newtup);
+ heap_replace(pg_class, &(newtup->t_ctid), newtup);
CatalogOpenIndices(Num_pg_class_indices, Name_pg_class_indices, idescs);
CatalogIndexInsert(idescs, Num_pg_class_indices, pg_class, newtup);
CatalogCloseIndices(Num_pg_class_indices, idescs);
@@ -1682,7 +1682,7 @@ index_build(Relation heapRelation,
* ----------------
*/
if (RegProcedureIsValid(procedure))
- (void) fmgr(procedure,
+ fmgr(procedure,
heapRelation,
indexRelation,
numberOfAttributes,
diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c
index 6a59690ce7c655773d05110a6ca1fbcf348b3d4a..10b6145138f29211f79cfc579c6fe5e937429229 100644
--- a/src/backend/catalog/pg_operator.c
+++ b/src/backend/catalog/pg_operator.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.9 1997/07/23 17:14:34 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.10 1997/08/12 22:52:11 momjian Exp $
*
* NOTES
* these routines moved here from commands/define.c and somewhat cleaned up.
@@ -682,7 +682,7 @@ OperatorDef(char *operatorName,
ItemPointerCopy(&tup->t_ctid, &itemPointerData);
setheapoverride(true);
- (void) heap_replace(pg_operator_desc, &itemPointerData, tup);
+ heap_replace(pg_operator_desc, &itemPointerData, tup);
setheapoverride(false);
} else
elog(WARN, "OperatorDef: no operator %d", other_oid);
@@ -798,7 +798,7 @@ OperatorUpd(Oid baseId, Oid commId, Oid negId)
ItemPointerCopy(&tup->t_ctid, &itemPointerData);
setheapoverride(true);
- (void) heap_replace(pg_operator_desc, &itemPointerData, tup);
+ heap_replace(pg_operator_desc, &itemPointerData, tup);
setheapoverride(false);
}
@@ -828,7 +828,7 @@ OperatorUpd(Oid baseId, Oid commId, Oid negId)
ItemPointerCopy(&tup->t_ctid, &itemPointerData);
setheapoverride(true);
- (void) heap_replace(pg_operator_desc, &itemPointerData, tup);
+ heap_replace(pg_operator_desc, &itemPointerData, tup);
setheapoverride(false);
values[ Anum_pg_operator_oprcom - 1 ] = (Datum)NULL;
@@ -864,7 +864,7 @@ OperatorUpd(Oid baseId, Oid commId, Oid negId)
ItemPointerCopy(&tup->t_ctid, &itemPointerData);
setheapoverride(true);
- (void) heap_replace(pg_operator_desc, &itemPointerData, tup);
+ heap_replace(pg_operator_desc, &itemPointerData, tup);
setheapoverride(false);
}
diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index 19d026c1406c9a1a1730b280ae5924923ddea689..3d61533aff066291f0c8f74068aec844c0f8f6e9 100644
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.5 1996/11/30 18:06:06 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.6 1997/08/12 22:52:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -477,7 +477,7 @@ TypeCreate(char *typeName,
ItemPointerCopy(&tup->t_ctid, &itemPointerData);
setheapoverride(true);
- (void) heap_replace(pg_type_desc, &itemPointerData, tup);
+ heap_replace(pg_type_desc, &itemPointerData, tup);
setheapoverride(false);
typeObjectId = tup->t_oid;
diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index 7d24261c644fc2cacdd7b108b4438fd54ab65a1f..45a225fafb6dacec1554da6daa3fda44140dc01f 100644
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.15 1997/08/12 20:15:08 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.16 1997/08/12 22:52:15 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -210,7 +210,7 @@ Async_Notify(char *relname)
tdesc, &isnull);
if (!DatumGetInt32(d)) {
rTuple = heap_modifytuple(lTuple, b, lRel, value, nulls, repl);
- (void) heap_replace(lRel, &lTuple->t_ctid, rTuple);
+ heap_replace(lRel, &lTuple->t_ctid, rTuple);
}
ReleaseBuffer(b);
}
@@ -575,7 +575,7 @@ Async_NotifyFrontEnd()
d = (Datum) heap_getattr(lTuple, b, Anum_pg_listener_relname,
tdesc, &isnull);
rTuple = heap_modifytuple(lTuple, b, lRel, value, nulls, repl);
- (void) heap_replace(lRel, &lTuple->t_ctid, rTuple);
+ heap_replace(lRel, &lTuple->t_ctid, rTuple);
/* notifying the front end */
diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c
index 5864d45b53b94adc7bdc461b9526b07b69042554..526adbdda716c799d8d4c3aa58d08e3d84adfa57 100644
--- a/src/backend/commands/command.c
+++ b/src/backend/commands/command.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.7 1997/01/02 06:18:25 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.8 1997/08/12 22:52:18 momjian Exp $
*
* NOTES
* The PortalExecutorHeapMemory crap needs to be eliminated
@@ -82,7 +82,7 @@ PortalCleanup(Portal portal)
* switch back to previous context
* ----------------
*/
- (void) MemoryContextSwitchTo(context);
+ MemoryContextSwitchTo(context);
PortalExecutorHeapMemory = (MemoryContext) NULL;
}
@@ -174,7 +174,7 @@ PerformPortalFetch(char *name,
* do what is possible across transaction boundries.
* ----------------
*/
- (void) MemoryContextSwitchTo(
+ MemoryContextSwitchTo(
(MemoryContext)PortalGetHeapMemory(GetPortalByName(NULL)));
}
@@ -469,7 +469,7 @@ PerformAddAttribute(char *relationName,
((Form_pg_class) GETSTRUCT(reltup))->relnatts = maxatts;
oldTID = reltup->t_ctid;
- (void) heap_replace(relrdesc, &oldTID, reltup);
+ heap_replace(relrdesc, &oldTID, reltup);
/* keep catalog indices current */
CatalogOpenIndices(Num_pg_class_indices, Name_pg_class_indices, ridescs);
diff --git a/src/backend/commands/creatinh.c b/src/backend/commands/creatinh.c
index 0934e4197a5711d3d01eb91dbaedd1fb6ed65537..3f27ade8885ff543dbe9518d2b7fafc1f898fa80 100644
--- a/src/backend/commands/creatinh.c
+++ b/src/backend/commands/creatinh.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.9 1997/08/12 20:15:10 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.10 1997/08/12 22:52:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -390,7 +390,7 @@ StoreCatalogInheritance(Oid relationId, List *supers)
tuple = heap_formtuple(desc,datum, nullarr);
- (void) heap_insert(relation, tuple);
+ heap_insert(relation, tuple);
pfree(tuple);
seqNumber += 1;
@@ -498,7 +498,7 @@ StoreCatalogInheritance(Oid relationId, List *supers)
tuple = heap_formtuple( desc, datum, nullarr);
- (void) heap_insert(relation, tuple);
+ heap_insert(relation, tuple);
pfree(tuple);
seqNumber += 1;
diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c
index 4f49b1586dda26f4f5117734221c537fc7ce4591..800d85a48b8ad7c2dd39703f074ffc52ace3a256 100644
--- a/src/backend/commands/define.c
+++ b/src/backend/commands/define.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.12 1997/08/03 02:35:01 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.13 1997/08/12 22:52:23 momjian Exp $
*
* DESCRIPTION
* The "DefineFoo" routines take the parse tree and pick out the
@@ -537,7 +537,7 @@ DefineType(char *typeName, List *parameters)
* now have TypeCreate do all the real work.
* ----------------
*/
- (void) TypeCreate(typeName, /* type name */
+ TypeCreate(typeName, /* type name */
InvalidOid, /* relation oid (n/a here) */
internalLength, /* internal size */
externalLength, /* external size */
@@ -559,7 +559,7 @@ DefineType(char *typeName, List *parameters)
*/
shadow_type = makeArrayTypeName(typeName);
- (void) TypeCreate(shadow_type, /* type name */
+ TypeCreate(shadow_type, /* type name */
InvalidOid, /* relation oid (n/a here) */
-1, /* internal size */
-1, /* external size */
diff --git a/src/backend/commands/purge.c b/src/backend/commands/purge.c
index d55f6ddb74596dce39835006b94640c5208345cc..5c514fc867585fd358fd8556d3ce351df9b16e7c 100644
--- a/src/backend/commands/purge.c
+++ b/src/backend/commands/purge.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/Attic/purge.c,v 1.5 1997/07/29 16:19:26 thomas Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/purge.c,v 1.6 1997/08/12 22:52:25 momjian Exp $
*
* Note:
* XXX There are many instances of int32 instead of ...Time. These
@@ -149,7 +149,7 @@ RelationPurge(char *relationName,
nulls, replace);
/* XXX How do you detect an insertion error?? */
- (void) heap_replace(relation, &newTuple->t_ctid, newTuple);
+ heap_replace(relation, &newTuple->t_ctid, newTuple);
/* keep the system catalog indices current */
CatalogOpenIndices(Num_pg_class_indices, Name_pg_class_indices, idescs);
diff --git a/src/backend/commands/rename.c b/src/backend/commands/rename.c
index c1016a91c917e07efb606cfb53d6546daaf3d4ac..56672659113201fcd5e81c83d92ec1510ba74ab9 100644
--- a/src/backend/commands/rename.c
+++ b/src/backend/commands/rename.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.5 1997/08/12 20:15:12 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.6 1997/08/12 22:52:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -170,7 +170,7 @@ renameatt(char *relname,
oldTID = oldatttup->t_ctid;
/* insert "fixed" tuple */
- (void) heap_replace(attrdesc, &oldTID, oldatttup);
+ heap_replace(attrdesc, &oldTID, oldatttup);
/* keep system catalog indices current */
CatalogOpenIndices(Num_pg_attr_indices, Name_pg_attr_indices, idescs);
@@ -246,7 +246,7 @@ renamerel(char oldrelname[], char newrelname[])
oldTID = oldreltup->t_ctid;
/* insert fixed rel tuple */
- (void) heap_replace(relrdesc, &oldTID, oldreltup);
+ heap_replace(relrdesc, &oldTID, oldreltup);
/* keep the system catalog indices current */
CatalogOpenIndices(Num_pg_class_indices, Name_pg_class_indices, idescs);
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index e74c5bc7aab2f10db5fe1fba5fc87b988aa9079d..1b95e9c80264d03f7515468b73415e94f5f5ccf4 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.37 1997/07/28 00:53:40 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.38 1997/08/12 22:52:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -146,7 +146,7 @@ vacuum(char *vacrel, bool verbose, bool analyze, List *va_spec)
strcpy (dest, col);
va_cols = lappend (va_cols, dest);
}
- (void) MemoryContextSwitchTo(old);
+ MemoryContextSwitchTo(old);
/* initialize vacuum cleaner */
vc_init();
@@ -222,7 +222,7 @@ void
vc_abort()
{
/* on abort, remove the vacuum cleaner lock file */
- (void) unlink("pg_vlock");
+ unlink("pg_vlock");
VacuumRunning = false;
}
@@ -354,7 +354,7 @@ vc_getrels(NameData *VacRelP)
cur->vrl_next = (VRelList) palloc(sizeof(VRelListData));
cur = cur->vrl_next;
}
- (void) MemoryContextSwitchTo(old);
+ MemoryContextSwitchTo(old);
cur->vrl_relid = pgctup->t_oid;
cur->vrl_next = (VRelList) NULL;
@@ -1991,7 +1991,7 @@ vc_free(VRelList vrl)
pfree(p_vrl);
}
- (void) MemoryContextSwitchTo(old);
+ MemoryContextSwitchTo(old);
}
/*
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index fd4f5fe68408c778344657ff878f3218dafb135b..7c93fe2af66313d077685a4d96b2a402ff693287 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -26,7 +26,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.13 1997/05/31 16:52:00 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.14 1997/08/12 22:52:33 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -963,7 +963,7 @@ ExecDelete(TupleTableSlot *slot,
* delete the tuple
* ----------------
*/
- (void) heap_delete(resultRelationDesc, /* relation desc */
+ heap_delete(resultRelationDesc, /* relation desc */
tupleid); /* item pointer to tuple */
IncrDeleted();
diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c
index d9094c6b65e5248954a1b70a005b9d65119ac308..19feea39e203d7e10569dcce3f6777432297e3c5 100644
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.5 1997/01/22 05:26:37 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.6 1997/08/12 22:52:35 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -294,7 +294,7 @@ postquel_execute(execution_state *es,
if (es->status == F_EXEC_START)
{
- (void) postquel_start(es);
+ postquel_start(es);
es->status = F_EXEC_RUN;
}
#ifndef INDEXSCAN_PATCH
diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c
index 65d8482cad7d4a05813f1c489cf12516124208bb..3f81b1b89a962995c1e5ba4ed1ac0f0823a93b4a 100644
--- a/src/backend/executor/nodeMergejoin.c
+++ b/src/backend/executor/nodeMergejoin.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.6 1997/08/06 03:41:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.7 1997/08/12 22:52:38 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -82,6 +82,7 @@
#include "executor/nodeMergejoin.h"
#include "executor/execdebug.h"
#include "utils/lsyscache.h"
+#include "utils/psort.h"
/* ----------------------------------------------------------------
* MarkInnerTuple and RestoreInnerTuple macros
diff --git a/src/backend/lib/hasht.c b/src/backend/lib/hasht.c
index fdfd2e373517b23241210f13cf5c4d384e618feb..baceabfcf7ab1628c1dff37a2cbfbd882b2c1aeb 100644
--- a/src/backend/lib/hasht.c
+++ b/src/backend/lib/hasht.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/lib/Attic/hasht.c,v 1.3 1996/11/06 08:27:13 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/lib/Attic/hasht.c,v 1.4 1997/08/12 22:52:42 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -33,7 +33,7 @@ HashTableWalk(HTAB *hashtable, HashtFunc function, int arg)
int keysize;
keysize = hashtable->hctl->keysize;
- (void)hash_seq((HTAB *)NULL);
+ hash_seq((HTAB *)NULL);
while ((hashent = hash_seq(hashtable)) != (long *) TRUE) {
if (hashent == NULL)
elog(FATAL, "error in HashTableWalk.");
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index f325fa0a06ab58f17188fe59a9dadcab7bfd7cb7..b1c747b4e4548792f2f4972ba55659454436ca0e 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.12 1997/08/12 20:15:17 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.13 1997/08/12 22:52:45 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -174,7 +174,7 @@ pg_krb4_recvauth(int sock,
key_sched,
version);
if (status != KSUCCESS) {
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"pg_krb4_recvauth: kerberos error: %s\n",
krb_err_txt[status]);
fputs(PQerrormsg, stderr);
@@ -182,7 +182,7 @@ pg_krb4_recvauth(int sock,
return(STATUS_ERROR);
}
if (strncmp(version, PG_KRB4_VERSION, KRB_SENDAUTH_VLEN)) {
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"pg_krb4_recvauth: protocol version != \"%s\"\n",
PG_KRB4_VERSION);
fputs(PQerrormsg, stderr);
@@ -191,7 +191,7 @@ pg_krb4_recvauth(int sock,
}
if (username && *username &&
strncmp(username, auth_data.pname, NAMEDATALEN)) {
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"pg_krb4_recvauth: name \"%s\" != \"%s\"\n",
username,
auth_data.pname);
@@ -211,7 +211,7 @@ pg_krb4_recvauth(int sock,
struct sockaddr_in *raddr,
char *username)
{
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"pg_krb4_recvauth: Kerberos not implemented on this "
"server.\n");
fputs(PQerrormsg, stderr);
@@ -309,7 +309,7 @@ pg_krb5_recvauth(int sock,
if (hostp = strchr(hostp, '.'))
*hostp = '\0';
if (code = krb5_parse_name(servbuf, &server)) {
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"pg_krb5_recvauth: Kerberos error %d in krb5_parse_name\n",
code);
com_err("pg_krb5_recvauth", code, "in krb5_parse_name");
@@ -341,7 +341,7 @@ pg_krb5_recvauth(int sock,
&client,
(krb5_ticket **) NULL,
(krb5_authenticator **) NULL)) {
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"pg_krb5_recvauth: Kerberos error %d in krb5_recvauth\n",
code);
com_err("pg_krb5_recvauth", code, "in krb5_recvauth");
@@ -356,7 +356,7 @@ pg_krb5_recvauth(int sock,
* postmaster startup packet.
*/
if ((code = krb5_unparse_name(client, &kusername))) {
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"pg_krb5_recvauth: Kerberos error %d in krb5_unparse_name\n",
code);
com_err("pg_krb5_recvauth", code, "in krb5_unparse_name");
@@ -365,7 +365,7 @@ pg_krb5_recvauth(int sock,
}
krb5_free_principal(client);
if (!kusername) {
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"pg_krb5_recvauth: could not decode username\n");
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
@@ -373,7 +373,7 @@ pg_krb5_recvauth(int sock,
}
kusername = pg_an_to_ln(kusername);
if (username && strncmp(username, kusername, NAMEDATALEN)) {
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"pg_krb5_recvauth: name \"%s\" != \"%s\"\n",
username, kusername);
fputs(PQerrormsg, stderr);
@@ -395,7 +395,7 @@ pg_krb5_recvauth(int sock,
struct sockaddr_in *raddr,
char *username)
{
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"pg_krb5_recvauth: Kerberos not implemented on this "
"server.\n");
fputs(PQerrormsg, stderr);
@@ -448,14 +448,14 @@ be_recvauth(MsgType msgtype_arg, Port *port, char *username, StartupInfo* sp)
if (!username) {
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"be_recvauth: no user name passed\n");
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
return(STATUS_ERROR);
}
if (!port) {
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"be_recvauth: no port structure passed\n");
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
@@ -465,7 +465,7 @@ be_recvauth(MsgType msgtype_arg, Port *port, char *username, StartupInfo* sp)
switch (msgtype) {
case STARTUP_KRB4_MSG:
if (!be_getauthsvc(msgtype)) {
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"be_recvauth: krb4 authentication disallowed\n");
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
@@ -473,7 +473,7 @@ be_recvauth(MsgType msgtype_arg, Port *port, char *username, StartupInfo* sp)
}
if (pg_krb4_recvauth(port->sock, &port->laddr, &port->raddr,
username) != STATUS_OK) {
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"be_recvauth: krb4 authentication failed\n");
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
@@ -482,7 +482,7 @@ be_recvauth(MsgType msgtype_arg, Port *port, char *username, StartupInfo* sp)
break;
case STARTUP_KRB5_MSG:
if (!be_getauthsvc(msgtype)) {
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"be_recvauth: krb5 authentication disallowed\n");
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
@@ -490,7 +490,7 @@ be_recvauth(MsgType msgtype_arg, Port *port, char *username, StartupInfo* sp)
}
if (pg_krb5_recvauth(port->sock, &port->laddr, &port->raddr,
username) != STATUS_OK) {
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"be_recvauth: krb5 authentication failed\n");
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
@@ -499,7 +499,7 @@ be_recvauth(MsgType msgtype_arg, Port *port, char *username, StartupInfo* sp)
break;
case STARTUP_UNAUTH_MSG:
if (!be_getauthsvc(msgtype)) {
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"be_recvauth: "
"unauthenticated connections disallowed\n");
fputs(PQerrormsg, stderr);
@@ -509,7 +509,7 @@ be_recvauth(MsgType msgtype_arg, Port *port, char *username, StartupInfo* sp)
break;
case STARTUP_HBA_MSG:
if (hba_recvauth(port, sp->database, sp->user, DataDir) != STATUS_OK) {
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"be_recvauth: host-based authentication failed\n");
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
@@ -532,7 +532,7 @@ be_recvauth(MsgType msgtype_arg, Port *port, char *username, StartupInfo* sp)
}
break;
default:
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"be_recvauth: unrecognized message type: %d\n",
msgtype);
fputs(PQerrormsg, stderr);
@@ -577,7 +577,7 @@ be_setauthsvc(char *name)
break;
}
if (i == n_authsvcs) {
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"be_setauthsvc: invalid name %s, ignoring...\n",
name);
fputs(PQerrormsg, stderr);
diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c
index c1b36b889489b0662c9e0de3871918d79446a80f..58a827838db574639bfeedb9d4255eed44d27bd2 100644
--- a/src/backend/libpq/be-fsstubs.c
+++ b/src/backend/libpq/be-fsstubs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.11 1997/08/12 20:15:18 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.12 1997/08/12 22:52:48 momjian Exp $
*
* NOTES
* This should be moved to a more appropriate place. It is here
@@ -290,8 +290,8 @@ lo_import(text *filename)
}
}
- (void) close(fd);
- (void) inv_close(lobj);
+ close(fd);
+ inv_close(lobj);
return lobjOid;
}
@@ -326,7 +326,7 @@ lo_export(Oid lobjId, text *filename)
oumask = umask((mode_t) 0);
strNcpy(fnamebuf, VARDATA(filename), VARSIZE(filename) - VARHDRSZ);
fd = open(fnamebuf, O_CREAT|O_WRONLY, 0666);
- (void) umask(oumask);
+ umask(oumask);
if (fd < 0) { /* error */
elog(WARN, "lo_export: can't open unix file\"%s\"",
fnamebuf);
@@ -343,8 +343,8 @@ lo_export(Oid lobjId, text *filename)
}
}
- (void) inv_close(lobj);
- (void) close(fd);
+ inv_close(lobj);
+ close(fd);
return 1;
}
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 22d532bf537f230fcf69826700e272065a60122a..fd1da79c11f8fabfdab208b27fa23fdea9eaacfc 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.16 1997/03/12 21:17:53 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.17 1997/08/12 22:52:52 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -64,7 +64,7 @@ next_token(FILE *fp, char *buf, const int bufsz) {
c = getc(fp);
/* Put back the char right after the token (putting back EOF is ok) */
}
- (void) ungetc(c, fp);
+ ungetc(c, fp);
}
*buf = '\0';
}
diff --git a/src/backend/libpq/portal.c b/src/backend/libpq/portal.c
index 2ddeab1a701a9d5f59a3b74613fdcd983d183a7b..301773be9f546e2df959d79cba525101d9b41583 100644
--- a/src/backend/libpq/portal.c
+++ b/src/backend/libpq/portal.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.5 1997/08/12 20:15:22 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.6 1997/08/12 22:52:55 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -74,7 +74,7 @@ static int
in_range(char *msg, int value, int min, int max)
{
if (value < min || value >= max) {
- (void) sprintf(PQerrormsg, "FATAL: %s, %d is not in range [%d,%d)\n",
+ sprintf(PQerrormsg, "FATAL: %s, %d is not in range [%d,%d)\n",
msg, value, min, max);
pqdebug("%s", PQerrormsg);
fputs(PQerrormsg, stderr);
@@ -87,7 +87,7 @@ static int
valid_pointer(char *msg, void *ptr)
{
if (!ptr) {
- (void) sprintf(PQerrormsg, "FATAL: %s\n", msg);
+ sprintf(PQerrormsg, "FATAL: %s\n", msg);
pqdebug("%s", PQerrormsg);
fputs(PQerrormsg, stderr);
return(0);
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index 78767a4a1c42363ee67b879182fd50dbc4eef47b..cfa0aebc521e9072e861a4b9b5a40e545ed15790 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.18 1997/08/12 20:15:24 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.19 1997/08/12 22:52:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -243,7 +243,7 @@ int
PQputline(char *s)
{
if (Pfout) {
- (void) fputs(s, Pfout);
+ fputs(s, Pfout);
fflush(Pfout);
}
return(0);
@@ -314,7 +314,7 @@ pq_getint(int b)
if(status)
{
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"FATAL: pq_getint failed: errno=%d\n", errno);
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
@@ -333,7 +333,7 @@ pq_putstr(char *s)
{
if(pqPutString(s, Pfout))
{
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"FATAL: pq_putstr: fputs() failed: errno=%d\n", errno);
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
@@ -349,7 +349,7 @@ pq_putnchar(char *s, int n)
{
if(pqPutNBytes(s, n, Pfout))
{
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"FATAL: pq_putnchar: fputc() failed: errno=%d\n",
errno);
fputs(PQerrormsg, stderr);
@@ -389,7 +389,7 @@ pq_putint(int i, int b)
if(status)
{
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"FATAL: pq_putint failed: errno=%d\n", errno);
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
@@ -444,7 +444,7 @@ pq_getinaddr(struct sockaddr_in *sin,
return(1);
}
if (hs->h_addrtype != AF_INET) {
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"FATAL: pq_getinaddr: %s not on Internet\n",
host);
fputs(PQerrormsg, stderr);
@@ -473,7 +473,7 @@ pq_getinserv(struct sockaddr_in *sin, char *host, char *serv)
if (*serv >= '0' && *serv <= '9')
return(pq_getinaddr(sin, host, atoi(serv)));
if (!(ss = getservbyname(serv, NULL))) {
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"FATAL: pq_getinserv: unknown service: %s\n",
serv);
fputs(PQerrormsg, stderr);
@@ -498,7 +498,7 @@ pq_regoob(void (*fptr)())
#else
fcntl(fd, F_SETOWN, getpid());
#endif /* hpux */
- (void) pqsignal(SIGURG,fptr);
+ pqsignal(SIGURG,fptr);
}
void
@@ -559,7 +559,7 @@ StreamServerPort(char *hostName, short portName, int *fdP)
memset((char *)&sin, 0, sizeof sin);
if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"FATAL: StreamServerPort: socket() failed: errno=%d\n",
errno);
fputs(PQerrormsg, stderr);
@@ -569,7 +569,7 @@ StreamServerPort(char *hostName, short portName, int *fdP)
if((setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&one,
sizeof(one))) == -1) {
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"FATAL: StreamServerPort: setsockopt (SO_REUSEADDR) failed: errno=%d\n",
errno);
fputs(PQerrormsg, stderr);
@@ -581,7 +581,7 @@ StreamServerPort(char *hostName, short portName, int *fdP)
sin.sin_port = htons(portName);
if (bind(fd, (struct sockaddr *)&sin, sizeof sin) < 0) {
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"FATAL: StreamServerPort: bind() failed: errno=%d\n",
errno);
pqdebug("%s", PQerrormsg);
@@ -597,8 +597,8 @@ StreamServerPort(char *hostName, short portName, int *fdP)
* listening port non-blocking. That is not necessary (and
* may tickle kernel bugs).
- (void) fcntl(fd, F_SETFD, 1);
- (void) fcntl(fd, F_SETFL, FNDELAY);
+ fcntl(fd, F_SETFD, 1);
+ fcntl(fd, F_SETFL, FNDELAY);
*/
*fdP = fd;
@@ -666,7 +666,7 @@ StreamConnection(int server_fd, Port *port)
void
StreamClose(int sock)
{
- (void) close(sock);
+ close(sock);
}
/* ---------------------------
@@ -692,7 +692,7 @@ StreamOpen(char *hostName, short portName, Port *port)
/* set up the server (remote) address */
if (!(hp = gethostbyname(hostName)) || hp->h_addrtype != AF_INET) {
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"FATAL: StreamOpen: unknown hostname: %s\n",
hostName);
fputs(PQerrormsg, stderr);
@@ -708,7 +708,7 @@ StreamOpen(char *hostName, short portName, Port *port)
/* connect to the server */
if ((port->sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"FATAL: StreamOpen: socket() failed: errno=%d\n",
errno);
fputs(PQerrormsg, stderr);
@@ -717,7 +717,7 @@ StreamOpen(char *hostName, short portName, Port *port)
}
if (connect(port->sock, (struct sockaddr *)&port->raddr,
sizeof(port->raddr)) < 0) {
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"FATAL: StreamOpen: connect() failed: errno=%d\n",
errno);
fputs(PQerrormsg, stderr);
@@ -728,7 +728,7 @@ StreamOpen(char *hostName, short portName, Port *port)
/* fill in the client address */
if (getsockname(port->sock, (struct sockaddr *) &port->laddr,
&laddrlen) < 0) {
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"FATAL: StreamOpen: getsockname() failed: errno=%d\n",
errno);
fputs(PQerrormsg, stderr);
diff --git a/src/backend/libpq/pqpacket.c b/src/backend/libpq/pqpacket.c
index 5190ec5d8844c461920f947365c47137f355dc9a..6f67ddc5f5ba91ec59f564bb3b9f66368d00b89e 100644
--- a/src/backend/libpq/pqpacket.c
+++ b/src/backend/libpq/pqpacket.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.4 1997/02/14 04:15:31 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.5 1997/08/12 22:53:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -214,7 +214,7 @@ PacketSend(Port *port,
(struct sockaddr *)&(port->raddr), addrLen);
if (len < totalLen) {
- (void) sprintf(PQerrormsg,
+ sprintf(PQerrormsg,
"FATAL: PacketSend: couldn't send complete packet: errno=%d\n",
errno);
fputs(PQerrormsg, stderr);
diff --git a/src/backend/nodes/read.c b/src/backend/nodes/read.c
index d2fa81cac356595f5a1f47956e9441267738366c..7e89f9d74d3a659278f078deff4eb164caf2858d 100644
--- a/src/backend/nodes/read.c
+++ b/src/backend/nodes/read.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/read.c,v 1.2 1996/11/08 05:56:48 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/read.c,v 1.3 1997/08/12 22:53:04 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -33,7 +33,7 @@ stringToNode(char *str)
{
void *retval;
- (void) lsptok(str, NULL); /* set the string used in lsptok */
+ lsptok(str, NULL); /* set the string used in lsptok */
retval = nodeRead(true); /* start reading */
return retval;
diff --git a/src/backend/optimizer/geqo/geqo_eval.c b/src/backend/optimizer/geqo/geqo_eval.c
index ebbc7f65cd88adc5c782f52bc44619e7bf11196f..7ec449f2e94902bb8648000146d4ada8231589ea 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 2e759996eea844244ab761883307ecc37194b9db..3bb8257fca858de5ef6695f235fba88ff2ea96e5 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 db836e9ab17221cb3df80744f2fb724ebcce768e..f5b70e43a0f863d8a21307bb4dc087761e33cd0b 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),
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 78e08ceeb12ecc34499458aa7738d09e60dcbf64..23136e6d0a2a1326f018ed084022d9aef557b6a5 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.31 1997/08/12 20:15:31 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.32 1997/08/12 22:53:17 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1018,7 +1018,7 @@ makeTargetNames(ParseState *pstate, List *cols)
else
foreach(tl, cols)
/* elog on failure */
- (void)varattno(pstate->p_target_relation,((Ident *)lfirst(tl))->name);
+ varattno(pstate->p_target_relation,((Ident *)lfirst(tl))->name);
return cols;
}
diff --git a/src/backend/port/BSD44_derived/dl.c b/src/backend/port/BSD44_derived/dl.c
index 30f1737ed48aeac8ceb86e7c7b9f046970b7ab58..0a6525c8ac8e5e9c1916a80d731898f33fafc918 100644
--- a/src/backend/port/BSD44_derived/dl.c
+++ b/src/backend/port/BSD44_derived/dl.c
@@ -61,13 +61,13 @@ void *
BSD44_derived_dlopen(const char *file, int num)
{
#ifdef __mips__
- (void) sprintf(error_message, "dlopen (%s) not supported", file);
+ sprintf(error_message, "dlopen (%s) not supported", file);
return NULL;
#else
void *vp;
if ((vp = dlopen((char *) file, num)) == (void *) NULL) {
- (void) sprintf(error_message, "dlopen (%s) failed", file);
+ sprintf(error_message, "dlopen (%s) failed", file);
}
return(vp);
#endif
@@ -77,18 +77,18 @@ void *
BSD44_derived_dlsym(void *handle, const char *name)
{
#ifdef __mips__
- (void) sprintf(error_message, "dlsym (%s) failed", name);
+ sprintf(error_message, "dlsym (%s) failed", name);
return NULL;
#else
void *vp;
char buf[BUFSIZ];
if (*name != '_') {
- (void) sprintf(buf, "_%s", name);
+ sprintf(buf, "_%s", name);
name = buf;
}
if ((vp = dlsym(handle, (char *) name)) == (void *) NULL) {
- (void) sprintf(error_message, "dlsym (%s) failed", name);
+ sprintf(error_message, "dlsym (%s) failed", name);
}
return(vp);
#endif
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index ddbf196160abf7a63a0b84f3e5b3c6566deebbdf..aed02bbdf9a07f70102ec5941e37cb0c1151f601 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.50 1997/08/12 20:15:42 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.51 1997/08/12 22:53:31 momjian Exp $
*
* NOTES
*
@@ -237,7 +237,7 @@ PostmasterMain(int argc, char *argv[])
IsPostmaster = true;
/* for security, no dir or file created can be group or other accessible */
- (void) umask((mode_t) 0077);
+ umask((mode_t) 0077);
if (!(hostName = getenv("PGHOST"))) {
if (gethostname(hostbuf, MAXHOSTNAMELEN) < 0)
@@ -408,10 +408,10 @@ pmdaemonize(void)
}
#endif
i = open(NULL_DEV, O_RDWR);
- (void) dup2(i, 0);
- (void) dup2(i, 1);
- (void) dup2(i, 2);
- (void) close(i);
+ dup2(i, 0);
+ dup2(i, 1);
+ dup2(i, 2);
+ close(i);
}
static void
@@ -899,7 +899,7 @@ CleanupProc(int pid,
(sig == SIGUSR1)
? "SIGUSR1" : "SIGSTOP",
bp->pid);
- (void) kill(bp->pid, sig);
+ kill(bp->pid, sig);
}
ProcRemove(bp->pid);
@@ -1101,7 +1101,7 @@ DoExec(StartupInfo *packet, int portFd)
*/
if (DebugLvl > 1) {
- (void) sprintf(debugbuf, "-d%d", DebugLvl);
+ sprintf(debugbuf, "-d%d", DebugLvl);
av[ac++] = debugbuf;
}
else
@@ -1120,7 +1120,7 @@ DoExec(StartupInfo *packet, int portFd)
av[ac++] = mbbuf;
}
/* Tell the backend the descriptor of the fe/be socket */
- (void) sprintf(portbuf, "-P%d", portFd);
+ sprintf(portbuf, "-P%d", portFd);
av[ac++] = portbuf;
strNcpy(argbuf, packet->options, ARGV_SIZE);
diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c
index af6bede84bc6dfad50615bf040072586a8ec879a..364573e2b5bf6ac9b834e1593a88b5f7f8f0b0c9 100644
--- a/src/backend/regex/regcomp.c
+++ b/src/backend/regex/regcomp.c
@@ -236,7 +236,7 @@ int cflags;
g->nsub = 0;
g->ncategories = 1; /* category 0 is "everything else" */
g->categories = &g->catspace[-(CHAR_MIN)];
- (void) memset((char *)g->catspace, 0, NC*sizeof(cat_t));
+ memset((char *)g->catspace, 0, NC*sizeof(cat_t));
g->backrefs = 0;
/* do it */
@@ -596,7 +596,7 @@ int starordinary; /* is a leading * an ordinary character? */
assert(p->pbegin[i] != 0);
assert(OP(p->strip[p->pbegin[i]]) == OLPAREN);
assert(OP(p->strip[p->pend[i]]) == ORPAREN);
- (void) dupl(p, p->pbegin[i]+1, p->pend[i]);
+ dupl(p, p->pbegin[i]+1, p->pend[i]);
EMIT(O_BACK, i);
} else
SETERROR(REG_ESUBREG);
@@ -1115,7 +1115,7 @@ register struct parse *p;
p->g->sets[i].ptr = p->g->setbits + css*(i/CHAR_BIT);
}
if (p->g->sets != NULL && p->g->setbits != NULL)
- (void) memset((char *)p->g->setbits + (nbytes - css),
+ memset((char *)p->g->setbits + (nbytes - css),
0, css);
else {
no = 0;
@@ -1273,7 +1273,7 @@ register char *cp;
register size_t len = strlen(fp);
assert(fp != NULL);
- (void) memmove(fp, fp + len + 1,
+ memmove(fp, fp + len + 1,
cs->smultis - (fp + len + 1 - cs->multis));
cs->smultis -= len;
@@ -1440,7 +1440,7 @@ sopno finish; /* to this less one */
return(ret);
enlarge(p, p->ssize + len); /* this many unexpected additions */
assert(p->ssize >= p->slen + len);
- (void) memcpy((char *)(p->strip + p->slen),
+ memcpy((char *)(p->strip + p->slen),
(char *)(p->strip + start), (size_t)len*sizeof(sop));
p->slen += len;
return(ret);
diff --git a/src/backend/regex/regerror.c b/src/backend/regex/regerror.c
index 536f70ceb8d60be6589d370c0207b352b681c0d8..7d1d06cbc90ca49d3db3e5c07c153741254d67ff 100644
--- a/src/backend/regex/regerror.c
+++ b/src/backend/regex/regerror.c
@@ -135,7 +135,7 @@ size_t errbuf_size;
if (errcode®_ITOA) {
if (r->code != 0)
- (void) strcpy(convbuf, r->name);
+ strcpy(convbuf, r->name);
else
sprintf(convbuf, "REG_0x%x", target);
assert(strlen(convbuf) < sizeof(convbuf));
@@ -147,9 +147,9 @@ size_t errbuf_size;
len = strlen(s) + 1;
if (errbuf_size > 0) {
if (errbuf_size > len)
- (void) strcpy(errbuf, s);
+ strcpy(errbuf, s);
else {
- (void) strncpy(errbuf, s, errbuf_size-1);
+ strncpy(errbuf, s, errbuf_size-1);
errbuf[errbuf_size-1] = '\0';
}
}
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c
index e4a5299221758fbe96aa4caf47eb361d249875a9..093451655d051577bae145d82024c4ecd4718246 100644
--- a/src/backend/rewrite/rewriteHandler.c
+++ b/src/backend/rewrite/rewriteHandler.c
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.2 1996/11/24 05:58:57 bryanh Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.3 1997/08/12 22:53:41 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -395,7 +395,7 @@ fireRules(Query *parsetree,
/* choose rule to fire from list of rules */
if (locks == NIL) {
- (void) ProcessRetrieveQuery(parsetree,
+ ProcessRetrieveQuery(parsetree,
parsetree->rtable,
instead_flag, TRUE);
if (*instead_flag)
@@ -473,7 +473,7 @@ fireRules(Query *parsetree,
*--------------------------------------------------
*/
info->rule_action->rtable = info->rt;
- (void) ProcessRetrieveQuery(info->rule_action, info->rt,
+ ProcessRetrieveQuery(info->rule_action, info->rt,
&orig_instead_flag, TRUE);
/*--------------------------------------------------
diff --git a/src/backend/rewrite/rewriteSupport.c b/src/backend/rewrite/rewriteSupport.c
index 09e9b4bf181a9fc7762b2c84bf7283e75b6966ae..54a8f0c7f97c04c462c3216332f7f51c02814464 100644
--- a/src/backend/rewrite/rewriteSupport.c
+++ b/src/backend/rewrite/rewriteSupport.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.5 1996/12/26 17:49:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.6 1997/08/12 22:53:43 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -147,7 +147,7 @@ setRelhasrulesInRelation(Oid relationId, bool relhasrules)
relp = (Form_pg_class) GETSTRUCT(newTuple);
relp->relhasrules = relhasrules;
- (void) heap_replace(relationRelation, &(tuple->t_ctid), newTuple);
+ heap_replace(relationRelation, &(tuple->t_ctid), newTuple);
/* keep the catalog indices up to date */
CatalogOpenIndices(Num_pg_class_indices, Name_pg_class_indices, idescs);
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index 3210486e59a050dbf0ec5c909bbb4690c29faa91..ce9f5f48ed7d4bed83ea9c5f4f6a1bcac98d4465 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.15 1997/07/28 00:54:43 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.16 1997/08/12 22:53:46 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -248,7 +248,7 @@ ReadBufferWithBufferLock(Relation reln,
if (extend) {
/* new buffers are zero-filled */
memset((char *) MAKE_PTR(bufHdr->data), 0, BLCKSZ);
- (void) smgrextend(bufHdr->bufsmgr, reln,
+ smgrextend(bufHdr->bufsmgr, reln,
(char *) MAKE_PTR(bufHdr->data));
}
return (BufferDescriptorGetBuffer(bufHdr));
@@ -261,7 +261,7 @@ ReadBufferWithBufferLock(Relation reln,
*/
if (extend) {
/* new buffers are zero-filled */
- (void) memset((char *) MAKE_PTR(bufHdr->data), 0, BLCKSZ);
+ memset((char *) MAKE_PTR(bufHdr->data), 0, BLCKSZ);
status = smgrextend(bufHdr->bufsmgr, reln,
(char *) MAKE_PTR(bufHdr->data));
} else {
@@ -1728,7 +1728,7 @@ _bm_die(Oid dbId, Oid relId, int blkNo, int bufNo,
break;
}
- (void) fclose(fp);
+ fclose(fp);
kill(getpid(), SIGILL);
}
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 420606e6892c36c49d15e7ccac65f1c101224680..ad70a865373167b229ac0f4babb4806273a97c80 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -6,7 +6,7 @@
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Id: fd.c,v 1.19 1997/07/28 00:54:52 momjian Exp $
+ * $Id: fd.c,v 1.20 1997/08/12 22:53:51 momjian Exp $
*
* NOTES:
*
@@ -765,8 +765,8 @@ FileTruncate(File file, int offset)
DO_DB(elog(DEBUG, "FileTruncate %d (%s)",
file, VfdCache[file].fileName));
- (void) FileSync(file);
- (void) FileAccess(file);
+ FileSync(file);
+ FileAccess(file);
returnCode = ftruncate(VfdCache[file].fd, offset);
return(returnCode);
}
diff --git a/src/backend/storage/ipc/s_lock.c b/src/backend/storage/ipc/s_lock.c
index de9b8689f09d61a0ab1368d67bb0aacf3e814a99..476bdea69014aa0401cb3cdabe0622d5af21215b 100644
--- a/src/backend/storage/ipc/s_lock.c
+++ b/src/backend/storage/ipc/s_lock.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.15 1997/07/29 14:07:48 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.16 1997/08/12 22:53:55 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -100,13 +100,13 @@ S_LOCK(slock_t *lock)
void
S_UNLOCK(slock_t *lock)
{
- (void)release_lock(lock);
+ release_lock(lock);
}
void
S_INIT_LOCK(slock_t *lock)
{
- (void)init_lock(lock);
+ init_lock(lock);
}
/* S_LOCK_FREE should return 1 if lock is free; 0 if lock is locked */
@@ -138,13 +138,13 @@ S_LOCK(slock_t *lock)
void
S_UNLOCK(slock_t *lock)
{
- (void) msem_unlock(lock, 0);
+ msem_unlock(lock, 0);
}
void
S_INIT_LOCK(slock_t *lock)
{
- (void) msem_init(lock, MSEM_UNLOCKED);
+ msem_init(lock, MSEM_UNLOCKED);
}
int
diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c
index c7c606a493864c4e2168761597591cf6723af24b..c839059ea9b2af98a88d9b22d7f669430245382d 100644
--- a/src/backend/storage/ipc/shmem.c
+++ b/src/backend/storage/ipc/shmem.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.9 1997/06/06 22:04:04 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.10 1997/08/12 22:53:56 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -544,7 +544,7 @@ ShmemInitStruct(char *name, unsigned long size, bool *foundPtr)
if (! structPtr) {
/* out of memory */
Assert (BindingTable);
- (void) hash_search(BindingTable,(char *) &item,HASH_REMOVE, foundPtr);
+ hash_search(BindingTable,(char *) &item,HASH_REMOVE, foundPtr);
SpinRelease(BindingLock);
*foundPtr = FALSE;
@@ -578,7 +578,7 @@ TransactionIdIsInProgress (TransactionId xid)
SpinAcquire(BindingLock);
- (void) hash_seq ((HTAB *)NULL);
+ hash_seq ((HTAB *)NULL);
while ( (result = (BindingEnt *) hash_seq (BindingTable)) != NULL )
{
if ( result == (BindingEnt *) TRUE )
diff --git a/src/backend/storage/ipc/sinval.c b/src/backend/storage/ipc/sinval.c
index e5aef6dd99be4eeecb1d84ce99bd5adf37d0e853..5f391669113cfd7754502819e7b2db5a93321a69 100644
--- a/src/backend/storage/ipc/sinval.c
+++ b/src/backend/storage/ipc/sinval.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.6 1997/01/08 08:32:04 bryanh Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.7 1997/08/12 22:53:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -143,7 +143,7 @@ RegisterSharedInvalid(int cacheId, /* XXX */
}
/* write again */
- (void) SISetDataEntry(shmInvalBuffer, &newInvalid);
+ SISetDataEntry(shmInvalBuffer, &newInvalid);
}
SpinRelease(SInvalLock);
}
diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c
index d1443e04c706e59311ba7e3ba464c00378dbaf4e..9400e872617f3a6b4e2740028d39602275a189a3 100644
--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.4 1997/07/24 20:14:15 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.5 1997/08/12 22:54:01 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -667,8 +667,8 @@ SISegInit(SISeg *segP)
SISetStartFreeSpace(segP, 0);
SISetStartEntryChain(segP, InvalidOffset);
SISetEndEntryChain(segP, InvalidOffset);
- (void) SISetNumEntries(segP, 0);
- (void) SISetMaxNumEntries(segP, MAXNUMMESSAGES);
+ SISetNumEntries(segP, 0);
+ SISetMaxNumEntries(segP, MAXNUMMESSAGES);
for (i = 0; i < MaxBackendId; i++) {
segP->procState[i].limit = -1; /* no backend active !!*/
segP->procState[i].resetState = false;
diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index fa84d43db6f1ed5066b8d0a27ca4c7f33dd03cd9..d8503038a74691966c0394da56828a219394c314 100644
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.11 1997/07/28 00:55:08 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.12 1997/08/12 22:54:04 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -127,11 +127,11 @@ inv_create(int flags)
/* this is pretty painful... want a tuple descriptor */
tupdesc = CreateTemplateTupleDesc(2);
- (void) TupleDescInitEntry(tupdesc, (AttrNumber) 1,
+ TupleDescInitEntry(tupdesc, (AttrNumber) 1,
"olastbye",
"int4",
0, false);
- (void) TupleDescInitEntry(tupdesc, (AttrNumber) 2,
+ TupleDescInitEntry(tupdesc, (AttrNumber) 2,
"odata",
"bytea",
0, false);
@@ -140,7 +140,7 @@ inv_create(int flags)
* will be located on whatever storage manager the user requested.
*/
- (void) heap_create(objname,
+ heap_create(objname,
objname,
(int) archchar, smgr,
tupdesc);
@@ -1147,7 +1147,7 @@ _inv_getsize(Relation hreln, TupleDesc hdesc, Relation ireln)
*/
if (buf != InvalidBuffer)
- (void) ReleaseBuffer(buf);
+ ReleaseBuffer(buf);
htup = heap_fetch(hreln, NowTimeQual, &(res->heap_iptr), &buf);
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index 562df6c938fe5eeac2c9d4ab3808629b310e624c..fc56f8c04acf32753bf3a983161f1d70efb6ef58 100644
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.9 1997/03/15 01:23:58 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.10 1997/08/12 22:54:07 momjian Exp $
*
* NOTES
* Outside modules can create a lock table and acquire/release
@@ -256,7 +256,7 @@ LockTabInit(char *tabName,
if (! ltable)
{
elog(NOTICE,"LockTabInit: couldn't malloc lock table %s\n",tabName);
- (void) pfree (shmemName);
+ pfree (shmemName);
return(INVALID_TABLEID);
}
@@ -349,7 +349,7 @@ LockTabInit(char *tabName,
SpinRelease(LockMgrLock);
- (void) pfree (shmemName);
+ pfree (shmemName);
if (status)
return(ltable->ctl->tableId);
@@ -1057,7 +1057,7 @@ LockRelease(LockTableId tableId, LOCKTAG *lockName, LOCKT lockt)
* himself.
* --------------------------
*/
- (void) ProcLockWakeup(&(lock->waitProcs), (char *) ltable, (char *) lock);
+ ProcLockWakeup(&(lock->waitProcs), (char *) ltable, (char *) lock);
}
SpinRelease(masterLock);
@@ -1286,7 +1286,7 @@ LockReleaseAll(LockTableId tableId, SHM_QUEUE *lockQueue)
* --------------------
*/
waitQueue = &(lock->waitProcs);
- (void) ProcLockWakeup(waitQueue, (char *) ltable, (char *) lock);
+ ProcLockWakeup(waitQueue, (char *) ltable, (char *) lock);
}
#ifdef USER_LOCKS
diff --git a/src/backend/storage/lmgr/multi.c b/src/backend/storage/lmgr/multi.c
index 22951e4758e05e26d5a498488a13b85cefba6710..1f9894fdb4192d2ec14fa5cb92563cd8a3014d94 100644
--- a/src/backend/storage/lmgr/multi.c
+++ b/src/backend/storage/lmgr/multi.c
@@ -12,7 +12,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.2 1996/11/03 05:07:31 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.3 1997/08/12 22:54:09 momjian Exp $
*
* NOTES:
* (1) The lock.c module assumes that the caller here is doing
@@ -275,7 +275,7 @@ MultiAcquire(LockTableId tableId,
* the last level lock we successfully acquired
*/
retStatus = FALSE;
- (void) MultiRelease(tableId, tag, lockt, i);
+ MultiRelease(tableId, tag, lockt, i);
/* now leave the loop. Don't try for any more locks */
break;
}
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index f6ebe161bc860598c3eba37d97379df8c3b1ebf2..ee6ffbd905e52df5d785129f40830eba391f8a6e 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.16 1997/08/12 20:15:48 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.17 1997/08/12 22:54:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -90,7 +90,7 @@ mdinit()
oldcxt = MemoryContextSwitchTo(MdCxt);
Md_fdvec = (MdfdVec *) palloc(Nfds * sizeof(MdfdVec));
- (void) MemoryContextSwitchTo(oldcxt);
+ MemoryContextSwitchTo(oldcxt);
if (Md_fdvec == (MdfdVec *) NULL)
return (SM_FAIL);
@@ -193,7 +193,7 @@ mdunlink(Relation reln)
pfree(ov);
}
Md_fdvec[fd].mdfd_chain = (MdfdVec *) NULL;
- (void) MemoryContextSwitchTo(oldcxt);
+ MemoryContextSwitchTo(oldcxt);
_fdvec_free (fd);
@@ -314,7 +314,7 @@ mdclose(Relation reln)
pfree(ov);
}
- (void) MemoryContextSwitchTo(oldcxt);
+ MemoryContextSwitchTo(oldcxt);
Md_fdvec[fd].mdfd_chain = (MdfdVec *) NULL;
_fdvec_free (fd);
@@ -487,7 +487,7 @@ mdblindwrt(char *dbstr,
/* seek to the right spot */
seekpos = (long) (BLCKSZ * (blkno % RELSEG_SIZE));
if (lseek(fd, seekpos, SEEK_SET) != seekpos) {
- (void) close(fd);
+ close(fd);
return (SM_FAIL);
}
@@ -668,7 +668,7 @@ int _fdvec_alloc ()
memmove(nvec, (char *) Md_fdvec, CurFd * sizeof(MdfdVec));
pfree(Md_fdvec);
- (void) MemoryContextSwitchTo(oldcxt);
+ MemoryContextSwitchTo(oldcxt);
Md_fdvec = nvec;
@@ -735,7 +735,7 @@ _mdfd_openseg(Relation reln, int segno, int oflags)
/* allocate an mdfdvec entry for it */
oldcxt = MemoryContextSwitchTo(MdCxt);
v = (MdfdVec *) palloc(sizeof(MdfdVec));
- (void) MemoryContextSwitchTo(oldcxt);
+ MemoryContextSwitchTo(oldcxt);
/* fill the entry */
v->mdfd_vfd = fd;
diff --git a/src/backend/tcop/aclchk.c b/src/backend/tcop/aclchk.c
index a94d35791507ef1f01d51cedcb41efcc363be505..a32e6834c1b8466336fc10accdebff769b4a5ae4 100644
--- a/src/backend/tcop/aclchk.c
+++ b/src/backend/tcop/aclchk.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/Attic/aclchk.c,v 1.10 1997/05/22 00:15:21 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/Attic/aclchk.c,v 1.11 1997/08/12 22:54:17 momjian Exp $
*
* NOTES
* See acl.h.
@@ -165,7 +165,7 @@ ChangeAcl(char *relname,
ItemPointerCopy(&htp->t_ctid, &tmp_ipd);
/* XXX handle index on pg_class? */
setheapoverride(true);
- (void) heap_replace(relation, &tmp_ipd, htp);
+ heap_replace(relation, &tmp_ipd, htp);
setheapoverride(false);
heap_endscan(hsdp);
diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c
index 832e509104dad205352f20419f89986fccd14837..bb8cf5ad4bc03cc7700330489c6237553916584c 100644
--- a/src/backend/tcop/dest.c
+++ b/src/backend/tcop/dest.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.5 1997/01/10 20:19:00 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.6 1997/08/12 22:54:19 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -188,7 +188,7 @@ NullCommand(CommandDest dest)
}
pq_flush();
PQcleanNotify(); /* garbage collect */
- (void) MemoryContextSwitchTo(orig);
+ MemoryContextSwitchTo(orig);
#endif
/* ----------------
* tell the fe that the last of the queries has finished
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index eb099e973ec23ad591c29fc7573d3482ec91a657..71acc8e998ac0907aaa44535ef988c01a5a22286 100644
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.12 1997/07/29 15:51:33 thomas Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.13 1997/08/12 22:54:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -717,7 +717,7 @@ array_ref(ArrayType *array,
if (*isNull) RETURN_NULL;
if (VARSIZE(v) - 4 < elmlen)
RETURN_NULL;
- (void) lo_close(fd);
+ lo_close(fd);
retval = (char *)_ArrayCast((char *)VARDATA(v), reftype, elmlen);
if ( reftype == 0) { /* not by value */
char * tempdata = palloc (elmlen);
@@ -847,8 +847,8 @@ array_clip(ArrayType *array,
_ReadArray(lowerIndx, upperIndx, len, fd, newfd, array, 1,isNull);
}
#ifdef LOARRAY
- (void) LOclose(fd);
- (void) LOclose(newfd);
+ LOclose(fd);
+ LOclose(newfd);
#endif
if (*isNull) {
pfree(newArr);
@@ -944,7 +944,7 @@ array_set(ArrayType *array,
RETURN_NULL;
*/
pfree(v);
- (void) lo_close(fd);
+ lo_close(fd);
return((char *)array);
}
if (elmlen > 0) {
@@ -1045,12 +1045,12 @@ array_assgn(ArrayType *array,
return((char *)array);
#endif
_LOArrayRange(lowerIndx, upperIndx, len, fd, newfd, array, 1, isNull);
- (void) lo_close(newfd);
+ lo_close(newfd);
} else {
_LOArrayRange(lowerIndx, upperIndx, len, fd, (int)ARR_DATA_PTR(newArr),
array, 0, isNull);
}
- (void) lo_close(fd);
+ lo_close(fd);
return ((char *) array);
}
_ArrayRange(lowerIndx, upperIndx, len, ARR_DATA_PTR(newArr), array, 0);
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index 0d75f44df6e97c23d41d49b0e90821cd03919528..70fc35cb6943f54d35a56942837e5a31c6d9e29d 100644
--- a/src/backend/utils/adt/date.c
+++ b/src/backend/utils/adt/date.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.11 1997/08/12 20:15:57 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.12 1997/08/12 22:54:26 momjian Exp $
*
* NOTES
* This code is actually (almost) unused.
@@ -214,10 +214,10 @@ reltime2tm(int32 time, struct tm *tm)
if (quantity > 1 || quantity < -1)
unitnr++; /* adjust index for PLURAL of unit */
if (quantity >= 0)
- (void) sprintf( timestring, "%c %lu %s", RELTIME_LABEL,
+ sprintf( timestring, "%c %lu %s", RELTIME_LABEL,
quantity, unit_tab[unitnr]);
else
- (void) sprintf( timestring, "%c %lu %s %s", RELTIME_LABEL,
+ sprintf( timestring, "%c %lu %s %s", RELTIME_LABEL,
(quantity * -1), unit_tab[unitnr], RELTIME_PAST);
return(timestring);
}
diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c
index 320270e7abd19ae0190a82504424f5e4b13236f3..feea5559c06ed2e8729f48d7fe162bfbf0dc18ef 100644
--- a/src/backend/utils/adt/geo_ops.c
+++ b/src/backend/utils/adt/geo_ops.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.13 1997/07/29 16:08:18 thomas Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.14 1997/08/12 22:54:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -108,7 +108,7 @@ fprintf( stderr, "single_decode- (%x) try decoding %s to %g\n", (cp-str), str, *
int single_encode(float8 x, char *str)
{
- (void) sprintf(str, "%.*g", digits8, x);
+ sprintf(str, "%.*g", digits8, x);
return(TRUE);
} /* single_encode() */
@@ -144,7 +144,7 @@ int pair_decode(char *str, float8 *x, float8 *y, char **s)
int pair_encode(float8 x, float8 y, char *str)
{
- (void) sprintf(str, "%.*g,%.*g", digits8, x, digits8, y);
+ sprintf(str, "%.*g,%.*g", digits8, x, digits8, y);
return(TRUE);
}
diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c
index 52e3113041e86a8417be9a75e881a805a7a1f78e..0c85cae8642d2882a3bdc4dd9ec58250207423fd 100644
--- a/src/backend/utils/adt/nabstime.c
+++ b/src/backend/utils/adt/nabstime.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.29 1997/08/12 20:16:00 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.30 1997/08/12 22:54:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -53,7 +53,7 @@ GetCurrentAbsoluteTime(void)
#else /* ! USE_POSIX_TIME */
struct timeb tb; /* the old V7-ism */
- (void) ftime(&tb);
+ ftime(&tb);
now = tb.time;
#endif
@@ -111,7 +111,7 @@ abstime2tm(AbsoluteTime time, int *tzp, struct tm *tm, char *tzn)
#else /* ! USE_POSIX_TIME */
struct timeb tb; /* the old V7-ism */
- (void) ftime(&tb);
+ ftime(&tb);
#endif
#ifdef USE_POSIX_TIME
diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c
index 77867d50dc0676f1cf28d41201e014503c3be49f..8e944de3fa66c1def1f6213aee8d9643dcf1b90f 100644
--- a/src/backend/utils/adt/numutils.c
+++ b/src/backend/utils/adt/numutils.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.11 1997/08/12 20:16:02 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.12 1997/08/12 22:54:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -142,8 +142,8 @@ ftoa(double value, char *ascii, int width, int prec1, char format)
char fmt[256];
int ret;
- (void) sprintf(fmt, "%%%d.%d%c", width, prec1, format);
- (void) sprintf(out, fmt, value);
+ sprintf(fmt, "%%%d.%d%c", width, prec1, format);
+ sprintf(out, fmt, value);
if ((ret = strlen(out)) > width) {
memset(ascii, '*', width - 2);
ascii[width] = 0;
diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c
index e791a1d7b172db0bfc3b9e4f9ec92bf797c47a0d..a0d61b8304c77f29f539210f58aee0039f60d012 100644
--- a/src/backend/utils/adt/regexp.c
+++ b/src/backend/utils/adt/regexp.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.6 1997/08/12 20:16:04 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.7 1997/08/12 22:54:36 momjian Exp $
*
* Alistair Crooks added the code for the regex caching
* agc - cached the regular expressions used - there's a good chance
@@ -119,7 +119,7 @@ RE_compile_and_execute(struct varlena *text_re, char *text, int cflags)
/* use malloc/free for the cre_s field because the storage
has to persist across transactions */
rev[oldest].cre_s = (char *) malloc(n + 1);
- (void) memmove(rev[oldest].cre_s, re, n);
+ memmove(rev[oldest].cre_s, re, n);
rev[oldest].cre_s[n] = 0;
rev[oldest].cre_text = text_re;
rev[oldest].cre_lru = ++lru;
diff --git a/src/backend/utils/adt/sets.c b/src/backend/utils/adt/sets.c
index 0a2f24f7b8075ca593db67f3bb401e96a59a97e0..55ca1f4b643e9d4c3e46d8178efba0298fc2cd66 100644
--- a/src/backend/utils/adt/sets.c
+++ b/src/backend/utils/adt/sets.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.4 1997/01/10 20:19:49 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.5 1997/08/12 22:54:38 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -129,7 +129,7 @@ SetDefine(char *querystr, char *typename)
ItemPointerCopy(&tup->t_ctid, &ipdata);
setheapoverride(true);
- (void) heap_replace(procrel, &ipdata, newtup);
+ heap_replace(procrel, &ipdata, newtup);
setheapoverride(false);
setoid = newtup->t_oid;
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 28be97d1133fb31d5ced3368bc4d52020d5faa35..0282a60d8066bd2d850659863fb1e2dc1be2fe2d 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.11 1997/08/03 02:37:32 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.12 1997/08/12 22:54:41 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1607,7 +1607,7 @@ init_irels(void)
return;
}
- (void) FileSeek(fd, 0L, SEEK_SET);
+ FileSeek(fd, 0L, SEEK_SET);
for (relno = 0; relno < Num_indices_bootstrap; relno++) {
/* first read the relation descriptor length*/
@@ -1748,7 +1748,7 @@ write_irels(void)
if (fd < 0)
elog(FATAL, "cannot create init file %s", INIT_FILENAME);
- (void) FileSeek(fd, 0L, SEEK_SET);
+ FileSeek(fd, 0L, SEEK_SET);
/*
* Build a relation descriptor for pg_attnumind without resort to the
@@ -1853,5 +1853,5 @@ write_irels(void)
ird->rd_rel = relform;
}
- (void) FileClose(fd);
+ FileClose(fd);
}
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index c039e00102deb5b466b3747fcc46f840a6583acd..fae4c1adeefc9784164e1437c6d5feb959fc09c7 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.16 1997/07/24 20:16:32 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.17 1997/08/12 22:54:44 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -197,7 +197,7 @@ DebugFileOpen(void)
elog(FATAL, "DebugFileOpen: open of %s: %m",
OutputFileName);
istty = isatty(fd);
- (void) close(fd);
+ close(fd);
/* If the file is a tty and we're running under the
* postmaster, try to send stdout there as well (if it
* isn't a tty then stderr will block out stdout, so we
diff --git a/src/backend/utils/error/exc.c b/src/backend/utils/error/exc.c
index 94c2b27f93e4222d86a1da6fd0b2a744f9f6bd18..a1b185fcd0ff4c6d14289baa6123d4ab821c17e4 100644
--- a/src/backend/utils/error/exc.c
+++ b/src/backend/utils/error/exc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.13 1997/03/26 03:27:04 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.14 1997/08/12 22:54:46 momjian Exp $
*
* NOTE
* XXX this code needs improvement--check for state violations and
@@ -99,34 +99,34 @@ ExcPrint(Exception *excP,
data = data;
#endif
- (void) fflush(stdout); /* In case stderr is buffered */
+ fflush(stdout); /* In case stderr is buffered */
#if 0
if (ProgramName != NULL && *ProgramName != '\0')
- (void) fprintf(stderr, "%s: ", ProgramName);
+ fprintf(stderr, "%s: ", ProgramName);
#endif
if (message != NULL)
- (void) fprintf(stderr, "%s", message);
+ fprintf(stderr, "%s", message);
else if (excP->message != NULL)
- (void) fprintf(stderr, "%s", excP->message);
+ fprintf(stderr, "%s", excP->message);
else
#ifdef lint
- (void) fprintf(stderr, "UNNAMED EXCEPTION 0x%lx", excP);
+ fprintf(stderr, "UNNAMED EXCEPTION 0x%lx", excP);
#else
- (void) fprintf(stderr, "UNNAMED EXCEPTION 0x%lx", (long)excP);
+ fprintf(stderr, "UNNAMED EXCEPTION 0x%lx", (long)excP);
#endif
- (void) fprintf(stderr, " (%ld)", detail);
+ fprintf(stderr, " (%ld)", detail);
if (errno > 0 && errno < sys_nerr)
- (void) fprintf(stderr, " [%s]", strerror(errno));
+ fprintf(stderr, " [%s]", strerror(errno));
else if (errno != 0)
- (void) fprintf(stderr, " [Error %d]", errno);
+ fprintf(stderr, " [Error %d]", errno);
- (void) fprintf(stderr, "\n");
+ fprintf(stderr, "\n");
- (void) fflush(stderr);
+ fflush(stderr);
}
ExcProc *
diff --git a/src/backend/utils/error/format.c b/src/backend/utils/error/format.c
index 46ffd67673bb98b214ccae3c8b5bcddbcb0336ec..bdbaddb402fe22fee5ba537c2c3e67598e40208b 100644
--- a/src/backend/utils/error/format.c
+++ b/src/backend/utils/error/format.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/format.c,v 1.2 1997/05/17 16:23:06 mergl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/format.c,v 1.3 1997/08/12 22:54:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -32,7 +32,7 @@ form(const char *fmt, ... )
va_start(args, fmt);
- (void) vsprintf(FormBuf, fmt, args);
+ vsprintf(FormBuf, fmt, args);
va_end(args);
diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c
index f2cab230cf51f3efe0872d39bc7407ad25f515e7..db209e1c33861192ff879e1d5e34a13c621abb7e 100644
--- a/src/backend/utils/hash/dynahash.c
+++ b/src/backend/utils/hash/dynahash.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.6 1996/11/10 03:03:36 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.7 1997/08/12 22:54:50 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -377,10 +377,10 @@ hash_destroy (HTAB *hashp)
}
free((char *)segp);
}
- (void) MEM_FREE( (char *) hashp->dir);
- (void) MEM_FREE( (char *) hashp->hctl);
+ MEM_FREE( (char *) hashp->dir);
+ MEM_FREE( (char *) hashp->hctl);
hash_stats("destroy",hashp);
- (void) MEM_FREE( (char *) hashp);
+ MEM_FREE( (char *) hashp);
}
}
@@ -767,7 +767,7 @@ dir_realloc(HTAB *hashp)
if (p != NULL) {
memmove(p, *p_ptr, old_dirsize );
memset ( *p_ptr + old_dirsize, 0, new_dirsize-old_dirsize );
- (void) free( (char *)*p_ptr);
+ free( (char *)*p_ptr);
*p_ptr = p;
hashp->hctl->dsize = new_dirsize;
return(1);
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 7ed1b7f94fce7b9237e710a6e62a80ad034cf76b..253814f33dac90604b7a37b73ce2a9605743058a 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.9 1997/07/24 20:17:34 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.10 1997/08/12 22:54:54 momjian Exp $
*
* NOTES
* InitPostgres() is the function called from PostgresMain
@@ -217,7 +217,7 @@ InitMyDatabaseId()
}
done:
- (void) close(dbfd);
+ close(dbfd);
pfree(pg);
if (!OidIsValid(MyDatabaseId))
@@ -463,7 +463,7 @@ InitCommunication()
void
InitStdio()
{
- (void) DebugFileOpen();
+ DebugFileOpen();
}
/* --------------------------------
diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c
index f91d1f5c8b023f2173e3652a35b444e698e67726..23e600ce2449e3ad8bc3ccae5533329005046f9b 100644
--- a/src/backend/utils/mmgr/portalmem.c
+++ b/src/backend/utils/mmgr/portalmem.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.3 1996/11/08 06:00:57 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.4 1997/08/12 22:54:57 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -817,7 +817,7 @@ PortalResetHeapMemory(Portal portal)
} while (PointerIsValid(context->block));
/* restore context */
- (void) MemoryContextSwitchTo(currentContext);
+ MemoryContextSwitchTo(currentContext);
}
}
diff --git a/src/backend/utils/sort/lselect.c b/src/backend/utils/sort/lselect.c
index 26a3ca385769ef73ed295ac278c27713d0a6225d..6797bd40ca027bec234b719cd79cc7fca66ee382 100644
--- a/src/backend/utils/sort/lselect.c
+++ b/src/backend/utils/sort/lselect.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/lselect.c,v 1.4 1997/08/06 03:41:47 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/lselect.c,v 1.5 1997/08/12 22:55:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -183,8 +183,6 @@ tuplecmp(HeapTuple ltup, HeapTuple rtup, LeftistContext context)
{
register char *lattr, *rattr;
int nkey = 0;
- extern int Nkeys;
- extern ScanKey Key;
int result = 0;
bool isnull;
diff --git a/src/backend/utils/sort/psort.c b/src/backend/utils/sort/psort.c
index dbda8abd1ff37f8055b790eb188b62be650cfd00..8442fbe45f2afa01528c737a6d174d8fe7fb3825 100644
--- a/src/backend/utils/sort/psort.c
+++ b/src/backend/utils/sort/psort.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.12 1997/08/12 20:16:14 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.13 1997/08/12 22:55:02 momjian Exp $
*
* NOTES
* Sorts the first relation into the second relation.
@@ -35,6 +35,9 @@
*/
#include <stdio.h>
#include <math.h>
+#include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
#include "postgres.h"
@@ -342,9 +345,8 @@ bool
createrun(Sort *node, FILE *file, bool *empty)
{
register HeapTuple lasttuple;
- register HeapTuple btup, tup;
+ register HeapTuple tup;
struct leftist *nextrun;
- Buffer b;
bool foundeor;
short junk;
@@ -726,7 +728,6 @@ struct tapelst {
};
static struct tapelst *Tapes = NULL;
-static char Tempfile[MAXPGPATH] = TEMPDIR;
/*
* gettape - returns an open stream for writing/reading
diff --git a/src/lextest/lextest.c b/src/lextest/lextest.c
index d1297cb5179d80cdf9ce48e6cca43b1ba95b1e14..29542c89506e2eb21f65d15f74e057e591ac0dcd 100644
--- a/src/lextest/lextest.c
+++ b/src/lextest/lextest.c
@@ -10,7 +10,7 @@ int main()
return 0;
}
-yywrap()
+int yywrap()
{
return 1;
};
diff --git a/src/test/examples/testlo.c b/src/test/examples/testlo.c
index cd69fbd75e881cb9368f766b5560dede33e331ff..c9324f8942688f38c99763ef64eef200bc7d93d3 100644
--- a/src/test/examples/testlo.c
+++ b/src/test/examples/testlo.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/test/examples/testlo.c,v 1.2 1997/07/10 01:15:11 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/test/examples/testlo.c,v 1.3 1997/08/12 22:55:19 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -63,8 +63,8 @@ Oid importFile(PGconn *conn, char *filename)
}
}
- (void) close(fd);
- (void) lo_close(conn, lobj_fd);
+ close(fd);
+ lo_close(conn, lobj_fd);
return lobjId;
}
@@ -168,8 +168,8 @@ void exportFile(PGconn *conn, Oid lobjId, char *filename)
}
}
- (void) lo_close(conn, lobj_fd);
- (void) close(fd);
+ lo_close(conn, lobj_fd);
+ close(fd);
return;
}
diff --git a/src/test/examples/testlo2.c b/src/test/examples/testlo2.c
index 3756a158e3a13ee43679983b2efbad56bdd8030c..36a5ce4fa446cc539359e1fd8faf2a67b8f69893 100644
--- a/src/test/examples/testlo2.c
+++ b/src/test/examples/testlo2.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/test/examples/Attic/testlo2.c,v 1.1.1.1 1996/07/09 06:22:23 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/test/examples/Attic/testlo2.c,v 1.2 1997/08/12 22:55:21 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -57,8 +57,8 @@ Oid importFile(PGconn *conn, char *filename)
}
}
- (void) close(fd);
- (void) lo_close(conn, lobj_fd);
+ close(fd);
+ lo_close(conn, lobj_fd);
return lobjId;
}
@@ -162,8 +162,8 @@ void exportFile(PGconn *conn, Oid lobjId, char *filename)
}
}
- (void) lo_close(conn, lobj_fd);
- (void) close(fd);
+ lo_close(conn, lobj_fd);
+ close(fd);
return;
}
diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c
index c72f4267739df611cbaa1182113acf59b19e599d..5309e7bd513a62a96061c120d4415283672561ec 100644
--- a/src/test/regress/regress.c
+++ b/src/test/regress/regress.c
@@ -1,5 +1,5 @@
/*
- * $Header: /cvsroot/pgsql/src/test/regress/regress.c,v 1.7 1997/07/29 16:21:12 thomas Exp $
+ * $Header: /cvsroot/pgsql/src/test/regress/regress.c,v 1.8 1997/08/12 22:55:25 momjian Exp $
*/
#include <float.h> /* faked on sunos */
@@ -229,7 +229,7 @@ widget_out(widget)
return(NULL);
result = (char *) palloc(60);
- (void) sprintf(result, "(%g,%g,%g)",
+ sprintf(result, "(%g,%g,%g)",
widget->center.x, widget->center.y, widget->radius);
return(result);
}