NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit436a295

committed

Re-run pgindent, fixing a problem where comment lines after a blank

comment line where output as too long, and update typedefs for /libdirectory. Also fix case where identifiers were used as variable namesin the backend, but as typedefs in ecpg (favor the backend forindenting).Backpatch to 8.1.X.

1 parente196eed commit436a295Copy full SHA for 436a295

File tree

264 files changed

+4417

-4111

lines changed

contrib
- dblink
  - dblink.c
- intarray
  - _int_gist.c
- pgbench
  - pgbench.c
- pgcrypto
  - pgp-decrypt.c
  - pgp-pgsql.c
- tablefunc
  - tablefunc.c
- tsearch2
  - query.c
  - query.h
  - query_gist.c
  - query_rewrite.c
  - query_support.c
  - query_util.c
  - query_util.h
  - rank.c
  - snowball
  - ts_locale.c
  - ts_locale.h
  - wordparser
    - parser.c
    - parser.h
  - wparser_def.c
src
- backend
  - access
    - common
      - heaptuple.c
      - tupdesc.c
    - gist
    - hash
    - heap
    - index
      - genam.c
    - nbtree
    - transam
  - bootstrap
    - bootstrap.c
  - catalog
  - commands
  - executor
  - libpq
  - main
    - main.c
  - nodes
    - copyfuncs.c
    - equalfuncs.c
  - optimizer
    - geqo
      - geqo_eval.c
      - geqo_pool.c
    - path
    - plan
    - prep
    - util
  - parser
  - port
    - beos
      - support.c
    - posix_sema.c
    - sysv_sema.c
    - win32
      - signal.c
      - timer.c
  - postmaster
  - regex
    - regc_locale.c
  - rewrite
  - storage
    - buffer
      - bufmgr.c
      - localbuf.c
    - file
      - fd.c
    - ipc
    - lmgr
    - page
      - bufpage.c
    - smgr
      - smgr.c
  - tcop
  - utils
    - adt
    - cache
    - error
      - elog.c
    - fmgr
      - fmgr.c
    - hash
      - dynahash.c
    - init
    - mb/conversion_procs
      - euc_tw_and_big5
        big5.c
      - utf8_and_iso8859
        utf8_and_iso8859.c
    - misc
      - guc.c
      - ps_status.c
    - mmgr
      - portalmem.c
    - resowner
      - resowner.c
    - sort
      - tuplesort.c
      - tuplestore.c
    - time
      - tqual.c
- bin
  - initdb
    - initdb.c
  - pg_ctl
    - pg_ctl.c
  - pg_dump
  - psql
- include
  - access
    - htup.h
    - tuptoaster.h
  - catalog
  - commands
    - conversioncmds.h
    - user.h
  - funcapi.h
  - libpq
  - miscadmin.h
  - nodes
  - storage
    - buf_internals.h
  - tcop
    - dest.h
  - utils
- interfaces
  - ecpg
    - compatlib
      - informix.c
    - include
      - pgtypes_numeric.h
    - pgtypeslib
  - libpq
- pl
  - plperl
    - plperl.c
    - ppport.h
  - plpgsql/src
  - tcl
    - pltcl.c
- port
- test/examples
  - testlibpq3.c
- timezone
  - pgtz.c

Some content is hidden

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

264 files changed

+4417

-4111

lines changed

`‎contrib/dblink/dblink.c`

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,9 +60,9 @@`
`60`	`60`
`61`	`61`	`typedefstructremoteConn`
`62`	`62`	`{`
`63`		`-PGconnconn;/ Hold the remote connection */`
	`63`	`+PGconnconn;/ Hold the remote connection */`
`64`	`64`	`intopenCursorCount;/* The number of open cursors */`
`65`		`-boolnewXactForCursor;/* Opened a transaction for a cursor */`
	`65`	`+boolnewXactForCursor;/* Opened a transaction for a cursor */`
`66`	`66`	`}remoteConn;`
`67`	`67`
`68`	`68`	`/*`
`@@ -85,8 +85,8 @@ static Oidget_relid_from_relname(text *relname_text);`
`85`	`85`	`staticchar*generate_relation_name(Oidrelid);`
`86`	`86`
`87`	`87`	`/* Global */`
`88`		`-staticremoteConn*pconn=NULL;`
`89`		`-staticHTAB*remoteConnHash=NULL;`
	`88`	`+staticremoteConn*pconn=NULL;`
	`89`	`+staticHTAB*remoteConnHash=NULL;`
`90`	`90`
`91`	`91`	`/*`
`92`	`92`	`*Following is list that holds multiple remote connections.`
`@@ -347,7 +347,7 @@ dblink_open(PG_FUNCTION_ARGS)`
`347`	`347`	`else`
`348`	`348`	`conn=rconn->conn;`
`349`	`349`
`350`		`-/If we are not in a transaction, start one /`
	`350`	`+/If we are not in a transaction, start one /`
`351`	`351`	`if (PQtransactionStatus(conn)==PQTRANS_IDLE)`
`352`	`352`	`{`
`353`	`353`	`res=PQexec(conn,"BEGIN");`
`@@ -1505,7 +1505,7 @@ get_text_array_contents(ArrayType array, int numitems)`
`1505`	`1505`	`else`
`1506`	`1506`	`{`
`1507`	`1507`	`values[i]=DatumGetCString(DirectFunctionCall1(textout,`
`1508`		`-PointerGetDatum(ptr)));`
	`1508`	`+PointerGetDatum(ptr)));`
`1509`	`1509`	`ptr=att_addlength(ptr,typlen,PointerGetDatum(ptr));`
`1510`	`1510`	`ptr= (char*)att_align(ptr,typalign);`
`1511`	`1511`	`}`
`@@ -1717,7 +1717,7 @@ get_sql_update(Oid relid, int2vector pkattnums, int16 pknumatts, char *src_pka`
`1717`	`1717`	`key=-1;`
`1718`	`1718`
`1719`	`1719`	`if (key>-1)`
`1720`		`-val=tgt_pkattvals[key] ?pstrdup(tgt_pkattvals[key]) :NULL;`
	`1720`	`+val=tgt_pkattvals[key] ?pstrdup(tgt_pkattvals[key]) :NULL;`
`1721`	`1721`	`else`
`1722`	`1722`	`val=SPI_getvalue(tuple,tupdesc,i+1);`
`1723`	`1723`
`@@ -1744,7 +1744,7 @@ get_sql_update(Oid relid, int2vector pkattnums, int16 pknumatts, char *src_pka`
`1744`	`1744`	`quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum-1]->attname)));`
`1745`	`1745`
`1746`	`1746`	`if (tgt_pkattvals!=NULL)`
`1747`		`-val=tgt_pkattvals[i] ?pstrdup(tgt_pkattvals[i]) :NULL;`
	`1747`	`+val=tgt_pkattvals[i] ?pstrdup(tgt_pkattvals[i]) :NULL;`
`1748`	`1748`	`else`
`1749`	`1749`	`val=SPI_getvalue(tuple,tupdesc,pkattnum);`
`1750`	`1750`

`‎contrib/intarray/_int_gist.c`

Lines changed: 13 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ g_int_consistent(PG_FUNCTION_ARGS)`
`39`	`39`	`if (strategy==BooleanSearchStrategy)`
`40`	`40`	`PG_RETURN_BOOL(execconsistent((QUERYTYPE*)query,`
`41`	`41`	`(ArrayType*)DatumGetPointer(entry->key),`
`42`		`-GIST_LEAF(entry)));`
	`42`	`+GIST_LEAF(entry)));`
`43`	`43`
`44`	`44`	`/* XXX are we sure it's safe to scribble on the query object here? */`
`45`	`45`	`/* XXX what about toasted input? */`
`@@ -97,7 +97,7 @@ g_int_union(PG_FUNCTION_ARGS)`
`97`	`97`
`98`	`98`	`for (i=0;i<entryvec->n;i++)`
`99`	`99`	`{`
`100`		`-ArrayType*ent=GETENTRY(entryvec,i);`
	`100`	`+ArrayType*ent=GETENTRY(entryvec,i);`
`101`	`101`
`102`	`102`	`CHECKARRVALID(ent);`
`103`	`103`	`totlen+=ARRNELEMS(ent);`
`@@ -108,8 +108,8 @@ g_int_union(PG_FUNCTION_ARGS)`
`108`	`108`
`109`	`109`	`for (i=0;i<entryvec->n;i++)`
`110`	`110`	`{`
`111`		`-ArrayType*ent=GETENTRY(entryvec,i);`
`112`		`-intnel;`
	`111`	`+ArrayType*ent=GETENTRY(entryvec,i);`
	`112`	`+intnel;`
`113`	`113`
`114`	`114`	`nel=ARRNELEMS(ent);`
`115`	`115`	`memcpy(ptr,ARRPTR(ent),nel*sizeof(int4));`
`@@ -143,23 +143,25 @@ g_int_compress(PG_FUNCTION_ARGS)`
`143`	`143`	`CHECKARRVALID(r);`
`144`	`144`	`PREPAREARR(r);`
`145`	`145`
`146`		`-if (ARRNELEMS(r)>=2*MAXNUMRANGE)`
`147`		`-elog(NOTICE,"Input array is too big (%d maximum allowed, %d current), use gist__intbig_ops opclass instead",`
`148`		`-2*MAXNUMRANGE-1,ARRNELEMS(r));`
`149`		`-`
	`146`	`+if (ARRNELEMS(r)>=2*MAXNUMRANGE)`
	`147`	`+elog(NOTICE,"Input array is too big (%d maximum allowed, %d current), use gist__intbig_ops opclass instead",`
	`148`	`+2*MAXNUMRANGE-1,ARRNELEMS(r));`
	`149`	`+`
`150`	`150`	`retval=palloc(sizeof(GISTENTRY));`
`151`	`151`	`gistentryinit(*retval,PointerGetDatum(r),`
`152`	`152`	`entry->rel,entry->page,entry->offset,VARSIZE(r), FALSE);`
`153`	`153`
`154`	`154`	`PG_RETURN_POINTER(retval);`
`155`	`155`	`}`
`156`	`156`
`157`		`-/* leaf entries never compress one more time, only when entry->leafkey ==true,`
`158`		`- so now we work only with internal keys */`
	`157`	`+/*`
	`158`	`+ * leaf entries never compress one more time, only when entry->leafkey`
	`159`	`+ * ==true, so now we work only with internal keys`
	`160`	`+ */`
`159`	`161`
`160`	`162`	`r= (ArrayType*)PG_DETOAST_DATUM(entry->key);`
`161`	`163`	`CHECKARRVALID(r);`
`162`		`-if (ARRISVOID(r))`
	`164`	`+if (ARRISVOID(r))`
`163`	`165`	`{`
`164`	`166`	`if (r!= (ArrayType*)DatumGetPointer(entry->key))`
`165`	`167`	`pfree(r);`

`‎contrib/pgbench/pgbench.c`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.45 2005/10/29 19:38:07 tgl Exp $`
	`2`	`+ * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.46 2005/11/22 18:17:04 momjian Exp $`
`3`	`3`	`*`
`4`	`4`	`* pgbench: a simple benchmark program for PostgreSQL`
`5`	`5`	`* written by Tatsuo Ishii`
`@@ -1110,7 +1110,8 @@ main(int argc, char **argv)`
`1110`	`1110`	`fprintf(stderr,"Use limit/ulimt to increase the limit before using pgbench.\n");`
`1111`	`1111`	`exit(1);`
`1112`	`1112`	`}`
`1113`		`-#endif/* #if !(defined(__CYGWIN__) \|\| defined(__MINGW32__)) */`
	`1113`	`+#endif/* #if !(defined(__CYGWIN__) \|\|`
	`1114`	`+ * defined(__MINGW32__)) */`
`1114`	`1115`	`break;`
`1115`	`1116`	`case'C':`
`1116`	`1117`	`is_connect=1;`

`‎contrib/pgcrypto/pgp-decrypt.c`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF`
`27`	`27`	`* SUCH DAMAGE.`
`28`	`28`	`*`
`29`		`- * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-decrypt.c,v 1.6 2005/10/15 02:49:06 momjian Exp $`
	`29`	`+ * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-decrypt.c,v 1.7 2005/11/22 18:17:04 momjian Exp $`
`30`	`30`	`*/`
`31`	`31`
`32`	`32`	`#include"postgres.h"`
`@@ -269,14 +269,14 @@ prefix_init(void *priv_p, void arg, PullFilter * src)`
`269`	`269`	`* The original purpose of the 2-byte check was to show user a`
`270`	`270`	`* friendly "wrong key" message. This made following possible:`
`271`	`271`	`*`
`272`		`- * "An Attack on CFB Mode Encryption As Used By OpenPGP" by Serge Mister`
`273`		`- * and Robert Zuccherato`
	`272`	`+ * "An Attack on CFB Mode Encryption As Used By OpenPGP" by Serge`
	`273`	`+ *Misterand Robert Zuccherato`
`274`	`274`	`*`
`275`		`- * To avoid being 'oracle', we delay reporting, which basically means we`
`276`		`- * prefer to run into corrupt packet header.`
	`275`	`+ * To avoid being 'oracle', we delay reporting, which basically means`
	`276`	`+ *weprefer to run into corrupt packet header.`
`277`	`277`	`*`
`278`		`- * We _could_ throw PXE_PGP_CORRUPT_DATA here, but there is possibility`
`279`		`- * of attack via timing, so we don't.`
	`278`	`+ * We _could_ throw PXE_PGP_CORRUPT_DATA here, but there is`
	`279`	`+ *possibilityof attack via timing, so we don't.`
`280`	`280`	`*/`
`281`	`281`	`ctx->corrupt_prefix=1;`
`282`	`282`	`}`

`‎contrib/pgcrypto/pgp-pgsql.c`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF`
`27`	`27`	`* SUCH DAMAGE.`
`28`	`28`	`*`
`29`		`- * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-pgsql.c,v 1.6 2005/10/15 02:49:06 momjian Exp $`
	`29`	`+ * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-pgsql.c,v 1.7 2005/11/22 18:17:04 momjian Exp $`
`30`	`30`	`*/`
`31`	`31`
`32`	`32`	`#include"postgres.h"`
`@@ -125,8 +125,8 @@ add_entropy(text data1, text data2, text *data3)`
`125`	`125`	`/*`
`126`	`126`	`* Try to make the feeding unpredictable.`
`127`	`127`	`*`
`128`		`- * Prefer data over keys, as it's rather likely that key is same in several`
`129`		`- * calls.`
	`128`	`+ * Prefer data over keys, as it's rather likely that key is same in`
	`129`	`+ *severalcalls.`
`130`	`130`	`*/`
`131`	`131`
`132`	`132`	`/* chance: 7/8 */`

`‎contrib/tablefunc/tablefunc.c`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -547,8 +547,8 @@ crosstab(PG_FUNCTION_ARGS)`
`547`	`547`	`* Get the next category item value, which is alway`
`548`	`548`	`* attribute number three.`
`549`	`549`	`*`
`550`		`- * Be careful to sssign the value to the array index based on`
`551`		`- * which category we are presently processing.`
	`550`	`+ * Be careful to sssign the value to the array index based`
	`551`	`+ *onwhich category we are presently processing.`
`552`	`552`	`*/`
`553`	`553`	`values[1+i]=SPI_getvalue(spi_tuple,spi_tupdesc,3);`
`554`	`554`
`@@ -870,8 +870,8 @@ get_crosstab_tuplestore(char *sql,`
`870`	`870`	`/*`
`871`	`871`	`* The provided SQL query must always return at least three columns:`
`872`	`872`	`*`
`873`		`- * 1. rownamethe label for each row - column 1 in the final result 2.`
`874`		`- *categorythe label for each value-column in the final result 3.`
	`873`	`+ * 1. rownamethe label for each row - column 1 in the final result`
	`874`	`+ *2. categorythe label for each value-column in the final result 3.`
`875`	`875`	`* value the values used to populate the value-columns`
`876`	`876`	`*`
`877`	`877`	`* If there are more than three columns, the last two are taken as`

`‎contrib/tsearch2/query.c`

Lines changed: 15 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ gettoken_query(QPRS_STATE * state, int4 val, int4 lenval, char **strval, int2`
`178`	`178`	`state->state=WAITOPERATOR;`
`179`	`179`	`returnVAL;`
`180`	`180`	`}`
`181`		`-elseif (state->state==WAITFIRSTOPERAND )`
	`181`	`+elseif (state->state==WAITFIRSTOPERAND)`
`182`	`182`	`returnEND;`
`183`	`183`	`else`
`184`	`184`	`ereport(ERROR,`
`@@ -206,13 +206,13 @@ gettoken_query(QPRS_STATE * state, int4 val, int4 lenval, char **strval, int2`
`206`	`206`	`returnERR;`
`207`	`207`	`break;`
`208`	`208`	`caseWAITSINGLEOPERAND:`
`209`		`-if (*(state->buf)=='\0' )`
	`209`	`+if (*(state->buf)=='\0')`
`210`	`210`	`returnEND;`
`211`	`211`	`*strval=state->buf;`
`212`		`-*lenval=strlen(state->buf);`
`213`		`-state->buf+=strlen(state->buf);`
	`212`	`+*lenval=strlen(state->buf);`
	`213`	`+state->buf+=strlen(state->buf);`
`214`	`214`	`state->count++;`
`215`		`-returnVAL;`
	`215`	`+returnVAL;`
`216`	`216`	`default:`
`217`	`217`	`returnERR;`
`218`	`218`	`break;`
`@@ -600,7 +600,7 @@ findoprnd(ITEM * ptr, int4 *pos)`
`600`	`600`	`* input`
`601`	`601`	`*/`
`602`	`602`	`staticQUERYTYPE*`
`603`		`-queryin(charbuf,void (pushval) (QPRS_STATE,int,char,int,int2),intcfg_id,boolisplain)`
	`603`	`+queryin(charbuf,void (pushval) (QPRS_STATE,int,char,int,int2),intcfg_id,boolisplain)`
`604`	`604`	`{`
`605`	`605`	`QPRS_STATEstate;`
`606`	`606`	`int4i;`
`@@ -637,12 +637,13 @@ queryin(char buf, void (pushval) (QPRS_STATE , int, char , int, int2), int c`
`637`	`637`	`/* parse query & make polish notation (postfix, but in reverse order) */`
`638`	`638`	`makepol(&state,pushval);`
`639`	`639`	`pfree(state.valstate.word);`
`640`		`-if (!state.num) {`
	`640`	`+if (!state.num)`
	`641`	`+{`
`641`	`642`	`elog(NOTICE,"Query doesn't contain lexem(s)");`
`642`		`-query= (QUERYTYPE*)palloc(HDRSIZEQT);`
	`643`	`+query= (QUERYTYPE*)palloc(HDRSIZEQT);`
`643`	`644`	`query->len=HDRSIZEQT;`
`644`	`645`	`query->size=0;`
`645`		`-returnquery;`
	`646`	`+returnquery;`
`646`	`647`	`}`
`647`	`648`
`648`	`649`	`/* make finish struct */`
`@@ -928,9 +929,9 @@ to_tsquery(PG_FUNCTION_ARGS)`
`928`	`929`	`str=text2char(in);`
`929`	`930`	`PG_FREE_IF_COPY(in,1);`
`930`	`931`
`931`		`-query=queryin(str,pushval_morph,PG_GETARG_INT32(0),false);`
`932`		`-`
`933`		`-if (query->size==0)`
	`932`	`+query=queryin(str,pushval_morph,PG_GETARG_INT32(0),false);`
	`933`	`+`
	`934`	`+if (query->size==0)`
`934`	`935`	`PG_RETURN_POINTER(query);`
`935`	`936`
`936`	`937`	`res=clean_fakeval_v2(GETQUERY(query),&len);`
`@@ -984,8 +985,8 @@ plainto_tsquery(PG_FUNCTION_ARGS)`
`984`	`985`	`PG_FREE_IF_COPY(in,1);`
`985`	`986`
`986`	`987`	`query=queryin(str,pushval_morph,PG_GETARG_INT32(0), true);`
`987`		`-`
`988`		`-if (query->size==0)`
	`988`	`+`
	`989`	`+if (query->size==0)`
`989`	`990`	`PG_RETURN_POINTER(query);`
`990`	`991`
`991`	`992`	`res=clean_fakeval_v2(GETQUERY(query),&len);`
`@@ -1023,4 +1024,3 @@ plainto_tsquery_current(PG_FUNCTION_ARGS)`
`1023`	`1024`	`Int32GetDatum(get_currcfg()),`
`1024`	`1025`	`PG_GETARG_DATUM(0)));`
`1025`	`1026`	`}`
`1026`		`-`

`‎contrib/tsearch2/query.h`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ typedef struct ITEM`
`17`	`17`	`int4val;`
`18`	`18`	`/* user-friendly value, must correlate with WordEntry */`
`19`	`19`	`uint32`
`20`		`-istrue:1,/* use for ranking in Cover */`
	`20`	`+istrue:1,/* use for ranking in Cover */`
`21`	`21`	`length:11,`
`22`	`22`	`distance:20;`
`23`	`23`	`}ITEM;`

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!

Commit436a295

File tree

264 files changed

Some content is hidden

264 files changed

`‎contrib/dblink/dblink.c`

`‎contrib/intarray/_int_gist.c`

`‎contrib/pgbench/pgbench.c`

`‎contrib/pgcrypto/pgp-decrypt.c`

`‎contrib/pgcrypto/pgp-pgsql.c`

`‎contrib/tablefunc/tablefunc.c`

`‎contrib/tsearch2/query.c`

`‎contrib/tsearch2/query.h`

0 commit comments