NotificationsYou must be signed in to change notification settings
Fork28
Star153

Commit192ad63

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 necessarywhen (a) invoking a function AND either (b) the function has no prototypeOR (c) the function is a varargs function.

1 parentafca5d5 commit192ad63Copy full SHA for 192ad63

File tree

71 files changed

+424

-436

lines changed

src
- backend
  - access
    - common
      - printtup.c
    - gist
    - hash
      - hash.c
      - hashscan.c
    - heap
      - heapam.c
    - nbtree
    - rtree
    - transam
      - varsup.c
      - xact.c
  - bootstrap
    - bootparse.y
    - bootstrap.c
  - catalog
    - index.c
    - pg_type.c
  - commands
  - executor
  - nodes
    - readfuncs.c
  - optimizer
    - plan
      - createplan.c
    - util
      - tlist.c
  - parser
    - gram.y
    - parse_func.c
  - port
    - dynloader
    - sysv_shmem.c
  - postmaster
    - postmaster.c
  - storage
    - buffer
      - bufmgr.c
      - localbuf.c
    - lmgr
      - proc.c
    - smgr
      - md.c
      - mm.c
  - tcop
    - fastpath.c
  - utils
    - Gen_fmgrtab.sh
    - adt
    - fmgr
      - dfmgr.c
      - fmgr.c
- interfaces
  - ecpg/ecpglib
    - execute.c
  - libpgtcl
  - libpq
- pl
  - plpgsql/src
    - pl_comp.c
  - plpython
    - plpython.c
- test/examples
  - testlibpq4.c

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 number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`* Portions Copyright (c) 1994, Regents of the University of California`
`10`	`10`	`*`
`11`	`11`	`* 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 $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -509,7 +509,7 @@ debugStartup(DestReceiver *self, int operation, TupleDesc typeinfo)`
`509`	`509`	`* show the return type of the tuples`
`510`	`510`	`*/`
`511`	`511`	`for (i=0;i<natts;++i)`
`512`		`-printatt((unsigned)i+1,attinfo[i],(char*)NULL);`
	`512`	`+printatt((unsigned)i+1,attinfo[i],NULL);`
`513`	`513`	`printf("\t----\n");`
`514`	`514`	`}`
`515`	`515`

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

Lines changed: 19 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`	`10`	`* 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 $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -45,10 +45,10 @@`
`45`	`45`	`*/`
`46`	`46`	`#defineFILLITEM(evp,isnullkey,okey,okeyb,rkey,rkeyb) do { \`
`47`	`47`	`if ( isnullkey ) { \`
`48`		`-gistentryinit((evp), rkey, r,(Page)NULL , \`
	`48`	`+gistentryinit((evp), rkey, r, NULL, \`
`49`	`49`	`(OffsetNumber) 0, rkeyb, FALSE); \`
`50`	`50`	`} else { \`
`51`		`-gistentryinit((evp), okey, r,(Page)NULL, \`
	`51`	`+gistentryinit((evp), okey, r, NULL, \`
`52`	`52`	`(OffsetNumber) 0, okeyb, FALSE); \`
`53`	`53`	`} \`
`54`	`54`	`} while(0)`
`@@ -248,7 +248,7 @@ gistbuildCallback(Relation index,`
`248`	`248`	`else`
`249`	`249`	`{`
`250`	`250`	`gistcentryinit(&buildstate->giststate,i,&tmpcentry,attdata[i],`
`251`		`-(Relation)NULL, (Page)NULL, (OffsetNumber)0,`
	`251`	`+NULL,NULL, (OffsetNumber)0,`
`252`	`252`	`-1/* size is currently bogus */ , TRUE, FALSE);`
`253`	`253`	`if (attdata[i]!=tmpcentry.key&&`
`254`	`254`	`!(isAttByVal(&buildstate->giststate,i)))`
`@@ -332,7 +332,7 @@ gistinsert(PG_FUNCTION_ARGS)`
`332`	`332`	`else`
`333`	`333`	`{`
`334`	`334`	`gistcentryinit(&giststate,i,&tmpentry,datum[i],`
`335`		`-(Relation)NULL, (Page)NULL, (OffsetNumber)0,`
	`335`	`+NULL,NULL, (OffsetNumber)0,`
`336`	`336`	`-1/* size is currently bogus */ , TRUE, FALSE);`
`337`	`337`	`if (datum[i]!=tmpentry.key&& !(isAttByVal(&giststate,i)))`
`338`	`338`	`compvec[i]= TRUE;`
`@@ -695,7 +695,7 @@ gistunion(Relation r, IndexTuple itvec, int len, GISTSTATE giststate)`
`695`	`695`	`gistdentryinit(giststate,j,`
`696`	`696`	`&((GISTENTRY*)VARDATA(evec))[reallen],`
`697`	`697`	`datum,`
`698`		`-(Relation)NULL,(Page)NULL, (OffsetNumber)NULL,`
	`698`	`+NULL,NULL, (OffsetNumber)0,`
`699`	`699`	`ATTSIZE(datum,giststate->tupdesc,j+1,IsNull), FALSE,IsNull);`
`700`	`700`	`if ((!isAttByVal(giststate,j))&&`
`701`	`701`	`((GISTENTRY*)VARDATA(evec))[reallen].key!=datum)`
`@@ -717,7 +717,7 @@ gistunion(Relation r, IndexTuple itvec, int len, GISTSTATE giststate)`
`717`	`717`	`{`
`718`	`718`	`VARATT_SIZEP(evec)=2*sizeof(GISTENTRY)+VARHDRSZ;`
`719`	`719`	`gistentryinit(((GISTENTRY*)VARDATA(evec))[1],`
`720`		`-((GISTENTRY*)VARDATA(evec))[0].key,r,(Page)NULL,`
	`720`	`+((GISTENTRY*)VARDATA(evec))[0].key,r,NULL,`
`721`	`721`	`(OffsetNumber)0, ((GISTENTRY*)VARDATA(evec))[0].bytes, FALSE);`
`722`	`722`
`723`	`723`	`}`
`@@ -732,7 +732,7 @@ gistunion(Relation r, IndexTuple itvec, int len, GISTSTATE giststate)`
`732`	`732`	`pfree(DatumGetPointer(((GISTENTRY*)VARDATA(evec))[i].key));`
`733`	`733`
`734`	`734`	`gistcentryinit(giststate,j,&centry[j],datum,`
`735`		`-(Relation)NULL,(Page)NULL, (OffsetNumber)NULL,`
	`735`	`+NULL,NULL, (OffsetNumber)0,`
`736`	`736`	`datumsize, FALSE, FALSE);`
`737`	`737`	`isnull[j]=' ';`
`738`	`738`	`attr[j]=centry[j].key;`
`@@ -793,10 +793,10 @@ gistgetadjusted(Relation r, IndexTuple oldtup, IndexTuple addtup, GISTSTATE *gis`
`793`	`793`	`ev0p=&((GISTENTRY*)VARDATA(evec))[0];`
`794`	`794`	`ev1p=&((GISTENTRY*)VARDATA(evec))[1];`
`795`	`795`
`796`		`-gistDeCompressAtt(giststate,r,oldtup,(Page)NULL,`
	`796`	`+gistDeCompressAtt(giststate,r,oldtup,NULL,`
`797`	`797`	`(OffsetNumber)0,oldatt,olddec,oldisnull);`
`798`	`798`
`799`		`-gistDeCompressAtt(giststate,r,addtup,(Page)NULL,`
	`799`	`+gistDeCompressAtt(giststate,r,addtup,NULL,`
`800`	`800`	`(OffsetNumber)0,addatt,adddec,addisnull);`
`801`	`801`
`802`	`802`
`@@ -841,7 +841,7 @@ gistgetadjusted(Relation r, IndexTuple oldtup, IndexTuple addtup, GISTSTATE *gis`
`841`	`841`	`pfree(DatumGetPointer(addatt[j].key));`
`842`	`842`
`843`	`843`	`gistcentryinit(giststate,j,&centry[j],datum,`
`844`		`-(Relation)NULL,(Page)NULL, (OffsetNumber)NULL,`
	`844`	`+NULL,NULL, (OffsetNumber)0,`
`845`	`845`	`datumsize, FALSE, FALSE);`
`846`	`846`
`847`	`847`	`isnull[j]=' ';`
`@@ -929,8 +929,7 @@ gistunionsubkey(Relation r, GISTSTATE giststate, IndexTuple itvec, GIST_SPLITV`
`929`	`929`	`gistdentryinit(giststate,j,`
`930`	`930`	`&((GISTENTRY*)VARDATA(evec))[reallen],`
`931`	`931`	`datum,`
`932`		`- (Relation)NULL, (Page)NULL,`
`933`		`- (OffsetNumber)NULL,`
	`932`	`+NULL,NULL, (OffsetNumber)0,`
`934`	`933`	`ATTSIZE(datum,giststate->tupdesc,j+1,IsNull), FALSE,IsNull);`
`935`	`934`	`if ((!isAttByVal(giststate,j))&&`
`936`	`935`	`((GISTENTRY*)VARDATA(evec))[reallen].key!=datum)`
`@@ -1110,7 +1109,7 @@ gistadjsubkey(Relation r,`
`1110`	`1109`	`{`
`1111`	`1110`	`if (v->spl_idgrp[i+1]==0)/* already inserted */`
`1112`	`1111`	`continue;`
`1113`		`-gistDeCompressAtt(giststate,r,itup[i],(Page)NULL, (OffsetNumber)0,`
	`1112`	`+gistDeCompressAtt(giststate,r,itup[i],NULL, (OffsetNumber)0,`
`1114`	`1113`	`identry,decfree,isnull);`
`1115`	`1114`
`1116`	`1115`	`v->spl_ngrp[v->spl_idgrp[i+1]]--;`
`@@ -1127,12 +1126,12 @@ gistadjsubkey(Relation r,`
`1127`	`1126`	`/* where? */`
`1128`	`1127`	`for (j=1;j<r->rd_att->natts;j++)`
`1129`	`1128`	`{`
`1130`		`-gistentryinit(entry,v->spl_lattr[j],r,(Page)NULL,`
	`1129`	`+gistentryinit(entry,v->spl_lattr[j],r,NULL,`
`1131`	`1130`	`(OffsetNumber)0,v->spl_lattrsize[j], FALSE);`
`1132`	`1131`	`gistpenalty(giststate,j,&entry,v->spl_lisnull[j],`
`1133`	`1132`	`&identry[j],isnull[j],&lpenalty);`
`1134`	`1133`
`1135`		`-gistentryinit(entry,v->spl_rattr[j],r,(Page)NULL,`
	`1134`	`+gistentryinit(entry,v->spl_rattr[j],r,NULL,`
`1136`	`1135`	`(OffsetNumber)0,v->spl_rattrsize[j], FALSE);`
`1137`	`1136`	`gistpenalty(giststate,j,&entry,v->spl_risnull[j],`
`1138`	`1137`	`&identry[j],isnull[j],&rpenalty);`
`@@ -1486,7 +1485,7 @@ gistchoose(Relation r, Page p, IndexTuple it,/* it has compressed entry */`
`1486`	`1485`	`which=-1;`
`1487`	`1486`	`sum_grow=1;`
`1488`	`1487`	`gistDeCompressAtt(giststate,r,`
`1489`		`-it,(Page)NULL, (OffsetNumber)0,`
	`1488`	`+it,NULL, (OffsetNumber)0,`
`1490`	`1489`	`identry,decompvec,isnull);`
`1491`	`1490`
`1492`	`1491`	`for (i=FirstOffsetNumber;i <=maxoff&&sum_grow;i=OffsetNumberNext(i))`
`@@ -1530,7 +1529,7 @@ gistfreestack(GISTSTACK *s)`
`1530`	`1529`	`{`
`1531`	`1530`	`GISTSTACK*p;`
`1532`	`1531`
`1533`		`-while (s!=(GISTSTACK*)NULL)`
	`1532`	`+while (s!=NULL)`
`1534`	`1533`	`{`
`1535`	`1534`	`p=s->gs_parent;`
`1536`	`1535`	`pfree(s);`
`@@ -1609,7 +1608,7 @@ gistbulkdelete(PG_FUNCTION_ARGS)`
`1609`	`1608`	`*/`
`1610`	`1609`
`1611`	`1610`	`/* walk through the entire index */`
`1612`		`-iscan=index_beginscan(NULL,rel,SnapshotAny,0,(ScanKey)NULL);`
	`1611`	`+iscan=index_beginscan(NULL,rel,SnapshotAny,0,NULL);`
`1613`	`1612`	`/* including killed tuples */`
`1614`	`1613`	`iscan->ignore_killed_tuples= false;`
`1615`	`1614`
`@@ -1829,7 +1828,7 @@ gistFormTuple(GISTSTATE *giststate, Relation r,`
`1829`	`1828`	`else`
`1830`	`1829`	`{`
`1831`	`1830`	`gistcentryinit(giststate,j,&centry[j],attdata[j],`
`1832`		`-(Relation)NULL,(Page)NULL, (OffsetNumber)NULL,`
	`1831`	`+NULL,NULL, (OffsetNumber)0,`
`1833`	`1832`	`datumsize[j], FALSE, FALSE);`
`1834`	`1833`	`isnullchar[j]=' ';`
`1835`	`1834`	`compatt[j]=centry[j].key;`

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

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`	`10`	`* 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 $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -76,7 +76,7 @@ gistfirst(IndexScanDesc s, ScanDirection dir)`
`76`	`76`	`while (n<FirstOffsetNumber\|\|n>maxoff)`
`77`	`77`	`{`
`78`	`78`	`ReleaseBuffer(b);`
`79`		`-if (so->s_stack==(GISTSTACK*)NULL)`
	`79`	`+if (so->s_stack==NULL)`
`80`	`80`	`return false;`
`81`	`81`
`82`	`82`	`stk=so->s_stack;`
`@@ -158,7 +158,7 @@ gistnext(IndexScanDesc s, ScanDirection dir)`
`158`	`158`	`while (n<FirstOffsetNumber\|\|n>maxoff)`
`159`	`159`	`{`
`160`	`160`	`ReleaseBuffer(b);`
`161`		`-if (so->s_stack==(GISTSTACK*)NULL)`
	`161`	`+if (so->s_stack==NULL)`
`162`	`162`	`return false;`
`163`	`163`
`164`	`164`	`stk=so->s_stack;`

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

Lines changed: 17 additions & 21 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`	`10`	`* 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 $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -47,7 +47,7 @@ typedef struct GISTScanListData`
`47`	`47`	`typedefGISTScanListData*GISTScanList;`
`48`	`48`
`49`	`49`	`/* pointer to list of local scans on GiSTs */`
`50`		`-staticGISTScanListGISTScans=(GISTScanList)NULL;`
	`50`	`+staticGISTScanListGISTScans=NULL;`
`51`	`51`
`52`	`52`	`Datum`
`53`	`53`	`gistbeginscan(PG_FUNCTION_ARGS)`
`@@ -79,19 +79,19 @@ gistrescan(PG_FUNCTION_ARGS)`
`79`	`79`	`ItemPointerSetInvalid(&s->currentMarkData);`
`80`	`80`
`81`	`81`	`p= (GISTScanOpaque)s->opaque;`
`82`		`-if (p!=(GISTScanOpaque)NULL)`
	`82`	`+if (p!=NULL)`
`83`	`83`	`{`
`84`	`84`	`/* rescan an existing indexscan --- reset state */`
`85`	`85`	`gistfreestack(p->s_stack);`
`86`	`86`	`gistfreestack(p->s_markstk);`
`87`		`-p->s_stack=p->s_markstk=(GISTSTACK*)NULL;`
	`87`	`+p->s_stack=p->s_markstk=NULL;`
`88`	`88`	`p->s_flags=0x0;`
`89`	`89`	`}`
`90`	`90`	`else`
`91`	`91`	`{`
`92`	`92`	`/* initialize opaque data */`
`93`	`93`	`p= (GISTScanOpaque)palloc(sizeof(GISTScanOpaqueData));`
`94`		`-p->s_stack=p->s_markstk=(GISTSTACK*)NULL;`
	`94`	`+p->s_stack=p->s_markstk=NULL;`
`95`	`95`	`p->s_flags=0x0;`
`96`	`96`	`s->opaque=p;`
`97`	`97`	`p->giststate= (GISTSTATE*)palloc(sizeof(GISTSTATE));`
`@@ -137,11 +137,11 @@ gistmarkpos(PG_FUNCTION_ARGS)`
`137`	`137`	`else`
`138`	`138`	`p->s_flags &= ~GS_MRKBEFORE;`
`139`	`139`
`140`		`-o=(GISTSTACK*)NULL;`
	`140`	`+o=NULL;`
`141`	`141`	`n=p->s_stack;`
`142`	`142`
`143`	`143`	`/* copy the parent stack from the current item data */`
`144`		`-while (n!=(GISTSTACK*)NULL)`
	`144`	`+while (n!=NULL)`
`145`	`145`	`{`
`146`	`146`	`tmp= (GISTSTACK*)palloc(sizeof(GISTSTACK));`
`147`	`147`	`tmp->gs_child=n->gs_child;`
`@@ -173,11 +173,11 @@ gistrestrpos(PG_FUNCTION_ARGS)`
`173`	`173`	`else`
`174`	`174`	`p->s_flags &= ~GS_CURBEFORE;`
`175`	`175`
`176`		`-o=(GISTSTACK*)NULL;`
	`176`	`+o=NULL;`
`177`	`177`	`n=p->s_markstk;`
`178`	`178`
`179`	`179`	`/* copy the parent stack from the current item data */`
`180`		`-while (n!=(GISTSTACK*)NULL)`
	`180`	`+while (n!=NULL)`
`181`	`181`	`{`
`182`	`182`	`tmp= (GISTSTACK*)palloc(sizeof(GISTSTACK));`
`183`	`183`	`tmp->gs_child=n->gs_child;`
`@@ -201,7 +201,7 @@ gistendscan(PG_FUNCTION_ARGS)`
`201`	`201`
`202`	`202`	`p= (GISTScanOpaque)s->opaque;`
`203`	`203`
`204`		`-if (p!=(GISTScanOpaque)NULL)`
	`204`	`+if (p!=NULL)`
`205`	`205`	`{`
`206`	`206`	`gistfreestack(p->s_stack);`
`207`	`207`	`gistfreestack(p->s_markstk);`
`@@ -233,18 +233,16 @@ gistdropscan(IndexScanDesc s)`
`233`	`233`	`GISTScanListl;`
`234`	`234`	`GISTScanListprev;`
`235`	`235`
`236`		`-prev=(GISTScanList)NULL;`
	`236`	`+prev=NULL;`
`237`	`237`
`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)`
`241`	`239`	`prev=l;`
`242`	`240`
`243`		`-if (l==(GISTScanList)NULL)`
	`241`	`+if (l==NULL)`
`244`	`242`	`elog(ERROR,"GiST scan list corrupted -- could not find 0x%p",`
`245`	`243`	`(void*)s);`
`246`	`244`
`247`		`-if (prev==(GISTScanList)NULL)`
	`245`	`+if (prev==NULL)`
`248`	`246`	`GISTScans=l->gsl_next;`
`249`	`247`	`else`
`250`	`248`	`prev->gsl_next=l->gsl_next;`
`@@ -280,7 +278,7 @@ gistadjscans(Relation rel, int op, BlockNumber blkno, OffsetNumber offnum)`
`280`	`278`	`Oidrelid;`
`281`	`279`
`282`	`280`	`relid=RelationGetRelid(rel);`
`283`		`-for (l=GISTScans;l!=(GISTScanList)NULL;l=l->gsl_next)`
	`281`	`+for (l=GISTScans;l!=NULL;l=l->gsl_next)`
`284`	`282`	`{`
`285`	`283`	`if (l->gsl_scan->indexRelation->rd_id==relid)`
`286`	`284`	`gistadjone(l->gsl_scan,op,blkno,offnum);`
`@@ -397,12 +395,10 @@ adjustiptr(IndexScanDesc s,`
`397`	`395`	`*are looking at already in this transaction, we ignore the update`
`398`	`396`	`*request.`
`399`	`397`	`*/`
`400`		`-/ARGSUSED/`
`401`	`398`	`staticvoid`
`402`		`-adjuststack(GISTSTACK*stk,`
`403`		`-BlockNumberblkno)`
	`399`	`+adjuststack(GISTSTACK*stk,BlockNumberblkno)`
`404`	`400`	`{`
`405`		`-while (stk!=(GISTSTACK*)NULL)`
	`401`	`+while (stk!=NULL)`
`406`	`402`	`{`
`407`	`403`	`if (stk->gs_blk==blkno)`
`408`	`404`	`stk->gs_child=FirstOffsetNumber;`

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

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* 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 $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* This file contains only the public interface routines.`
`@@ -180,7 +180,7 @@ hashinsert(PG_FUNCTION_ARGS)`
`180`	`180`	`if (IndexTupleHasNulls(itup))`
`181`	`181`	`{`
`182`	`182`	`pfree(itup);`
`183`		`-PG_RETURN_POINTER((InsertIndexResult)NULL);`
	`183`	`+PG_RETURN_POINTER(NULL);`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`hitem=_hash_formitem(itup);`

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

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* 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 $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -26,7 +26,7 @@ typedef struct HashScanListData`
`26`	`26`
`27`	`27`	`typedefHashScanListData*HashScanList;`
`28`	`28`
`29`		`-staticHashScanListHashScans=(HashScanList)NULL;`
	`29`	`+staticHashScanListHashScans=NULL;`
`30`	`30`
`31`	`31`
`32`	`32`	`/*`
`@@ -73,16 +73,16 @@ _hash_dropscan(IndexScanDesc scan)`
`73`	`73`	`HashScanListchk,`
`74`	`74`	`last;`
`75`	`75`
`76`		`-last=(HashScanList)NULL;`
	`76`	`+last=NULL;`
`77`	`77`	`for (chk=HashScans;`
`78`		`-chk!=(HashScanList)NULL&&chk->hashsl_scan!=scan;`
	`78`	`+chk!=NULL&&chk->hashsl_scan!=scan;`
`79`	`79`	`chk=chk->hashsl_next)`
`80`	`80`	`last=chk;`
`81`	`81`
`82`		`-if (chk==(HashScanList)NULL)`
	`82`	`+if (chk==NULL)`
`83`	`83`	`elog(ERROR,"hash scan list trashed; can't find 0x%p", (void*)scan);`
`84`	`84`
`85`		`-if (last==(HashScanList)NULL)`
	`85`	`+if (last==NULL)`
`86`	`86`	`HashScans=chk->hashsl_next;`
`87`	`87`	`else`
`88`	`88`	`last->hashsl_next=chk->hashsl_next;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit192ad63

File tree

71 files changed

Some content is hidden

71 files changed

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

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

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

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

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

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

0 commit comments