Skip to content

Commit 192ad63

Browse files
author
Neil Conway
committed
More janitorial work: remove the explicit casting of NULL literals to a
pointer type when it is not necessary to do so. For future reference, casting NULL to a pointer type is only necessary when (a) invoking a function AND either (b) the function has no prototype OR (c) the function is a varargs function.
1 parent afca5d5 commit 192ad63

Some content is hidden

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

71 files changed

+424
-436
lines changed

‎src/backend/access/common/printtup.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Portions Copyright (c) 1994, Regents of the University of California
1010
*
1111
* IDENTIFICATION
12-
* $PostgreSQL: pgsql/src/backend/access/common/printtup.c,v 1.79 2003/11/29 19:51:39 pgsql Exp $
12+
* $PostgreSQL: pgsql/src/backend/access/common/printtup.c,v 1.80 2004/01/07 18:56:23 neilc Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -509,7 +509,7 @@ debugStartup(DestReceiver *self, int operation, TupleDesc typeinfo)
509509
* show the return type of the tuples
510510
*/
511511
for (i = 0; i < natts; ++i)
512-
printatt((unsigned) i + 1, attinfo[i], (char *) NULL);
512+
printatt((unsigned) i + 1, attinfo[i], NULL);
513513
printf("\t----\n");
514514
}
515515

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

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/gist/gist.c,v 1.106 2003/11/29 19:51:39 pgsql Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/gist/gist.c,v 1.107 2004/01/07 18:56:23 neilc Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -45,10 +45,10 @@
4545
*/
4646
#define FILLITEM(evp, isnullkey, okey, okeyb, rkey, rkeyb) do { \
4747
if ( isnullkey ) { \
48-
gistentryinit((evp), rkey, r, (Page) NULL , \
48+
gistentryinit((evp), rkey, r, NULL, \
4949
(OffsetNumber) 0, rkeyb, FALSE); \
5050
} else { \
51-
gistentryinit((evp), okey, r, (Page) NULL, \
51+
gistentryinit((evp), okey, r, NULL, \
5252
(OffsetNumber) 0, okeyb, FALSE); \
5353
} \
5454
} while(0)
@@ -248,7 +248,7 @@ gistbuildCallback(Relation index,
248248
else
249249
{
250250
gistcentryinit(&buildstate->giststate, i, &tmpcentry, attdata[i],
251-
(Relation) NULL, (Page) NULL, (OffsetNumber) 0,
251+
NULL, NULL, (OffsetNumber) 0,
252252
-1 /* size is currently bogus */ , TRUE, FALSE);
253253
if (attdata[i] != tmpcentry.key &&
254254
!(isAttByVal(&buildstate->giststate, i)))
@@ -332,7 +332,7 @@ gistinsert(PG_FUNCTION_ARGS)
332332
else
333333
{
334334
gistcentryinit(&giststate, i, &tmpentry, datum[i],
335-
(Relation) NULL, (Page) NULL, (OffsetNumber) 0,
335+
NULL, NULL, (OffsetNumber) 0,
336336
-1 /* size is currently bogus */ , TRUE, FALSE);
337337
if (datum[i] != tmpentry.key && !(isAttByVal(&giststate, i)))
338338
compvec[i] = TRUE;
@@ -695,7 +695,7 @@ gistunion(Relation r, IndexTuple *itvec, int len, GISTSTATE *giststate)
695695
gistdentryinit(giststate, j,
696696
&((GISTENTRY *) VARDATA(evec))[reallen],
697697
datum,
698-
(Relation) NULL, (Page) NULL, (OffsetNumber) NULL,
698+
NULL, NULL, (OffsetNumber) 0,
699699
ATTSIZE(datum, giststate->tupdesc, j + 1, IsNull), FALSE, IsNull);
700700
if ((!isAttByVal(giststate, j)) &&
701701
((GISTENTRY *) VARDATA(evec))[reallen].key != datum)
@@ -717,7 +717,7 @@ gistunion(Relation r, IndexTuple *itvec, int len, GISTSTATE *giststate)
717717
{
718718
VARATT_SIZEP(evec) = 2 * sizeof(GISTENTRY) + VARHDRSZ;
719719
gistentryinit(((GISTENTRY *) VARDATA(evec))[1],
720-
((GISTENTRY *) VARDATA(evec))[0].key, r, (Page) NULL,
720+
((GISTENTRY *) VARDATA(evec))[0].key, r, NULL,
721721
(OffsetNumber) 0, ((GISTENTRY *) VARDATA(evec))[0].bytes, FALSE);
722722

723723
}
@@ -732,7 +732,7 @@ gistunion(Relation r, IndexTuple *itvec, int len, GISTSTATE *giststate)
732732
pfree(DatumGetPointer(((GISTENTRY *) VARDATA(evec))[i].key));
733733

734734
gistcentryinit(giststate, j, &centry[j], datum,
735-
(Relation) NULL, (Page) NULL, (OffsetNumber) NULL,
735+
NULL, NULL, (OffsetNumber) 0,
736736
datumsize, FALSE, FALSE);
737737
isnull[j] = ' ';
738738
attr[j] = centry[j].key;
@@ -793,10 +793,10 @@ gistgetadjusted(Relation r, IndexTuple oldtup, IndexTuple addtup, GISTSTATE *gis
793793
ev0p = &((GISTENTRY *) VARDATA(evec))[0];
794794
ev1p = &((GISTENTRY *) VARDATA(evec))[1];
795795

796-
gistDeCompressAtt(giststate, r, oldtup, (Page) NULL,
796+
gistDeCompressAtt(giststate, r, oldtup, NULL,
797797
(OffsetNumber) 0, oldatt, olddec, oldisnull);
798798

799-
gistDeCompressAtt(giststate, r, addtup, (Page) NULL,
799+
gistDeCompressAtt(giststate, r, addtup, NULL,
800800
(OffsetNumber) 0, addatt, adddec, addisnull);
801801

802802

@@ -841,7 +841,7 @@ gistgetadjusted(Relation r, IndexTuple oldtup, IndexTuple addtup, GISTSTATE *gis
841841
pfree(DatumGetPointer(addatt[j].key));
842842

843843
gistcentryinit(giststate, j, &centry[j], datum,
844-
(Relation) NULL, (Page) NULL, (OffsetNumber) NULL,
844+
NULL, NULL, (OffsetNumber) 0,
845845
datumsize, FALSE, FALSE);
846846

847847
isnull[j] = ' ';
@@ -929,8 +929,7 @@ gistunionsubkey(Relation r, GISTSTATE *giststate, IndexTuple *itvec, GIST_SPLITV
929929
gistdentryinit(giststate, j,
930930
&((GISTENTRY *) VARDATA(evec))[reallen],
931931
datum,
932-
(Relation) NULL, (Page) NULL,
933-
(OffsetNumber) NULL,
932+
NULL, NULL, (OffsetNumber) 0,
934933
ATTSIZE(datum, giststate->tupdesc, j + 1, IsNull), FALSE, IsNull);
935934
if ((!isAttByVal(giststate, j)) &&
936935
((GISTENTRY *) VARDATA(evec))[reallen].key != datum)
@@ -1110,7 +1109,7 @@ gistadjsubkey(Relation r,
11101109
{
11111110
if (v->spl_idgrp[i + 1] == 0) /* already inserted */
11121111
continue;
1113-
gistDeCompressAtt(giststate, r, itup[i], (Page) NULL, (OffsetNumber) 0,
1112+
gistDeCompressAtt(giststate, r, itup[i], NULL, (OffsetNumber) 0,
11141113
identry, decfree, isnull);
11151114

11161115
v->spl_ngrp[v->spl_idgrp[i + 1]]--;
@@ -1127,12 +1126,12 @@ gistadjsubkey(Relation r,
11271126
/* where? */
11281127
for (j = 1; j < r->rd_att->natts; j++)
11291128
{
1130-
gistentryinit(entry, v->spl_lattr[j], r, (Page) NULL,
1129+
gistentryinit(entry, v->spl_lattr[j], r, NULL,
11311130
(OffsetNumber) 0, v->spl_lattrsize[j], FALSE);
11321131
gistpenalty(giststate, j, &entry, v->spl_lisnull[j],
11331132
&identry[j], isnull[j], &lpenalty);
11341133

1135-
gistentryinit(entry, v->spl_rattr[j], r, (Page) NULL,
1134+
gistentryinit(entry, v->spl_rattr[j], r, NULL,
11361135
(OffsetNumber) 0, v->spl_rattrsize[j], FALSE);
11371136
gistpenalty(giststate, j, &entry, v->spl_risnull[j],
11381137
&identry[j], isnull[j], &rpenalty);
@@ -1486,7 +1485,7 @@ gistchoose(Relation r, Page p, IndexTuple it, /* it has compressed entry */
14861485
which = -1;
14871486
sum_grow = 1;
14881487
gistDeCompressAtt(giststate, r,
1489-
it, (Page) NULL, (OffsetNumber) 0,
1488+
it, NULL, (OffsetNumber) 0,
14901489
identry, decompvec, isnull);
14911490

14921491
for (i = FirstOffsetNumber; i <= maxoff && sum_grow; i = OffsetNumberNext(i))
@@ -1530,7 +1529,7 @@ gistfreestack(GISTSTACK *s)
15301529
{
15311530
GISTSTACK *p;
15321531

1533-
while (s != (GISTSTACK *) NULL)
1532+
while (s != NULL)
15341533
{
15351534
p = s->gs_parent;
15361535
pfree(s);
@@ -1609,7 +1608,7 @@ gistbulkdelete(PG_FUNCTION_ARGS)
16091608
*/
16101609

16111610
/* walk through the entire index */
1612-
iscan = index_beginscan(NULL, rel, SnapshotAny, 0, (ScanKey) NULL);
1611+
iscan = index_beginscan(NULL, rel, SnapshotAny, 0, NULL);
16131612
/* including killed tuples */
16141613
iscan->ignore_killed_tuples = false;
16151614

@@ -1829,7 +1828,7 @@ gistFormTuple(GISTSTATE *giststate, Relation r,
18291828
else
18301829
{
18311830
gistcentryinit(giststate, j, &centry[j], attdata[j],
1832-
(Relation) NULL, (Page) NULL, (OffsetNumber) NULL,
1831+
NULL, NULL, (OffsetNumber) 0,
18331832
datumsize[j], FALSE, FALSE);
18341833
isnullchar[j] = ' ';
18351834
compatt[j] = centry[j].key;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/gist/gistget.c,v 1.39 2003/11/29 19:51:39 pgsql Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/gist/gistget.c,v 1.40 2004/01/07 18:56:23 neilc Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -76,7 +76,7 @@ gistfirst(IndexScanDesc s, ScanDirection dir)
7676
while (n < FirstOffsetNumber || n > maxoff)
7777
{
7878
ReleaseBuffer(b);
79-
if (so->s_stack == (GISTSTACK *) NULL)
79+
if (so->s_stack == NULL)
8080
return false;
8181

8282
stk = so->s_stack;
@@ -158,7 +158,7 @@ gistnext(IndexScanDesc s, ScanDirection dir)
158158
while (n < FirstOffsetNumber || n > maxoff)
159159
{
160160
ReleaseBuffer(b);
161-
if (so->s_stack == (GISTSTACK *) NULL)
161+
if (so->s_stack == NULL)
162162
return false;
163163

164164
stk = so->s_stack;

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

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/gist/gistscan.c,v 1.50 2003/11/29 19:51:39 pgsql Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/gist/gistscan.c,v 1.51 2004/01/07 18:56:23 neilc Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -47,7 +47,7 @@ typedef struct GISTScanListData
4747
typedef GISTScanListData *GISTScanList;
4848

4949
/* pointer to list of local scans on GiSTs */
50-
static GISTScanList GISTScans = (GISTScanList) NULL;
50+
static GISTScanList GISTScans = NULL;
5151

5252
Datum
5353
gistbeginscan(PG_FUNCTION_ARGS)
@@ -79,19 +79,19 @@ gistrescan(PG_FUNCTION_ARGS)
7979
ItemPointerSetInvalid(&s->currentMarkData);
8080

8181
p = (GISTScanOpaque) s->opaque;
82-
if (p != (GISTScanOpaque) NULL)
82+
if (p != NULL)
8383
{
8484
/* rescan an existing indexscan --- reset state */
8585
gistfreestack(p->s_stack);
8686
gistfreestack(p->s_markstk);
87-
p->s_stack = p->s_markstk = (GISTSTACK *) NULL;
87+
p->s_stack = p->s_markstk = NULL;
8888
p->s_flags = 0x0;
8989
}
9090
else
9191
{
9292
/* initialize opaque data */
9393
p = (GISTScanOpaque) palloc(sizeof(GISTScanOpaqueData));
94-
p->s_stack = p->s_markstk = (GISTSTACK *) NULL;
94+
p->s_stack = p->s_markstk = NULL;
9595
p->s_flags = 0x0;
9696
s->opaque = p;
9797
p->giststate = (GISTSTATE *) palloc(sizeof(GISTSTATE));
@@ -137,11 +137,11 @@ gistmarkpos(PG_FUNCTION_ARGS)
137137
else
138138
p->s_flags &= ~GS_MRKBEFORE;
139139

140-
o = (GISTSTACK *) NULL;
140+
o = NULL;
141141
n = p->s_stack;
142142

143143
/* copy the parent stack from the current item data */
144-
while (n != (GISTSTACK *) NULL)
144+
while (n != NULL)
145145
{
146146
tmp = (GISTSTACK *) palloc(sizeof(GISTSTACK));
147147
tmp->gs_child = n->gs_child;
@@ -173,11 +173,11 @@ gistrestrpos(PG_FUNCTION_ARGS)
173173
else
174174
p->s_flags &= ~GS_CURBEFORE;
175175

176-
o = (GISTSTACK *) NULL;
176+
o = NULL;
177177
n = p->s_markstk;
178178

179179
/* copy the parent stack from the current item data */
180-
while (n != (GISTSTACK *) NULL)
180+
while (n != NULL)
181181
{
182182
tmp = (GISTSTACK *) palloc(sizeof(GISTSTACK));
183183
tmp->gs_child = n->gs_child;
@@ -201,7 +201,7 @@ gistendscan(PG_FUNCTION_ARGS)
201201

202202
p = (GISTScanOpaque) s->opaque;
203203

204-
if (p != (GISTScanOpaque) NULL)
204+
if (p != NULL)
205205
{
206206
gistfreestack(p->s_stack);
207207
gistfreestack(p->s_markstk);
@@ -233,18 +233,16 @@ gistdropscan(IndexScanDesc s)
233233
GISTScanList l;
234234
GISTScanList prev;
235235

236-
prev = (GISTScanList) NULL;
236+
prev = NULL;
237237

238-
for (l = GISTScans;
239-
l != (GISTScanList) NULL && l->gsl_scan != s;
240-
l = l->gsl_next)
238+
for (l = GISTScans; l != NULL && l->gsl_scan != s; l = l->gsl_next)
241239
prev = l;
242240

243-
if (l == (GISTScanList) NULL)
241+
if (l == NULL)
244242
elog(ERROR, "GiST scan list corrupted -- could not find 0x%p",
245243
(void *) s);
246244

247-
if (prev == (GISTScanList) NULL)
245+
if (prev == NULL)
248246
GISTScans = l->gsl_next;
249247
else
250248
prev->gsl_next = l->gsl_next;
@@ -280,7 +278,7 @@ gistadjscans(Relation rel, int op, BlockNumber blkno, OffsetNumber offnum)
280278
Oid relid;
281279

282280
relid = RelationGetRelid(rel);
283-
for (l = GISTScans; l != (GISTScanList) NULL; l = l->gsl_next)
281+
for (l = GISTScans; l != NULL; l = l->gsl_next)
284282
{
285283
if (l->gsl_scan->indexRelation->rd_id == relid)
286284
gistadjone(l->gsl_scan, op, blkno, offnum);
@@ -397,12 +395,10 @@ adjustiptr(IndexScanDesc s,
397395
* are looking at already in this transaction, we ignore the update
398396
* request.
399397
*/
400-
/*ARGSUSED*/
401398
static void
402-
adjuststack(GISTSTACK *stk,
403-
BlockNumber blkno)
399+
adjuststack(GISTSTACK *stk, BlockNumber blkno)
404400
{
405-
while (stk != (GISTSTACK *) NULL)
401+
while (stk != NULL)
406402
{
407403
if (stk->gs_blk == blkno)
408404
stk->gs_child = FirstOffsetNumber;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/hash/hash.c,v 1.69 2003/11/29 19:51:40 pgsql Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/hash/hash.c,v 1.70 2004/01/07 18:56:23 neilc Exp $
1212
*
1313
* NOTES
1414
* This file contains only the public interface routines.
@@ -180,7 +180,7 @@ hashinsert(PG_FUNCTION_ARGS)
180180
if (IndexTupleHasNulls(itup))
181181
{
182182
pfree(itup);
183-
PG_RETURN_POINTER((InsertIndexResult) NULL);
183+
PG_RETURN_POINTER(NULL);
184184
}
185185

186186
hitem = _hash_formitem(itup);

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/hash/hashscan.c,v 1.32 2003/11/29 19:51:40 pgsql Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/hash/hashscan.c,v 1.33 2004/01/07 18:56:23 neilc Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -26,7 +26,7 @@ typedef struct HashScanListData
2626

2727
typedef HashScanListData *HashScanList;
2828

29-
static HashScanList HashScans = (HashScanList) NULL;
29+
static HashScanList HashScans = NULL;
3030

3131

3232
/*
@@ -73,16 +73,16 @@ _hash_dropscan(IndexScanDesc scan)
7373
HashScanList chk,
7474
last;
7575

76-
last = (HashScanList) NULL;
76+
last = NULL;
7777
for (chk = HashScans;
78-
chk != (HashScanList) NULL && chk->hashsl_scan != scan;
78+
chk != NULL && chk->hashsl_scan != scan;
7979
chk = chk->hashsl_next)
8080
last = chk;
8181

82-
if (chk == (HashScanList) NULL)
82+
if (chk == NULL)
8383
elog(ERROR, "hash scan list trashed; can't find 0x%p", (void *) scan);
8484

85-
if (last == (HashScanList) NULL)
85+
if (last == NULL)
8686
HashScans = chk->hashsl_next;
8787
else
8888
last->hashsl_next = chk->hashsl_next;

0 commit comments

Comments
 (0)