NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit6bd323c

committed

Remove un-needed braces around single statements.

1 parent27db9ec commit6bd323cCopy full SHA for 6bd323c

File tree

224 files changed

+220

-2503

lines changed

contrib
- array
  - array_iterator.c
- datetime
  - datetime_functions.c
- string
  - string_io.c
src
- backend
  - access
    - common
    - gist
    - hash
    - heap
      - heapam.c
    - index
      - genam.c
      - istrat.c
    - nbtree
    - rtree
    - transam
      - xact.c
  - bootstrap
    - bootstrap.c
  - catalog
  - commands
    - _deadcode
      - version.c
    - async.c
    - command.c
    - copy.c
    - creatinh.c
    - dbcommands.c
    - defind.c
    - define.c
    - proclang.c
    - recipe.c
    - remove.c
    - sequence.c
    - trigger.c
    - vacuum.c
    - variable.c
    - view.c
  - executor
  - lib
  - libpq
  - main
    - main.c
  - nodes
  - optimizer
  - parser
  - port
    - dynloader
    - strcasecmp.c
  - postmaster
    - postmaster.c
  - regex
    - engine.c
    - regcomp.c
  - rewrite
  - storage
    - buffer
    - file
      - fd.c
    - ipc
    - large_object
      - inv_api.c
    - lmgr
    - page
      - bufpage.c
    - smgr
      - md.c
  - tcop
  - tioga
    - Varray.c
    - tgRecipe.c
  - utils
    - adt
    - cache
    - error
      - elog.c
    - fmgr
      - dfmgr.c
      - fmgr.c
    - hash
      - dynahash.c
    - init
      - findbe.c
      - postinit.c
    - misc
      - database.c
    - mmgr
    - sort
      - psort.c
    - time
      - tqual.c
- bin
  - pg_dump
    - common.c
    - pg_dump.c
  - pg_id
    - pg_id.c
  - pgtclsh
    - pgtclAppInit.c
    - pgtkAppInit.c
  - psql
    - psql.c
- interfaces
  - ecpg
    - lib
      - ecpglib.c
    - preproc
      - type.c
  - libpgtcl
    - pgtclCmds.c
  - libpq
- pl/tcl
  - pltcl.c
- test/examples

Some content is hidden

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

224 files changed

+220

-2503

lines changed

`‎contrib/array/array_iterator.c`

Lines changed: 0 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -104,38 +104,26 @@ array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value)`
`104`	`104`	`{`
`105`	`105`	`result= (int) (*proc_fn) (p,value);`
`106`	`106`	`if (typlen>0)`
`107`		`-{`
`108`	`107`	`p+=typlen;`
`109`		`-}`
`110`	`108`	`else`
`111`		`-{`
`112`	`109`	`p+=INTALIGN((int32)p);`
`113`		`-}`
`114`	`110`	`}`
`115`	`111`	`if (result)`
`116`	`112`	`{`
`117`	`113`	`if (!and)`
`118`		`-{`
`119`	`114`	`return (1);`
`120`		`-}`
`121`	`115`	`}`
`122`	`116`	`else`
`123`	`117`	`{`
`124`	`118`	`if (and)`
`125`		`-{`
`126`	`119`	`return (0);`
`127`		`-}`
`128`	`120`	`}`
`129`	`121`	`}`
`130`	`122`
`131`	`123`	`if (and&&result)`
`132`		`-{`
`133`	`124`	`return (1);`
`134`		`-}`
`135`	`125`	`else`
`136`		`-{`
`137`	`126`	`return (0);`
`138`		`-}`
`139`	`127`	`}`
`140`	`128`
`141`	`129`	`/*`

`‎contrib/datetime/datetime_functions.c`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -97,13 +97,9 @@ hhmm_out(TimeADT *time)`
`97`	`97`	`tm->tm_sec= (((int)*time) %60);`
`98`	`98`
`99`	`99`	`if (tm->tm_sec==0)`
`100`		`-{`
`101`	`100`	`sprintf(buf,"%02d:%02d",tm->tm_hour,tm->tm_min);`
`102`		`-}`
`103`	`101`	`else`
`104`		`-{`
`105`	`102`	`sprintf(buf,"%02d:%02d:%02d",tm->tm_hour,tm->tm_min,tm->tm_sec);`
`106`		`-}`
`107`	`103`
`108`	`104`	`result=palloc(strlen(buf)+1);`
`109`	`105`

`‎contrib/string/string_io.c`

Lines changed: 0 additions & 22 deletions

Original file line number	Diff line number	Diff line change
`@@ -66,9 +66,7 @@ string_output(char *data, int size)`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`if (size<0)`
`69`		`-{`
`70`	`69`	`size=strlen(data);`
`71`		`-}`
`72`	`70`
`73`	`71`	`/* adjust string length for escapes */`
`74`	`72`	`len=size;`
`@@ -90,9 +88,7 @@ string_output(char *data, int size)`
`90`	`88`	`break;`
`91`	`89`	`default:`
`92`	`90`	`if (NOTPRINTABLE(*p))`
`93`		`-{`
`94`	`91`	`len+=3;`
`95`		`-}`
`96`	`92`	`}`
`97`	`93`	`}`
`98`	`94`	`len++;`
`@@ -147,9 +143,7 @@ string_output(char *data, int size)`
`147`	`143`	`r+=3;`
`148`	`144`	`}`
`149`	`145`	`else`
`150`		`-{`
`151`	`146`	`*r++=c;`
`152`		`-}`
`153`	`147`	`}`
`154`	`148`	`}`
`155`	`149`	`*r='\0';`
`@@ -192,9 +186,7 @@ string_input(char str, int size, int hdrsize, int rtn_size)`
`192`	`186`	`intlen;`
`193`	`187`
`194`	`188`	`if ((str==NULL)\|\| (hdrsize<0))`
`195`		`-{`
`196`	`189`	`return (char*)NULL;`
`197`		`-}`
`198`	`190`
`199`	`191`	`/* Compute result size */`
`200`	`192`	`len=strlen(str);`
`@@ -223,22 +215,16 @@ string_input(char str, int size, int hdrsize, int rtn_size)`
`223`	`215`
`224`	`216`	`/* result has variable length */`
`225`	`217`	`if (size==0)`
`226`		`-{`
`227`	`218`	`size=len+1;`
`228`		`-}`
`229`	`219`	`else`
`230`	`220`	`/* result has variable length with maximum size */`
`231`	`221`	`if (size<0)`
`232`		`-{`
`233`	`222`	`size=MIN(len,-size)+1;`
`234`		`-}`
`235`	`223`
`236`	`224`	`result= (char*)palloc(hdrsize+size);`
`237`	`225`	`memset(result,0,hdrsize+size);`
`238`	`226`	`if (rtn_size)`
`239`		`-{`
`240`	`227`	`*rtn_size=size;`
`241`		`-}`
`242`	`228`
`243`	`229`	`r=result+hdrsize;`
`244`	`230`	`for (p=str;*p;)`
`@@ -262,13 +248,9 @@ string_input(char str, int size, int hdrsize, int rtn_size)`
`262`	`248`	`case'7':`
`263`	`249`	`c=VALUE(c);`
`264`	`250`	`if (isdigit(*p))`
`265`		`-{`
`266`	`251`	`c= (c <<3)+VALUE(*p++);`
`267`		`-}`
`268`	`252`	`if (isdigit(*p))`
`269`		`-{`
`270`	`253`	`c= (c <<3)+VALUE(*p++);`
`271`		`-}`
`272`	`254`	`*r++=c;`
`273`	`255`	`break;`
`274`	`256`	`case'b':`
`@@ -294,9 +276,7 @@ string_input(char str, int size, int hdrsize, int rtn_size)`
`294`	`276`	`}`
`295`	`277`	`}`
`296`	`278`	`else`
`297`		`-{`
`298`	`279`	`*r++=c;`
`299`		`-}`
`300`	`280`	`}`
`301`	`281`
`302`	`282`	`return ((char*)result);`
`@@ -380,9 +360,7 @@ c_textin(char *str)`
`380`	`360`	`intlen;`
`381`	`361`
`382`	`362`	`if (str==NULL)`
`383`		`-{`
`384`	`363`	`return ((structvarlena*)NULL);`
`385`		`-}`
`386`	`364`
`387`	`365`	`result= (structvarlena*)string_input(str,0,VARHDRSZ,&len);`
`388`	`366`	`VARSIZE(result)=len;`

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

Lines changed: 1 addition & 11 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.37 1998/02/26 04:29:15 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.38 1998/06/15 19:27:44 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* The old interface functions have been converted to macros`
`@@ -143,9 +143,7 @@ DataFill(char *data,`
`143`	`143`	`if (bit!=NULL)`
`144`	`144`	`{`
`145`	`145`	`if (bitmask!=CSIGNBIT)`
`146`		`-{`
`147`	`146`	`bitmask <<=1;`
`148`		`-}`
`149`	`147`	`else`
`150`	`148`	`{`
`151`	`149`	`bitP+=1;`
`@@ -167,13 +165,9 @@ DataFill(char *data,`
`167`	`165`	`case-1:`
`168`	`166`	`*infomask \|=HEAP_HASVARLENA;`
`169`	`167`	`if (att[i]->attalign=='d')`
`170`		`-{`
`171`	`168`	`data= (char*)DOUBLEALIGN(data);`
`172`		`-}`
`173`	`169`	`else`
`174`		`-{`
`175`	`170`	`data= (char*)INTALIGN(data);`
`176`		`-}`
`177`	`171`	`data_length=VARSIZE(DatumGetPointer(value[i]));`
`178`	`172`	`memmove(data,DatumGetPointer(value[i]),data_length);`
`179`	`173`	`data+=data_length;`
`@@ -239,9 +233,7 @@ heap_attisnull(HeapTuple tup, int attnum)`
`239`	`233`	`return (0);`
`240`	`234`
`241`	`235`	`if (attnum>0)`
`242`		`-{`
`243`	`236`	`return (att_isnull(attnum-1,tup->t_bits));`
`244`		`-}`
`245`	`237`	`else`
`246`	`238`	`switch (attnum)`
`247`	`239`	`{`
`@@ -513,9 +505,7 @@ nocachegetattr(HeapTuple tup,`
`513`	`505`	`tp+att[attnum]->attcacheoff);`
`514`	`506`	`}`
`515`	`507`	`elseif (attnum==0)`
`516`		`-{`
`517`	`508`	`return ((Datum)fetchatt(&(att[0]), (char*)tp));`
`518`		`-}`
`519`	`509`	`elseif (!HeapTupleAllFixed(tup))`
`520`	`510`	`{`
`521`	`511`	`intj=0;`

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

Lines changed: 1 addition & 7 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/indextuple.c,v 1.28 1998/02/26 04:29:18 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.29 1998/06/15 19:27:44 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -178,9 +178,7 @@ nocache_index_getattr(IndexTuple tup,`
`178`	`178`	`/* first attribute is always at position zero */`
`179`	`179`
`180`	`180`	`if (attnum==1)`
`181`		`-{`
`182`	`181`	`return (Datum)fetchatt(&(att[0]), (char*)tup+data_off);`
`183`		`-}`
`184`	`182`	`if (att[attnum]->attcacheoff!=-1)`
`185`	`183`	`{`
`186`	`184`	`return (Datum)fetchatt(&(att[attnum]),`
`@@ -260,9 +258,7 @@ nocache_index_getattr(IndexTuple tup,`
`260`	`258`	`tp+att[attnum]->attcacheoff);`
`261`	`259`	`}`
`262`	`260`	`elseif (attnum==0)`
`263`		`-{`
`264`	`261`	`return ((Datum)fetchatt(&(att[0]), (char*)tp));`
`265`		`-}`
`266`	`262`	`elseif (!IndexTupleAllFixed(tup))`
`267`	`263`	`{`
`268`	`264`	`intj=0;`
`@@ -482,9 +478,7 @@ CopyIndexTuple(IndexTuple source, IndexTuple *target)`
`482`	`478`
`483`	`479`	`size=IndexTupleSize(source);`
`484`	`480`	`if (*target==NULL)`
`485`		`-{`
`486`	`481`	`*target= (IndexTuple)palloc(size);`
`487`		`-}`
`488`	`482`
`489`	`483`	`ret=*target;`
`490`	`484`	`memmove((char)ret, (char)source,size);`

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

Lines changed: 1 addition & 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/Attic/indexvalid.c,v 1.18 1998/01/31 05:54:54 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.19 1998/06/15 19:27:45 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -61,9 +61,7 @@ index_keytest(IndexTuple tuple,`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`if (key[0].sk_flags&SK_ISNULL)`
`64`		`-{`
`65`	`64`	`return (false);`
`66`		`-}`
`67`	`65`
`68`	`66`	`if (key[0].sk_flags&SK_COMMUTE)`
`69`	`67`	`{`
`@@ -79,9 +77,7 @@ index_keytest(IndexTuple tuple,`
`79`	`77`	`}`
`80`	`78`
`81`	`79`	`if (!test== !(key[0].sk_flags&SK_NEGATE))`
`82`		`-{`
`83`	`80`	`return (false);`
`84`		`-}`
`85`	`81`
`86`	`82`	`scanKeySize-=1;`
`87`	`83`	`key++;`

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

Lines changed: 1 addition & 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/common/tupdesc.c,v 1.39 1998/04/26 04:05:02 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.40 1998/06/15 19:27:45 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* some of the executor utility code such as "ExecTypeFromTL" should be`
`@@ -508,9 +508,7 @@ BuildDescForRelation(List schema, char relname)`
`508`	`508`	`* ----------------`
`509`	`509`	`*/`
`510`	`510`	`if (!strcmp(typename,relname))`
`511`		`-{`
`512`	`511`	`TupleDescMakeSelfReference(desc,attnum,relname);`
`513`		`-}`
`514`	`512`	`else`
`515`	`513`	`elog(ERROR,"DefineRelation: no such type %s",`
`516`	`514`	`typename);`

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

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -632,9 +632,7 @@ gistAdjustKeys(Relation r,`
`632`	`632`	`pfree(datum);`
`633`	`633`	`}`
`634`	`634`	`else`
`635`		`-{`
`636`	`635`	`ReleaseBuffer(b);`
`637`		`-}`
`638`	`636`	`pfree(evec);`
`639`	`637`	`}`
`640`	`638`
`@@ -834,9 +832,7 @@ gistSplit(Relation r,`
`834`	`832`	`}`
`835`	`833`
`836`	`834`	`if ((bufblock=BufferGetBlockNumber(buffer))!=GISTP_ROOT)`
`837`		`-{`
`838`	`835`	`PageRestoreTempPage(left,p);`
`839`		`-}`
`840`	`836`	`WriteBuffer(leftbuf);`
`841`	`837`	`WriteBuffer(rightbuf);`
`842`	`838`

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!

Commit6bd323c

File tree

224 files changed

Some content is hidden

224 files changed

`‎contrib/array/array_iterator.c`

`‎contrib/datetime/datetime_functions.c`

`‎contrib/string/string_io.c`

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

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

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

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

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

0 commit comments