Movatterモバイル変換

Skip to content

postgrespro/postgresproPublic

NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commit0e85abd

petere

committed

Clean up compiler warnings from unused variables with asserts disabled

For those variables only used when asserts are enabled, use a newmacro PG_USED_FOR_ASSERTS_ONLY, which expands to__attribute__((unused)) when asserts are not enabled.

1 parent621eb15 commit0e85abdCopy full SHA for 0e85abd

File tree

15 files changed

+29

-19

lines changed

src
- backend
  - access/hash
    - hashovfl.c
  - executor
  - libpq
    - be-fsstubs.c
    - pqcomm.c
  - optimizer/path
    - costsize.c
  - parser
    - analyze.c
  - storage
    - file
      - fd.c
    - lmgr
      - predicate.c
      - proc.c
  - utils/adt
    - selfuncs.c
- bin/psql
  - psqlscan.l
- include
  - c.h

15 files changed

+29

-19

lines changed

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ _hash_freeovflpage(Relation rel, Buffer ovflbuf,`
`391`	`391`	`uint32ovflbitno;`
`392`	`392`	`int32bitmappage,`
`393`	`393`	`bitmapbit;`
`394`		`-Bucketbucket;`
	`394`	`+BucketbucketPG_USED_FOR_ASSERTS_ONLY;`
`395`	`395`
`396`	`396`	`/* Get information from the doomed page */`
`397`	`397`	`_hash_checkpage(rel,ovflbuf,LH_OVERFLOW_PAGE);`

`‎src/backend/executor/execCurrent.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ execCurrentOf(CurrentOfExpr *cexpr,`
`151`	`151`	`{`
`152`	`152`	`ScanState*scanstate;`
`153`	`153`	`boollisnull;`
`154`		`-Oidtuple_tableoid;`
	`154`	`+Oidtuple_tableoidPG_USED_FOR_ASSERTS_ONLY;`
`155`	`155`	`ItemPointertuple_tid;`
`156`	`156`
`157`	`157`	`/*`

`‎src/backend/executor/nodeMaterial.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ ExecMaterial(MaterialState *node)`
`66`	`66`	`* Allocate a second read pointer to serve as the mark. We know it`
`67`	`67`	`* must have index 1, so needn't store that.`
`68`	`68`	`*/`
`69`		`-intptrno;`
	`69`	`+intptrnoPG_USED_FOR_ASSERTS_ONLY;`
`70`	`70`
`71`	`71`	`ptrno=tuplestore_alloc_read_pointer(tuplestorestate,`
`72`	`72`	`node->eflags);`

`‎src/backend/executor/nodeSetOp.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ setop_fill_hash_table(SetOpState *setopstate)`
`344`	`344`	`SetOpnode= (SetOp)setopstate->ps.plan;`
`345`	`345`	`PlanState*outerPlan;`
`346`	`346`	`intfirstFlag;`
`347`		`-boolin_first_rel;`
	`347`	`+boolin_first_relPG_USED_FOR_ASSERTS_ONLY;`
`348`	`348`
`349`	`349`	`/*`
`350`	`350`	`* get state info from node`

`‎src/backend/executor/nodeWorktablescan.c‎`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ static TupleTableSlot *`
`30`	`30`	`WorkTableScanNext(WorkTableScanState*node)`
`31`	`31`	`{`
`32`	`32`	`TupleTableSlot*slot;`
`33`		`-EState*estate;`
`34`	`33`	`Tuplestorestate*tuplestorestate;`
`35`	`34`
`36`	`35`	`/*`
`@@ -48,8 +47,7 @@ WorkTableScanNext(WorkTableScanState *node)`
`48`	`47`	`* worktable. Therefore, we don't need a private read pointer for the`
`49`	`48`	`* tuplestore, nor do we need to tell tuplestore_gettupleslot to copy.`
`50`	`49`	`*/`
`51`		`-estate=node->ss.ps.state;`
`52`		`-Assert(ScanDirectionIsForward(estate->es_direction));`
	`50`	`+Assert(ScanDirectionIsForward(node->ss.ps.state->es_direction));`
`53`	`51`
`54`	`52`	`tuplestorestate=node->rustate->working_table;`
`55`	`53`

`‎src/backend/libpq/be-fsstubs.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ lo_import_internal(text *filename, Oid lobjOid)`
`378`	`378`	`{`
`379`	`379`	`Filefd;`
`380`	`380`	`intnbytes,`
`381`		`-tmp;`
	`381`	`+tmpPG_USED_FOR_ASSERTS_ONLY;`
`382`	`382`	`charbuf[BUFSIZE];`
`383`	`383`	`charfnamebuf[MAXPGPATH];`
`384`	`384`	`LargeObjectDesc*lobj;`

`‎src/backend/libpq/pqcomm.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1373,7 +1373,7 @@ pq_putmessage(char msgtype, const char *s, size_t len)`
`1373`	`1373`	`void`
`1374`	`1374`	`pq_putmessage_noblock(charmsgtype,constchar*s,size_tlen)`
`1375`	`1375`	`{`
`1376`		`-intres;`
	`1376`	`+intresPG_USED_FOR_ASSERTS_ONLY;`
`1377`	`1377`	`intrequired;`
`1378`	`1378`
`1379`	`1379`	`/*`

`‎src/backend/optimizer/path/costsize.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3583,7 +3583,7 @@ void`
`3583`	`3583`	`set_subquery_size_estimates(PlannerInforoot,RelOptInforel)`
`3584`	`3584`	`{`
`3585`	`3585`	`PlannerInfo*subroot=rel->subroot;`
`3586`		`-RangeTblEntry*rte;`
	`3586`	`+RangeTblEntry*rtePG_USED_FOR_ASSERTS_ONLY;`
`3587`	`3587`	`ListCell*lc;`
`3588`	`3588`
`3589`	`3589`	`/* Should only be applied to base relations that are subqueries */`

`‎src/backend/parser/analyze.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1588,7 +1588,7 @@ transformSetOperationTree(ParseState pstate, SelectStmt stmt,`
`1588`	`1588`	`/* Process leaf SELECT */`
`1589`	`1589`	`Query*selectQuery;`
`1590`	`1590`	`charselectName[32];`
`1591`		`-RangeTblEntry*rte;`
	`1591`	`+RangeTblEntry*rtePG_USED_FOR_ASSERTS_ONLY;`
`1592`	`1592`	`RangeTblRef*rtr;`
`1593`	`1593`	`ListCell*tl;`
`1594`	`1594`

`‎src/backend/storage/file/fd.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -685,7 +685,7 @@ LruInsert(File file)`
`685`	`685`	`/* seek to the right position */`
`686`	`686`	`if (vfdP->seekPos!= (off_t)0)`
`687`	`687`	`{`
`688`		`-off_treturnValue;`
	`688`	`+off_treturnValuePG_USED_FOR_ASSERTS_ONLY;`
`689`	`689`
`690`	`690`	`returnValue=lseek(vfdP->fd,vfdP->seekPos,SEEK_SET);`
`691`	`691`	`Assert(returnValue!= (off_t)-1);`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp