NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit9322950

committed

Cleanup of source files where 'return' or 'var =' is alone on a line.

1 parent3982368 commit9322950Copy full SHA for 9322950

File tree

101 files changed

+422

-743

lines changed

src
- backend
  - access
    - common
      - heaptuple.c
      - tupdesc.c
    - hash
      - hash.c
      - hashovfl.c
    - index
      - istrat.c
    - nbtree
    - rtree
      - rtscan.c
    - transam
  - bootstrap
    - bootstrap.c
  - catalog
  - commands
  - executor
  - libpq
    - portalbuf.c
  - nodes
    - copyfuncs.c
    - readfuncs.c
  - optimizer
  - parser
  - port
    - snprintf.c
  - rewrite
  - storage
    - buffer
      - bufmgr.c
      - localbuf.c
    - file
      - fd.c
    - ipc
      - shmem.c
    - large_object
      - inv_api.c
  - utils
    - adt
    - cache
    - fmgr
      - fmgr.c
    - hash
      - dynahash.c
    - mmgr
      - portalmem.c
    - sort
      - psort.c
- bin/psql
  - psql.c
- interfaces
  - ecpg/preproc
    - type.c
  - libpq
    - fe-print.c
  - odbc
    - setup.c
- pl/plpgsql/src
  - pl_exec.c
- test/regress
  - regress.c

Some content is hidden

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

101 files changed

+422

-743

lines changed

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

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.47 1999/01/24 22:53:25 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.48 1999/02/03 21:15:27 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* The old interface functions have been converted to macros`
`@@ -759,8 +759,7 @@ heap_modifytuple(HeapTuple tuple,`
`759`	`759`
`760`	`760`	`if (repl[attoff]==' ')`
`761`	`761`	`{`
`762`		`-value[attoff]=`
`763`		`-heap_getattr(tuple,`
	`762`	`+value[attoff]=heap_getattr(tuple,`
`764`	`763`	`AttrOffsetGetAttrNumber(attoff),`
`765`	`764`	`RelationGetDescr(relation),`
`766`	`765`	`&isNull);`

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

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.46 1998/12/14 05:18:30 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.47 1999/02/03 21:15:27 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* some of the executor utility code such as "ExecTypeFromTL" should be`
`@@ -115,8 +115,7 @@ CreateTupleDescCopy(TupleDesc tupdesc)`
`115`	`115`	`desc->attrs= (Form_pg_attribute*)palloc(size);`
`116`	`116`	`for (i=0;i<desc->natts;i++)`
`117`	`117`	`{`
`118`		`-desc->attrs[i]=`
`119`		`-(Form_pg_attribute)palloc(ATTRIBUTE_TUPLE_SIZE);`
	`118`	`+desc->attrs[i]= (Form_pg_attribute)palloc(ATTRIBUTE_TUPLE_SIZE);`
`120`	`119`	`memmove(desc->attrs[i],`
`121`	`120`	`tupdesc->attrs[i],`
`122`	`121`	`ATTRIBUTE_TUPLE_SIZE);`
`@@ -150,8 +149,7 @@ CreateTupleDescCopyConstr(TupleDesc tupdesc)`
`150`	`149`	`desc->attrs= (Form_pg_attribute*)palloc(size);`
`151`	`150`	`for (i=0;i<desc->natts;i++)`
`152`	`151`	`{`
`153`		`-desc->attrs[i]=`
`154`		`-(Form_pg_attribute)palloc(ATTRIBUTE_TUPLE_SIZE);`
	`152`	`+desc->attrs[i]= (Form_pg_attribute)palloc(ATTRIBUTE_TUPLE_SIZE);`
`155`	`153`	`memmove(desc->attrs[i],`
`156`	`154`	`tupdesc->attrs[i],`
`157`	`155`	`ATTRIBUTE_TUPLE_SIZE);`

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

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.23 1998/11/27 19:51:31 vadim Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.24 1999/02/03 21:15:28 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* This file contains only the public interface routines.`
`@@ -485,8 +485,7 @@ hashrestrpos(IndexScanDesc scan)`
`485`	`485`	`/* bump lock on currentMarkData and copy to currentItemData */`
`486`	`486`	`if (ItemPointerIsValid(&(scan->currentMarkData)))`
`487`	`487`	`{`
`488`		`-so->hashso_curbuf=`
`489`		`-_hash_getbuf(scan->relation,`
	`488`	`+so->hashso_curbuf=_hash_getbuf(scan->relation,`
`490`	`489`	`BufferGetBlockNumber(so->hashso_mrkbuf),`
`491`	`490`	`HASH_READ);`
`492`	`491`

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

Lines changed: 4 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.18 1998/10/04 20:19:08 tgl Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.19 1999/02/03 21:15:28 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* Overflow pages look like ordinary relation pages.`
`@@ -336,8 +336,7 @@ _hash_freeovflpage(Relation rel, Buffer ovflbuf)`
`336`	`336`	`{`
`337`	`337`	`Bufferprevbuf=_hash_getbuf(rel,prevblkno,HASH_WRITE);`
`338`	`338`	`Pageprevpage=BufferGetPage(prevbuf);`
`339`		`-HashPageOpaqueprevopaque=`
`340`		`-(HashPageOpaque)PageGetSpecialPointer(prevpage);`
	`339`	`+HashPageOpaqueprevopaque= (HashPageOpaque)PageGetSpecialPointer(prevpage);`
`341`	`340`
`342`	`341`	`_hash_checkpage(prevpage,LH_BUCKET_PAGE \|LH_OVERFLOW_PAGE);`
`343`	`342`	`Assert(prevopaque->hasho_bucket==bucket);`
`@@ -348,8 +347,7 @@ _hash_freeovflpage(Relation rel, Buffer ovflbuf)`
`348`	`347`	`{`
`349`	`348`	`Buffernextbuf=_hash_getbuf(rel,nextblkno,HASH_WRITE);`
`350`	`349`	`Pagenextpage=BufferGetPage(nextbuf);`
`351`		`-HashPageOpaquenextopaque=`
`352`		`-(HashPageOpaque)PageGetSpecialPointer(nextpage);`
	`350`	`+HashPageOpaquenextopaque= (HashPageOpaque)PageGetSpecialPointer(nextpage);`
`353`	`351`
`354`	`352`	`_hash_checkpage(nextpage,LH_OVERFLOW_PAGE);`
`355`	`353`	`Assert(nextopaque->hasho_bucket==bucket);`
`@@ -363,8 +361,7 @@ _hash_freeovflpage(Relation rel, Buffer ovflbuf)`
`363`	`361`	`* element hashm_mapp[bitmappage].`
`364`	`362`	`*/`
`365`	`363`	`splitnum= (addr >>SPLITSHIFT);`
`366`		`-ovflpgno=`
`367`		`-(splitnum ?metap->SPARES[splitnum-1] :0)+ (addr&SPLITMASK)-1;`
	`364`	`+ovflpgno= (splitnum ?metap->SPARES[splitnum-1] :0)+ (addr&SPLITMASK)-1;`
`368`	`365`
`369`	`366`	`if (ovflpgno<metap->LAST_FREED)`
`370`	`367`	`metap->LAST_FREED=ovflpgno;`

`‎src/backend/access/index/istrat.c`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.29 1998/09/23 04:21:57 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.30 1999/02/0321:15:30 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -293,8 +293,7 @@ RelationGetStrategy(Relation relation,`
`293`	`293`	`Assert(StrategyEvaluationIsValid(evaluation));`
`294`	`294`	`Assert(RegProcedureIsValid(procedure));`
`295`	`295`
`296`		`-strategyMap=`
`297`		`-IndexStrategyGetStrategyMap(RelationGetIndexStrategy(relation),`
	`296`	`+strategyMap=IndexStrategyGetStrategyMap(RelationGetIndexStrategy(relation),`
`298`	`297`	`evaluation->maxStrategy,`
`299`	`298`	`attributeNumber);`
`300`	`299`

`‎src/backend/access/nbtree/nbtinsert.c`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.33 1999/01/29 09:22:52 vadim Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.34 1999/02/03 21:15:32 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -1200,8 +1200,7 @@ _bt_pgaddtup(Relation rel,`
`1200`	`1200`
`1201`	`1201`	`do`
`1202`	`1202`	`{`
`1203`		`-chkitem=`
`1204`		`-(BTItem)PageGetItem(page,PageGetItemId(page,itup_off));`
	`1203`	`+chkitem= (BTItem)PageGetItem(page,PageGetItemId(page,itup_off));`
`1205`	`1204`	`itup_off=OffsetNumberNext(itup_off);`
`1206`	`1205`	`}while (!BTItemSame(chkitem,afteritem));`
`1207`	`1206`	`}`

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

Lines changed: 6 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*`
`6`	`6`	`*`
`7`	`7`	`* IDENTIFICATION`
`8`		`- * $Id: nbtsort.c,v 1.34 1999/01/17 06:18:12 momjian Exp $`
	`8`	`+ * $Id: nbtsort.c,v 1.35 1999/02/03 21:15:36 momjian Exp $`
`9`	`9`	`*`
`10`	`10`	`* NOTES`
`11`	`11`	`*`
`@@ -559,20 +559,16 @@ _bt_spoolinit(Relation index, int ntapes, bool isunique)`
`559`	`559`	`btspool->bts_tape=0;`
`560`	`560`	`btspool->isunique=isunique;`
`561`	`561`
`562`		`-btspool->bts_itape=`
`563`		`-(BTTapeBlock*)palloc(sizeof(BTTapeBlock)*ntapes);`
`564`		`-btspool->bts_otape=`
`565`		`-(BTTapeBlock*)palloc(sizeof(BTTapeBlock)*ntapes);`
	`562`	`+btspool->bts_itape=(BTTapeBlock*)palloc(sizeof(BTTapeBlock)*ntapes);`
	`563`	`+btspool->bts_otape=(BTTapeBlock*)palloc(sizeof(BTTapeBlock)*ntapes);`
`566`	`564`	`if (btspool->bts_itape== (BTTapeBlock**)NULL\|\|`
`567`	`565`	`btspool->bts_otape== (BTTapeBlock**)NULL)`
`568`	`566`	`elog(ERROR,"_bt_spoolinit: out of memory");`
`569`	`567`
`570`	`568`	`for (i=0;i<ntapes;++i)`
`571`	`569`	`{`
`572`		`-btspool->bts_itape[i]=`
`573`		`-_bt_tapecreate(mktemp(strcpy(fname,TAPETEMP)));`
`574`		`-btspool->bts_otape[i]=`
`575`		`-_bt_tapecreate(mktemp(strcpy(fname,TAPETEMP)));`
	`570`	`+btspool->bts_itape[i]=_bt_tapecreate(mktemp(strcpy(fname,TAPETEMP)));`
	`571`	`+btspool->bts_otape[i]=_bt_tapecreate(mktemp(strcpy(fname,TAPETEMP)));`
`576`	`572`	`}`
`577`	`573`	`pfree((void*)fname);`
`578`	`574`
`@@ -698,8 +694,7 @@ _bt_spool(Relation index, BTItem btitem, void *spool)`
`698`	`694`	`*/`
`699`	`695`	`if (it_ntup>0)`
`700`	`696`	`{`
`701`		`-parray=`
`702`		`-(BTSortKey)palloc(it_ntupsizeof(BTSortKey));`
	`697`	`+parray= (BTSortKey)palloc(it_ntupsizeof(BTSortKey));`
`703`	`698`	`pos=itape->bttb_data;`
`704`	`699`	`for (i=0;i<it_ntup;++i)`
`705`	`700`	`_bt_setsortkey(index,_bt_tapenext(itape,&pos),&(parray[i]));`

`‎src/backend/access/nbtree/nbtutils.c`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.23 1998/09/07 05:35:34 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.24 1999/02/03 21:15:36 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -258,8 +258,7 @@ _bt_orderkeys(Relation relation, BTScanOpaque so)`
`258`	`258`	`if (init[j])`
`259`	`259`	`{`
`260`	`260`	`/* yup, use the appropriate value */`
`261`		`-test=`
`262`		`-(long)FMGR_PTR2(&cur->sk_func,cur->sk_argument,xform[j].sk_argument);`
	`261`	`+test= (long)FMGR_PTR2(&cur->sk_func,cur->sk_argument,xform[j].sk_argument);`
`263`	`262`	`if (test)`
`264`	`263`	`xform[j].sk_argument=cur->sk_argument;`
`265`	`264`	`elseif (j== (BTEqualStrategyNumber-1))`

`‎src/backend/access/rtree/rtscan.c`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.20 1998/12/15 12:45:29 vadim Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.21 1999/02/03 21:15:37 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -141,8 +141,7 @@ rtrescan(IndexScanDesc s, bool fromEnd, ScanKey key)`
`141`	`141`	`s->opaque=p;`
`142`	`142`	`if (s->numberOfKeys>0)`
`143`	`143`	`{`
`144`		`-p->s_internalKey=`
`145`		`-(ScanKey)palloc(sizeof(ScanKeyData)*s->numberOfKeys);`
	`144`	`+p->s_internalKey= (ScanKey)palloc(sizeof(ScanKeyData)*s->numberOfKeys);`
`146`	`145`
`147`	`146`	`/*`
`148`	`147`	`* Scans on internal pages use different operators than they`

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

Lines changed: 4 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.21 1998/12/16 11:53:44 vadim Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.22 1999/02/03 21:15:41 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* This file contains the high level access-method interface to the`
`@@ -497,8 +497,7 @@ TransactionIdDidCommit(TransactionId transactionId)`
`497`	`497`	`if (AMI_OVERRIDE)`
`498`	`498`	`return true;`
`499`	`499`
`500`		`-return`
`501`		`-TransactionLogTest(transactionId,XID_COMMIT);`
	`500`	`+returnTransactionLogTest(transactionId,XID_COMMIT);`
`502`	`501`	`}`
`503`	`502`
`504`	`503`	`/*`
`@@ -515,8 +514,7 @@ TransactionIdDidAbort(TransactionId transactionId)`
`515`	`514`	`if (AMI_OVERRIDE)`
`516`	`515`	`return false;`
`517`	`516`
`518`		`-return`
`519`		`-TransactionLogTest(transactionId,XID_ABORT);`
	`517`	`+returnTransactionLogTest(transactionId,XID_ABORT);`
`520`	`518`	`}`
`521`	`519`
`522`	`520`	`/*`
`@@ -532,8 +530,7 @@ TransactionIdIsInProgress(TransactionId transactionId)`
`532`	`530`	`if (AMI_OVERRIDE)`
`533`	`531`	`return false;`
`534`	`532`
`535`		`-return`
`536`		`-TransactionLogTest(transactionId, XID_INPROGRESS);`
	`533`	`+return TransactionLogTest(transactionId, XID_INPROGRESS);`
`537`	`534`	`}`
`538`	`535`	`*/`
`539`	`536`

`‎src/backend/access/transam/transsup.c`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.18 1998/12/15 12:45:33 vadim Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.19 1999/02/03 21:15:45 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* This file contains support functions for the high`
`@@ -315,8 +315,7 @@ TransBlockNumberGetXidStatus(Relation relation,`
`315`	`315`	`LockBuffer(buffer,BUFFER_LOCK_UNLOCK);`
`316`	`316`	`ReleaseBuffer(buffer);`
`317`	`317`
`318`		`-return`
`319`		`-xstatus;`
	`318`	`+returnxstatus;`
`320`	`319`	`}`
`321`	`320`
`322`	`321`	`/* --------------------------------`

`‎src/backend/access/transam/xact.c`

Lines changed: 5 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.30 1999/02/02 03:44:00 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.31 1999/02/03 21:15:45 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`*Transaction aborts can now occur two ways:`
`@@ -191,8 +191,7 @@ TransactionStateData CurrentTransactionStateData = {`
`191`	`191`	`TBLOCK_DEFAULT/* transaction block state */`
`192`	`192`	`};`
`193`	`193`
`194`		`-TransactionStateCurrentTransactionState=`
`195`		`-&CurrentTransactionStateData;`
	`194`	`+TransactionStateCurrentTransactionState=&CurrentTransactionStateData;`
`196`	`195`
`197`	`196`	`intDefaultXactIsoLevel=XACT_READ_COMMITTED;`
`198`	`197`	`intXactIsoLevel;`
`@@ -467,8 +466,7 @@ CommandIdIsCurrentCommandId(CommandId cid)`
`467`	`466`	`if (AMI_OVERRIDE)`
`468`	`467`	`return false;`
`469`	`468`
`470`		`-return`
`471`		`-(cid==s->commandId) ? true : false;`
	`469`	`+return (cid==s->commandId) ? true : false;`
`472`	`470`	`}`
`473`	`471`
`474`	`472`	`bool`
`@@ -479,8 +477,7 @@ CommandIdGEScanCommandId(CommandId cid)`
`479`	`477`	`if (AMI_OVERRIDE)`
`480`	`478`	`return false;`
`481`	`479`
`482`		`-return`
`483`		`-(cid >=s->scanCommandId) ? true : false;`
	`480`	`+return (cid >=s->scanCommandId) ? true : false;`
`484`	`481`	`}`
`485`	`482`
`486`	`483`
`@@ -511,8 +508,7 @@ CommandCounterIncrement()`
`511`	`508`	`elog(ERROR,"You may only have 2^32-1 commands per transaction");`
`512`	`509`	`}`
`513`	`510`
`514`		`-CurrentTransactionStateData.scanCommandId=`
`515`		`-CurrentTransactionStateData.commandId;`
	`511`	`+CurrentTransactionStateData.scanCommandId=CurrentTransactionStateData.commandId;`
`516`	`512`
`517`	`513`	`/* make cache changes visible to me */`
`518`	`514`	`AtCommit_Cache();`

`‎src/backend/bootstrap/bootstrap.c`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.53 1999/01/17 06:18:14 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.54 1999/02/03 21:15:46 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -855,8 +855,7 @@ gettype(char *type)`
`855`	`855`	`staticForm_pg_attribute/* XXX */`
`856`	`856`	`AllocateAttribute()`
`857`	`857`	`{`
`858`		`-Form_pg_attributeattribute=`
`859`		`-(Form_pg_attribute)malloc(ATTRIBUTE_TUPLE_SIZE);`
	`858`	`+Form_pg_attributeattribute= (Form_pg_attribute)malloc(ATTRIBUTE_TUPLE_SIZE);`
`860`	`859`
`861`	`860`	`if (!PointerIsValid(attribute))`
`862`	`861`	`elog(FATAL,"AllocateAttribute: malloc failed");`

`‎src/backend/catalog/heap.c`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.71 1999/02/02 03:44:08 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.72 1999/02/03 21:15:54 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* INTERFACE ROUTINES`
`@@ -130,8 +130,7 @@ static FormData_pg_attribute a6 = {`
`130`	`130`	`MaxCommandIdAttributeNumber,0,-1,-1,'\001','\0','i','\0','\0'`
`131`	`131`	`};`
`132`	`132`
`133`		`-staticForm_pg_attributeHeapAtt[]=`
`134`		`-{&a1,&a2,&a3,&a4,&a5,&a6};`
	`133`	`+staticForm_pg_attributeHeapAtt[]= {&a1,&a2,&a3,&a4,&a5,&a6};`
`135`	`134`
`136`	`135`	`/* ----------------------------------------------------------------`
`137`	`136`	`*XXX END OF UGLY HARD CODED BADNESS XXX`

`‎src/backend/catalog/index.c`

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.68 1999/02/02 03:44:13 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.69 1999/02/03 21:15:54 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* INTERFACE ROUTINES`
`@@ -436,8 +436,7 @@ ConstructIndexReldesc(Relation indexRelation, Oid amoid)`
`436`	`436`
`437`	`437`	`oldcxt=MemoryContextSwitchTo((MemoryContext)CacheCxt);`
`438`	`438`
`439`		`-indexRelation->rd_am=`
`440`		`-AccessMethodObjectIdGetForm(amoid);`
	`439`	`+indexRelation->rd_am=AccessMethodObjectIdGetForm(amoid);`
`441`	`440`
`442`	`441`	`MemoryContextSwitchTo(oldcxt);`
`443`	`442`
`@@ -802,8 +801,7 @@ UpdateIndexPredicate(Oid indexoid, Node oldPred, Node predicate)`
`802`	`801`	`newPred=NULL;`
`803`	`802`	`if (predicate!=NULL)`
`804`	`803`	`{`
`805`		`-newPred=`
`806`		`-(Node)make_orclause(lcons(make_andclause((List)predicate),`
	`804`	`+newPred= (Node)make_orclause(lcons(make_andclause((List)predicate),`
`807`	`805`	`lcons(make_andclause((List*)oldPred),`
`808`	`806`	`NIL)));`
`809`	`807`	`newPred= (Node)cnfify((Expr)newPred, true);`

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!

Commit9322950

File tree

101 files changed

Some content is hidden

101 files changed

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

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

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

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

`‎src/backend/access/index/istrat.c`

`‎src/backend/access/nbtree/nbtinsert.c`

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

`‎src/backend/access/nbtree/nbtutils.c`

`‎src/backend/access/rtree/rtscan.c`

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

`‎src/backend/access/transam/transsup.c`

`‎src/backend/access/transam/xact.c`

`‎src/backend/bootstrap/bootstrap.c`

`‎src/backend/catalog/heap.c`

`‎src/backend/catalog/index.c`

0 commit comments