Skip to content

Commit ea5b535

Browse files
bmomjianbmomjian
committed
Remove more (void) and fix -Wall warnings.
1 parent 0f6a961 commit ea5b535

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+316
-323
lines changed

‎src/backend/access/gist/gist.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ gistSplit(Relation r,
706706
item = (IndexTuple) PageGetItem(p, itemid);
707707

708708
if (i == *(v.spl_left)) {
709-
(void) gistPageAddItem(giststate, r, left, (Item) item,
709+
gistPageAddItem(giststate, r, left, (Item) item,
710710
IndexTupleSize(item),
711711
leftoff, LP_USED, &tmpdentry, &newtup);
712712
leftoff = OffsetNumberNext(leftoff);
@@ -718,7 +718,7 @@ gistSplit(Relation r,
718718
pfree(newtup);
719719
}
720720
else {
721-
(void) gistPageAddItem(giststate, r, right, (Item) item,
721+
gistPageAddItem(giststate, r, right, (Item) item,
722722
IndexTupleSize(item),
723723
rightoff, LP_USED, &tmpdentry, &newtup);
724724
rightoff = OffsetNumberNext(rightoff);
@@ -736,7 +736,7 @@ gistSplit(Relation r,
736736

737737
/* now insert the new index tuple */
738738
if (*(v.spl_left) != FirstOffsetNumber) {
739-
(void) gistPageAddItem(giststate, r, left, (Item) itup,
739+
gistPageAddItem(giststate, r, left, (Item) itup,
740740
IndexTupleSize(itup),
741741
leftoff, LP_USED, &tmpdentry, &newtup);
742742
leftoff = OffsetNumberNext(leftoff);
@@ -747,7 +747,7 @@ gistSplit(Relation r,
747747
if (itup != newtup)
748748
pfree(newtup);
749749
} else {
750-
(void) gistPageAddItem(giststate, r, right, (Item) itup,
750+
gistPageAddItem(giststate, r, right, (Item) itup,
751751
IndexTupleSize(itup),
752752
rightoff, LP_USED, &tmpdentry, &newtup);
753753
rightoff = OffsetNumberNext(rightoff);
@@ -852,7 +852,7 @@ gistentryinserttwo(Relation r, GISTSTACK *stk, IndexTuple ltup,
852852
pfree(res);
853853
gistdoinsert(r, rtup, giststate);
854854
} else {
855-
(void) gistPageAddItem(giststate, r, p, (Item)ltup,
855+
gistPageAddItem(giststate, r, p, (Item)ltup,
856856
IndexTupleSize(ltup), InvalidOffsetNumber,
857857
LP_USED, &tmpentry, &newtup);
858858
WriteBuffer(b);
@@ -863,7 +863,7 @@ gistentryinserttwo(Relation r, GISTSTACK *stk, IndexTuple ltup,
863863
pfree(tmpentry.pred);
864864
if (ltup != newtup)
865865
pfree(newtup);
866-
(void)gistentryinsert(r, stk, rtup, giststate);
866+
gistentryinsert(r, stk, rtup, giststate);
867867
}
868868
}
869869

@@ -919,15 +919,15 @@ gistnewroot(GISTSTATE *giststate, Relation r, IndexTuple lt, IndexTuple rt)
919919
b = ReadBuffer(r, GISTP_ROOT);
920920
GISTInitBuffer(b, 0);
921921
p = BufferGetPage(b);
922-
(void) gistPageAddItem(giststate, r, p, (Item) lt, IndexTupleSize(lt),
922+
gistPageAddItem(giststate, r, p, (Item) lt, IndexTupleSize(lt),
923923
FirstOffsetNumber,
924924
LP_USED, &tmpentry, &newtup);
925925
/* be tidy */
926926
if (tmpentry.pred != (((char *) lt) + sizeof(IndexTupleData)))
927927
pfree(tmpentry.pred);
928928
if (lt != newtup)
929929
pfree(newtup);
930-
(void) gistPageAddItem(giststate, r, p, (Item) rt, IndexTupleSize(rt),
930+
gistPageAddItem(giststate, r, p, (Item) rt, IndexTupleSize(rt),
931931
OffsetNumberNext(FirstOffsetNumber), LP_USED,
932932
&tmpentry, &newtup);
933933
/* be tidy */
@@ -1261,7 +1261,7 @@ char *text_range_out(TXTRANGE *r)
12611261
memcpy(upper, VARDATA(TRUPPER(r)), VARSIZE(TRUPPER(r)) - VARHDRSZ);
12621262
upper[VARSIZE(TRUPPER(r)) - VARHDRSZ] = '\0';
12631263

1264-
(void) sprintf(result, "[%s,%s): %d", lower, upper, r->flag);
1264+
sprintf(result, "[%s,%s): %d", lower, upper, r->flag);
12651265
pfree(lower);
12661266
pfree(upper);
12671267
return(result);
@@ -1275,7 +1275,7 @@ int_range_out(INTRANGE *r)
12751275
if (r == NULL)
12761276
return(NULL);
12771277
result = (char *)palloc(80);
1278-
(void) sprintf(result, "[%d,%d): %d",r->lower, r->upper, r->flag);
1278+
sprintf(result, "[%d,%d): %d",r->lower, r->upper, r->flag);
12791279

12801280
return(result);
12811281
}

‎src/backend/access/hash/hashinsert.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.7 1996/11/05 09:40:18 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.8 1997/08/12 22:51:30 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -223,7 +223,7 @@ _hash_pgaddtup(Relation rel,
223223
_hash_checkpage(page, LH_BUCKET_PAGE|LH_OVERFLOW_PAGE);
224224

225225
itup_off = OffsetNumberNext(PageGetMaxOffsetNumber(page));
226-
(void) PageAddItem(page, (Item) hitem, itemsize, itup_off, LP_USED);
226+
PageAddItem(page, (Item) hitem, itemsize, itup_off, LP_USED);
227227

228228
/* write the buffer, but hold our lock */
229229
_hash_wrtnorelbuf(rel, buf);

‎src/backend/access/hash/hashovfl.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.8 1996/11/05 09:40:20 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.9 1997/08/12 22:51:34 momjian Exp $
1111
*
1212
* NOTES
1313
* Overflow pages look like ordinary relation pages.
@@ -315,7 +315,7 @@ _hash_freeovflpage(Relation rel, Buffer ovflbuf)
315315
nextblkno = ovflopaque->hasho_nextblkno;
316316
prevblkno = ovflopaque->hasho_prevblkno;
317317
bucket = ovflopaque->hasho_bucket;
318-
(void) memset(ovflpage, 0, BufferGetPageSize(ovflbuf));
318+
memset(ovflpage, 0, BufferGetPageSize(ovflbuf));
319319
_hash_wrtbuf(rel, ovflbuf);
320320

321321
/*
@@ -436,8 +436,8 @@ _hash_initbitmap(Relation rel,
436436
/* set all of the bits above 'nbits' to 1 */
437437
clearints = ((nbits - 1) >> INT_TO_BIT) + 1;
438438
clearbytes = clearints << INT_TO_BYTE;
439-
(void) memset((char *) freep, 0, clearbytes);
440-
(void) memset(((char *) freep) + clearbytes, 0xFF,
439+
memset((char *) freep, 0, clearbytes);
440+
memset(((char *) freep) + clearbytes, 0xFF,
441441
BMPGSZ_BYTE(metap) - clearbytes);
442442
freep[clearints - 1] = ALL_SET << (nbits & INT_MASK);
443443

@@ -566,7 +566,7 @@ _hash_squeezebucket(Relation rel,
566566
* page.
567567
*/
568568
woffnum = OffsetNumberNext(PageGetMaxOffsetNumber(wpage));
569-
(void) PageAddItem(wpage, (Item) hitem, itemsz, woffnum, LP_USED);
569+
PageAddItem(wpage, (Item) hitem, itemsz, woffnum, LP_USED);
570570

571571
/*
572572
* delete the tuple from the "read" page.

‎src/backend/access/hash/hashpage.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.7 1996/11/05 09:40:21 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.8 1997/08/12 22:51:37 momjian Exp $
1111
*
1212
* NOTES
1313
* Postgres hash pages look like ordinary relation pages. The opaque
@@ -609,7 +609,7 @@ _hash_splitpage(Relation rel,
609609
}
610610

611611
noffnum = OffsetNumberNext(PageGetMaxOffsetNumber(npage));
612-
(void) PageAddItem(npage, (Item) hitem, itemsz, noffnum, LP_USED);
612+
PageAddItem(npage, (Item) hitem, itemsz, noffnum, LP_USED);
613613
_hash_wrtnorelbuf(rel, nbuf);
614614

615615
/*

‎src/backend/access/heap/heapam.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.12 1997/08/06 02:08:39 vadim Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.13 1997/08/12 22:51:40 momjian Exp $
1111
*
1212
*
1313
* INTERFACE ROUTINES
@@ -548,7 +548,7 @@ heap_close(Relation relation)
548548
IncrHeapAccessStat(local_close);
549549
IncrHeapAccessStat(global_close);
550550

551-
(void) RelationClose(relation);
551+
RelationClose(relation);
552552
}
553553

554554

‎src/backend/access/heap/stats.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.9 1996/11/10 02:58:11 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.10 1997/08/12 22:51:44 momjian Exp $
1111
*
1212
* NOTES
1313
* initam should be moved someplace else.
@@ -116,7 +116,7 @@ InitHeapAccessStatistics()
116116
* return to old memory context
117117
* ----------------
118118
*/
119-
(void) MemoryContextSwitchTo(oldContext);
119+
MemoryContextSwitchTo(oldContext);
120120

121121
heap_access_stats = stats;
122122
}

‎src/backend/access/index/indexam.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.10 1997/01/10 09:46:25 vadim Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.11 1997/08/12 22:51:48 momjian Exp $
1111
*
1212
* INTERFACE ROUTINES
1313
* index_open - open an index relation by relationId
@@ -153,7 +153,7 @@ index_openr(char *relationName)
153153
void
154154
index_close(Relation relation)
155155
{
156-
(void) RelationClose(relation);
156+
RelationClose(relation);
157157
}
158158

159159
/* ----------------
@@ -212,7 +212,7 @@ index_delete(Relation relation, ItemPointer indexItem)
212212
RELATION_CHECKS;
213213
GET_REL_PROCEDURE(delete,amdelete);
214214

215-
(void) fmgr(procedure, relation, indexItem);
215+
fmgr(procedure, relation, indexItem);
216216
}
217217

218218
/* ----------------
@@ -251,7 +251,7 @@ index_rescan(IndexScanDesc scan, bool scanFromEnd, ScanKey key)
251251
SCAN_CHECKS;
252252
GET_SCAN_PROCEDURE(rescan,amrescan);
253253

254-
(void) fmgr(procedure, scan, scanFromEnd, key);
254+
fmgr(procedure, scan, scanFromEnd, key);
255255
}
256256

257257
/* ----------------
@@ -266,7 +266,7 @@ index_endscan(IndexScanDesc scan)
266266
SCAN_CHECKS;
267267
GET_SCAN_PROCEDURE(endscan,amendscan);
268268

269-
(void) fmgr(procedure, scan);
269+
fmgr(procedure, scan);
270270

271271
RelationUnsetRIntentLock(scan->relation);
272272
}
@@ -283,7 +283,7 @@ index_markpos(IndexScanDesc scan)
283283
SCAN_CHECKS;
284284
GET_SCAN_PROCEDURE(markpos,ammarkpos);
285285

286-
(void) fmgr(procedure, scan);
286+
fmgr(procedure, scan);
287287
}
288288

289289
/* ----------------
@@ -298,7 +298,7 @@ index_restrpos(IndexScanDesc scan)
298298
SCAN_CHECKS;
299299
GET_SCAN_PROCEDURE(restrpos,amrestrpos);
300300

301-
(void) fmgr(procedure, scan);
301+
fmgr(procedure, scan);
302302
}
303303

304304
/* ----------------

‎src/backend/access/nbtree/nbtsearch.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.21 1997/06/10 07:28:50 vadim Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.22 1997/08/12 22:51:50 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -915,7 +915,7 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
915915

916916
/* if this is true, the key we just looked at is gone */
917917
if (result > 0)
918-
(void) _bt_twostep(scan, &buf, ForwardScanDirection);
918+
_bt_twostep(scan, &buf, ForwardScanDirection);
919919
}
920920
break;
921921

@@ -931,7 +931,7 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
931931
} while (result >= 0);
932932

933933
if (result < 0)
934-
(void) _bt_twostep(scan, &buf, BackwardScanDirection);
934+
_bt_twostep(scan, &buf, BackwardScanDirection);
935935
}
936936
break;
937937

@@ -966,7 +966,7 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
966966
* No key on this page, but offnum from _bt_binsrch() greater
967967
* maxoff - have to move right. - vadim 12/06/96
968968
*/
969-
(void) _bt_twostep(scan, &buf, ForwardScanDirection);
969+
_bt_twostep(scan, &buf, ForwardScanDirection);
970970
}
971971
}
972972
else if (result < 0)
@@ -981,7 +981,7 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
981981
} while (result < 0);
982982

983983
if (result > 0)
984-
(void) _bt_twostep(scan, &buf, ForwardScanDirection);
984+
_bt_twostep(scan, &buf, ForwardScanDirection);
985985
}
986986
break;
987987

‎src/backend/access/nbtree/nbtsort.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
*
77
* IDENTIFICATION
8-
* $Id: nbtsort.c,v 1.17 1997/06/06 03:11:46 vadim Exp $
8+
* $Id: nbtsort.c,v 1.18 1997/08/12 22:51:52 momjian Exp $
99
*
1010
* NOTES
1111
*
@@ -364,7 +364,7 @@ _bt_tapereset(BTTapeBlock *tape)
364364
static void
365365
_bt_taperewind(BTTapeBlock *tape)
366366
{
367-
(void) FileSeek(tape->bttb_fd, 0, SEEK_SET);
367+
FileSeek(tape->bttb_fd, 0, SEEK_SET);
368368
}
369369

370370
/*
@@ -511,7 +511,7 @@ _bt_tapenext(BTTapeBlock *tape, char **pos)
511511
static void
512512
_bt_tapeadd(BTTapeBlock *tape, BTItem item, int itemsz)
513513
{
514-
(void) memcpy(tape->bttb_data + tape->bttb_top, item, itemsz);
514+
memcpy(tape->bttb_data + tape->bttb_top, item, itemsz);
515515
++tape->bttb_ntup;
516516
tape->bttb_top += DOUBLEALIGN(itemsz);
517517
}
@@ -535,7 +535,7 @@ _bt_spoolinit(Relation index, int ntapes, bool isunique)
535535
if (btspool == (BTSpool *) NULL || fname == (char *) NULL) {
536536
elog(WARN, "_bt_spoolinit: out of memory");
537537
}
538-
(void) memset((char *) btspool, 0, sizeof(BTSpool));
538+
memset((char *) btspool, 0, sizeof(BTSpool));
539539
btspool->bts_ntapes = ntapes;
540540
btspool->bts_tape = 0;
541541
btspool->isunique = isunique;
@@ -811,7 +811,7 @@ _bt_pagestate(Relation index, int flags, int level, bool doupper)
811811
{
812812
BTPageState *state = (BTPageState *) palloc(sizeof(BTPageState));
813813

814-
(void) memset((char *) state, 0, sizeof(BTPageState));
814+
memset((char *) state, 0, sizeof(BTPageState));
815815
_bt_blnewpage(index, &(state->btps_buf), &(state->btps_page), flags);
816816
state->btps_firstoff = InvalidOffsetNumber;
817817
state->btps_lastoff = P_HIKEY;
@@ -1005,7 +1005,7 @@ _bt_buildadd(Relation index, void *pstate, BTItem bti, int flags)
10051005
_bt_pagestate(index, 0, state->btps_level + 1, true);
10061006
}
10071007
nbti = _bt_minitem(opage, BufferGetBlockNumber(obuf), 0);
1008-
(void) _bt_buildadd(index, state->btps_next, nbti, 0);
1008+
_bt_buildadd(index, state->btps_next, nbti, 0);
10091009
pfree((void *) nbti);
10101010
}
10111011

@@ -1081,7 +1081,7 @@ _bt_uppershutdown(Relation index, BTPageState *state)
10811081
_bt_metaproot(index, blkno, s->btps_level + 1);
10821082
} else {
10831083
bti = _bt_minitem(s->btps_page, blkno, 0);
1084-
(void) _bt_buildadd(index, s->btps_next, bti, 0);
1084+
_bt_buildadd(index, s->btps_next, bti, 0);
10851085
pfree((void *) bti);
10861086
}
10871087
}
@@ -1158,7 +1158,7 @@ _bt_merge(Relation index, BTSpool *btspool)
11581158
* _bt_taperead will return 0 only if the tape is actually
11591159
* at EOF.
11601160
*/
1161-
(void) memset((char *) &q, 0, sizeof(BTPriQueue));
1161+
memset((char *) &q, 0, sizeof(BTPriQueue));
11621162
goodtapes = 0;
11631163
for (t = 0; t < btspool->bts_ntapes; ++t) {
11641164
itape = btspool->bts_itape[t];
@@ -1207,7 +1207,7 @@ _bt_merge(Relation index, BTSpool *btspool)
12071207
btisz = BTITEMSZ(bti);
12081208
btisz = DOUBLEALIGN(btisz);
12091209
if (doleaf) {
1210-
(void) _bt_buildadd(index, state, bti, BTP_LEAF);
1210+
_bt_buildadd(index, state, bti, BTP_LEAF);
12111211
#if defined(FASTBUILD_DEBUG) && defined(FASTBUILD_MERGE)
12121212
{
12131213
bool isnull;
@@ -1361,7 +1361,7 @@ _bt_upperbuild(Relation index)
13611361
d, state->btps_level);
13621362
}
13631363
#endif /* FASTBUILD_DEBUG && FASTBUILD_MERGE */
1364-
(void) _bt_buildadd(index, state, nbti, 0);
1364+
_bt_buildadd(index, state, nbti, 0);
13651365
pfree((void *) nbti);
13661366
}
13671367
blk = ropaque->btpo_next;

0 commit comments

Comments
 (0)