NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit0784208

committed

pgindent run over code.

1 parent4b04b01 commit0784208Copy full SHA for 0784208

File tree

413 files changed

+11788

-10834

lines changed

contrib
- array
  - array_iterator.c
  - array_iterator.h
- datetime
  - datetime_functions.c
- earthdistance
  - earthdistance.c
- findoidjoins
  - findoidjoins.c
- fulltextindex
  - fti.c
- isbn_issn
  - isbn.c
  - issn.c
- lo
  - lo.c
- mSQL-interface
  - mpgsql.c
- miscutil
  - misc_utils.c
  - misc_utils.h
- noupdate
  - noup.c
- os2client
  - c.h
  - config.h
- pginterface
  - pginterface.c
  - pginterface.h
- spi
  - moddatetime.c
  - preprocessor
    - step1.c
  - refint.c
- string
  - string_io.c
  - string_io.h
- userlock
  - user_locks.c
  - user_locks.h
- vacuumlo
  - vacuumlo.c
src
- backend
  - access
    - common
    - gist
      - gist.c
      - gistscan.c
    - hash
    - heap
      - heapam.c
      - hio.c
    - index
      - genam.c
      - istrat.c
    - nbtree
    - rtree
      - rtree.c
      - rtscan.c
    - transam
  - bootstrap
    - bootstrap.c
  - catalog
  - commands
  - executor
  - lib
    - fstack.c
    - stringinfo.c
  - libpq
  - nodes
  - optimizer
    - geqo
    - path
    - plan
    - prep
    - util
  - parser
  - port
    - dynloader
      - freebsd.c
    - hpux
      - fixade.h
    - snprintf.c
  - postmaster
    - postmaster.c
  - regex
    - regcomp.c
    - retest.c
  - rewrite
  - storage
    - buffer
    - file
      - fd.c
    - ipc
    - large_object
      - inv_api.c
    - lmgr
    - page
      - bufpage.c
      - itemptr.c
    - smgr
  - tcop
  - tioga
    - Varray.c
    - tgRecipe.h
  - utils
    - adt
    - cache
    - error
    - fmgr
      - dfmgr.c
      - fmgr.c
    - hash
      - dynahash.c
    - init
    - mb
    - misc
      - database.c
      - trace.c
    - mmgr
    - sort
      - psort.c
    - time
      - tqual.c
- bin
  - pg_dump
  - pgtclsh
    - pgtclAppInit.c
    - pgtkAppInit.c
  - psql
    - psql.c
- include
  - access
  - c.h
  - catalog
  - commands
    - command.h
    - vacuum.h
  - executor
  - lib
    - fstack.h
    - stringinfo.h
  - libpq
    - libpq.h
    - pqformat.h
  - mb
    - pg_wchar.h
  - miscadmin.h
  - nodes
  - optimizer
  - parser
  - port
  - rewrite
    - rewriteHandler.h
    - rewriteManip.h
  - storage
  - tcop
    - dest.h
    - tcopprot.h
  - utils
- interfaces
  - ecpg
    - include
      - ecpglib.h
    - lib
      - ecpglib.c
      - typename.c
    - preproc
    - test
      - header_test.h
  - libpgtcl
  - libpq
  - python
    - pgmodule.c
- pl
  - plpgsql/src
  - tcl
    - pltcl.c
- test
  - examples
    - testlo.c
    - testlo2.c
  - regress
    - regress.c
- tools/pgindent
  - README
- tutorial
  - funcs.c
- utils
  - dllinit.c
  - getopt.c
- win32

Some content is hidden

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

413 files changed

+11788

-10834

lines changed

`‎contrib/array/array_iterator.c`

Lines changed: 6 additions & 18 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,8 @@ array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value)`
`43`	`43`	`intndim,`
`44`	`44`	`*dim;`
`45`	`45`	`char*p;`
`46`		`-FmgrInfofinf;/Tobias Gabele Jan 18 1999/`
`47`		`-`
	`46`	`+FmgrInfofinf;/Tobias Gabele Jan 18 1999/`
	`47`	`+`
`48`	`48`
`49`	`49`	`/* Sanity checks */`
`50`	`50`	`if ((array== (ArrayType*)NULL)`
`@@ -75,9 +75,9 @@ array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value)`
`75`	`75`
`76`	`76`	`/* Lookup the function entry point */`
`77`	`77`	`proc_fn= (func_ptr)NULL;`
`78`		`-fmgr_info(proc,&finf);/Tobias Gabele Jan 18 1999/`
`79`		`-proc_fn=finf.fn_addr;/Tobias Gabele Jan 18 1999/`
`80`		`-pronargs=finf.fn_nargs;/Tobias Gabele Jan 18 1999/`
	`78`	`+fmgr_info(proc,&finf);/Tobias Gabele Jan 18 1999/`
	`79`	`+proc_fn=finf.fn_addr;/Tobias Gabele Jan 18 1999/`
	`80`	`+pronargs=finf.fn_nargs;/Tobias Gabele Jan 18 1999/`
`81`	`81`	`if ((proc_fn==NULL)\|\| (pronargs!=2))`
`82`	`82`	`{`
`83`	`83`	`elog(ERROR,"array_iterator: fmgr_info lookup failed for oid %d",proc);`
`@@ -110,38 +110,26 @@ array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value)`
`110`	`110`	`{`
`111`	`111`	`result= (int) (*proc_fn) (p,value);`
`112`	`112`	`if (typlen>0)`
`113`		`-{`
`114`	`113`	`p+=typlen;`
`115`		`-}`
`116`	`114`	`else`
`117`		`-{`
`118`	`115`	`p+=INTALIGN((int32)p);`
`119`		`-}`
`120`	`116`	`}`
`121`	`117`	`if (result)`
`122`	`118`	`{`
`123`	`119`	`if (!and)`
`124`		`-{`
`125`	`120`	`return (1);`
`126`		`-}`
`127`	`121`	`}`
`128`	`122`	`else`
`129`	`123`	`{`
`130`	`124`	`if (and)`
`131`		`-{`
`132`	`125`	`return (0);`
`133`		`-}`
`134`	`126`	`}`
`135`	`127`	`}`
`136`	`128`
`137`	`129`	`if (and&&result)`
`138`		`-{`
`139`	`130`	`return (1);`
`140`		`-}`
`141`	`131`	`else`
`142`		`-{`
`143`	`132`	`return (0);`
`144`		`-}`
`145`	`133`	`}`
`146`	`134`
`147`	`135`	`/*`
`@@ -344,7 +332,7 @@ int32`
`344`	`332`	`array_oideq(ArrayType*array,Oidvalue)`
`345`	`333`	`{`
`346`	`334`	`returnarray_iterator((Oid)26,/* oid */`
`347`		`- (Oid)184,/* oideq */`
	`335`	`+ (Oid)184,/* oideq */`
`348`	`336`	`0,/* logical or */`
`349`	`337`	`array, (Datum)value);`
`350`	`338`	`}`

`‎contrib/array/array_iterator.h`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`#ifndefARRAY_ITERATOR_H`
`2`	`2`	`#defineARRAY_ITERATOR_H`
`3`	`3`
`4`		`-staticint32`
`5`		`-array_iterator(Oidelemtype,Oidproc,intand,`
	`4`	`+staticint32array_iterator(Oidelemtype,Oidproc,intand,`
`6`	`5`	`ArrayType*array,Datumvalue);`
`7`	`6`	`int32array_texteq(ArrayTypearray,charvalue);`
`8`	`7`	`int32array_all_texteq(ArrayTypearray,charvalue);`
`@@ -24,6 +23,7 @@ int32array_int4lt(ArrayType *array, int4 value);`
`24`	`23`	`int32array_all_int4lt(ArrayType*array,int4value);`
`25`	`24`	`int32array_int4le(ArrayType*array,int4value);`
`26`	`25`	`int32array_all_int4le(ArrayType*array,int4value);`
`27`		`-int32array_oideq(ArrayType*array,Oidvalue);`
`28`		`-int32array_all_oidne(ArrayType*array,Oidvalue);`
	`26`	`+int32array_oideq(ArrayType*array,Oidvalue);`
	`27`	`+int32array_all_oidne(ArrayType*array,Oidvalue);`
	`28`	`+`
`29`	`29`	`#endif`

`‎contrib/datetime/datetime_functions.c`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -225,8 +225,8 @@ currentdate()`
`225`	`225`
`226`	`226`	`/*`
`227`	`227`	`* Local variables:`
`228`		`- *tab-width: 4`
`229`		`- *c-indent-level: 4`
`230`		`- *c-basic-offset: 4`
	`228`	`+ *tab-width: 4`
	`229`	`+ *c-indent-level: 4`
	`230`	`+ *c-basic-offset: 4`
`231`	`231`	`* End:`
`232`	`232`	`*/`

`‎contrib/earthdistance/earthdistance.c`

Lines changed: 27 additions & 22 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,23 +4,24 @@`
`4`	`4`
`5`	`5`	`#include<postgres.h>`
`6`	`6`	`#include<utils/geo_decls.h>/* for Pt */`
`7`		`-#include<utils/palloc.h>/* for palloc */`
	`7`	`+#include<utils/palloc.h>/* for palloc */`
`8`	`8`
`9`	`9`	`/* Earth's radius is in statute miles. */`
`10`		`-constEARTH_RADIUS=3958.747716;`
`11`		`-constTWO_PI=2.0*M_PI;`
	`10`	`+constEARTH_RADIUS=3958.747716;`
	`11`	`+constTWO_PI=2.0*M_PI;`
`12`	`12`
`13`	`13`	`/******************************************************`
`14`	`14`	`*`
`15`	`15`	`* degtorad - convert degrees to radians`
`16`	`16`	`*`
`17`		`- * arg:double, angle in degrees`
	`17`	`+ * arg:double, angle in degrees`
`18`	`18`	`*`
`19`		`- * returns:double, same angle in radians`
	`19`	`+ * returns:double, same angle in radians`
`20`	`20`	`******************************************************/`
`21`	`21`
`22`	`22`	`staticdouble`
`23`		`-degtorad (doubledegrees) {`
	`23`	`+degtorad(doubledegrees)`
	`24`	`+{`
`24`	`25`	`return (degrees /360.0)*TWO_PI;`
`25`	`26`	`}`
`26`	`27`
`@@ -30,36 +31,40 @@ degtorad (double degrees) {`
`30`	`31`	`* geo_distance - distance between points`
`31`	`32`	`*`
`32`	`33`	`* args:`
`33`		`- * a pair of points - for each point,`
`34`		`- * x-coordinate is longitude in degrees west of Greenwich`
`35`		`- * y-coordinate is latitude in degrees above equator`
	`34`	`+ * a pair of points - for each point,`
	`35`	`+ * x-coordinate is longitude in degrees west of Greenwich`
	`36`	`+ * y-coordinate is latitude in degrees above equator`
`36`	`37`	`*`
`37`		`- * returns:double`
`38`		`- * distance between the points in miles on earth's surface`
	`38`	`+ * returns:double`
	`39`	`+ * distance between the points in miles on earth's surface`
`39`	`40`	`******************************************************/`
`40`	`41`
`41`	`42`	`double*`
`42`		`-geo_distance (Pointpt1,Pointpt2) {`
	`43`	`+geo_distance(Pointpt1,Pointpt2)`
	`44`	`+{`
`43`	`45`
`44`		`-doublelong1,lat1,long2,lat2;`
`45`		`-doublelongdiff;`
`46`		`-double*resultp=palloc (sizeof(double));`
	`46`	`+doublelong1,`
	`47`	`+lat1,`
	`48`	`+long2,`
	`49`	`+lat2;`
	`50`	`+doublelongdiff;`
	`51`	`+double*resultp=palloc(sizeof(double));`
`47`	`52`
`48`	`53`	`/* convert degrees to radians */`
`49`	`54`
`50`		`-long1=degtorad(pt1->x);`
`51`		`-lat1=degtorad(pt1->y);`
	`55`	`+long1=degtorad(pt1->x);`
	`56`	`+lat1=degtorad(pt1->y);`
`52`	`57`
`53`		`-long2=degtorad(pt2->x);`
`54`		`-lat2=degtorad(pt2->y);`
	`58`	`+long2=degtorad(pt2->x);`
	`59`	`+lat2=degtorad(pt2->y);`
`55`	`60`
`56`	`61`	`/* compute difference in longitudes - want < 180 degrees */`
`57`		`-longdiff=fabs(long1-long2);`
	`62`	`+longdiff=fabs(long1-long2);`
`58`	`63`	`if (longdiff>M_PI)`
`59`	`64`	`longdiff=TWO_PI-longdiff;`
`60`	`65`
`61`		`-resultp=EARTH_RADIUSacos`
`62`		`-(sin(lat1)sin(lat2)+cos(lat1)cos(lat2)*cos(longdiff));`
	`66`	`+resultp=EARTH_RADIUSacos`
	`67`	`+(sin(lat1)sin(lat2)+cos(lat1)cos(lat2)*cos(longdiff));`
`63`	`68`
`64`	`69`	`returnresultp;`
`65`	`70`	`}`

`‎contrib/findoidjoins/findoidjoins.c`

Lines changed: 12 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,8 @@`
`9`	`9`	`#include<libpq-fe.h>`
`10`	`10`	`#include"pginterface.h"`
`11`	`11`
`12`		`-PGresultattres,relres;`
	`12`	`+PGresult*attres,`
	`13`	`+*relres;`
`13`	`14`
`14`	`15`	`int`
`15`	`16`	`main(intargc,char**argv)`
`@@ -55,7 +56,7 @@ main(int argc, char **argv)`
`55`	`56`	`");`
`56`	`57`	`doquery("FETCH ALL IN c_relations");`
`57`	`58`	`relres=get_result();`
`58`		`-`
	`59`	`+`
`59`	`60`	`set_result(attres);`
`60`	`61`	`while (fetch(typname,relname,attname)!=END_OF_TUPLES)`
`61`	`62`	`{`
`@@ -65,17 +66,17 @@ main(int argc, char **argv)`
`65`	`66`	`{`
`66`	`67`	`unset_result(relres);`
`67`	`68`	`if (strcmp(typname,"oid")==0)`
`68`		`-sprintf(query,"\`
	`69`	`+sprintf(query,"\`
`69`	`70`	`DECLARE c_matches BINARY CURSOR FOR \`
`70`		`-SELECTcount(*)`
`71`		`-FROM%st1, %st2 \`
`72`		`-WHEREt1.%s=t2.oid",relname,relname2,attname);`
	`71`	`+SELECTcount(*) \`
	`72`	`+FROM %s t1, %s t2 \`
	`73`	`+WHEREt1.%s = t2.oid",relname,relname2,attname);`
`73`	`74`	`else`
`74`		`-sprintf(query,"\`
	`75`	`+sprintf(query,"\`
`75`	`76`	`DECLARE c_matches BINARY CURSOR FOR \`
`76`		`-SELECTcount(*)`
`77`		`-FROM%st1, %st2 \`
`78`		`-WHERERegprocToOid(t1.%s)=t2.oid",relname,relname2,attname);`
	`77`	`+SELECTcount(*) \`
	`78`	`+FROM %s t1, %s t2 \`
	`79`	`+WHERERegprocToOid(t1.%s) = t2.oid",relname,relname2,attname);`
`79`	`80`
`80`	`81`	`doquery(query);`
`81`	`82`	`doquery("FETCH ALL IN c_matches");`
`@@ -96,7 +97,7 @@ main(int argc, char **argv)`
`96`	`97`	`doquery("CLOSE c_attributes");`
`97`	`98`	`PQclear(attres);`
`98`	`99`	`unset_result(attres);`
`99`		`-`
	`100`	`+`
`100`	`101`	`doquery("COMMIT WORK");`
`101`	`102`
`102`	`103`	`disconnectdb();`

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!

Commit0784208

File tree

413 files changed

Some content is hidden

413 files changed

`‎contrib/array/array_iterator.c`

`‎contrib/array/array_iterator.h`

`‎contrib/datetime/datetime_functions.c`

`‎contrib/earthdistance/earthdistance.c`

`‎contrib/findoidjoins/findoidjoins.c`

0 commit comments