Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitea08e6c

Browse files
committed
New pgindent run with fixes suggested by Tom. Patch manually reviewed,
initdb/regression tests pass.
1 parent34153b2 commitea08e6c

File tree

503 files changed

+1652
-1614
lines changed

Some content is hidden

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

503 files changed

+1652
-1614
lines changed

‎contrib/btree_gist/btree_gist.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@ typedef struct intkey
1515
{
1616
int4lower;
1717
int4upper;
18-
}INT4KEY;
18+
}INT4KEY;
1919

2020
typedefstructtskey
2121
{
2222
Timestamplower;
2323
Timestampupper;
24-
}TSKEY;
24+
}TSKEY;
2525

2626
/* used for sorting */
2727
typedefstructrix
2828
{
2929
intindex;
3030
char*r;
31-
}RIX;
31+
}RIX;
3232

3333
/*
3434
** int4key in/out

‎contrib/chkpass/chkpass.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* darcy@druid.net
55
* http://www.druid.net/darcy/
66
*
7-
* $Id: chkpass.c,v 1.5 2001/10/25 05:49:19 momjian Exp $
7+
* $Id: chkpass.c,v 1.6 2001/11/05 17:46:22 momjian Exp $
88
* best viewed with tabs set to 4
99
*/
1010

@@ -32,7 +32,7 @@
3232
typedefstructchkpass
3333
{
3434
charpassword[16];
35-
}chkpass;
35+
}chkpass;
3636

3737
/*
3838
* Various forward declarations:

‎contrib/cube/cubedata.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ typedef struct NDBOX
33
unsignedintsize;/* required to be a Postgres varlena type */
44
unsignedintdim;
55
floatx[1];
6-
}NDBOX;
6+
}NDBOX;

‎contrib/dbase/dbf.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ typedef struct
5151
u_chardbh_hlen[2];/* length of this header */
5252
u_chardbh_rlen[2];/* length of a record */
5353
u_chardbh_stub[20];/* misc stuff we don't need */
54-
}dbf_header;
54+
}dbf_header;
5555

5656
/* disk field-description */
5757

@@ -64,7 +64,7 @@ typedef struct
6464
u_chardbf_dec;/* number of decimal positions if type is
6565
* 'N' */
6666
u_chardbf_stub[14];/* stuff we don't need */
67-
}dbf_field;
67+
}dbf_field;
6868

6969
/* memory field-description */
7070

@@ -74,7 +74,7 @@ typedef struct
7474
u_chardb_type;/* field-type */
7575
u_chardb_flen;/* field-length */
7676
u_chardb_dec;/* number of decimal positions */
77-
}f_descr;
77+
}f_descr;
7878

7979
/* memory dfb-header */
8080

@@ -95,7 +95,7 @@ typedef struct
9595
u_char*db_buff;/* record-buffer to save malloc()'s */
9696
f_descr*db_fields;/* pointer to an array of field-
9797
* descriptions */
98-
}dbhead;
98+
}dbhead;
9999

100100
/* structure that contains everything a user wants from a field, including
101101
the contents (in ASCII). Warning! db_flen may be bigger than the actual
@@ -109,7 +109,7 @@ typedef struct
109109
u_chardb_flen;/* field-length */
110110
u_chardb_dec;/* number of decimal positions */
111111
u_char*db_contents;/* contents of the field in ASCII */
112-
}field;
112+
}field;
113113

114114
/* prototypes for functions */
115115

@@ -136,4 +136,4 @@ extern void put_long(u_char *cp, long lval);
136136
externshortget_short(u_char*cp);
137137
externvoidput_short(u_char*cp,shortlval);
138138

139-
#endif/* _DBF_H */
139+
#endif/* _DBF_H */

‎contrib/dblink/dblink.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ typedef struct
5454
*/
5555
PGresult*res;
5656

57-
}dblink_results;
57+
}dblink_results;
5858

5959
/*
6060
* External declarations
@@ -67,4 +67,4 @@ extern Datum dblink_tok(PG_FUNCTION_ARGS);
6767
*/
6868
dblink_results*init_dblink_results(MemoryContextfn_mcxt);
6969

70-
#endif/* DBLINK_H */
70+
#endif/* DBLINK_H */

‎contrib/fulltextindex/fti.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,15 @@ char *StopWords[] = {/* list of words to skip in indexing */
103103
"the",
104104
"yes"
105105
};
106-
#endif/* USE_STOP_WORDS */
106+
#endif/* USE_STOP_WORDS */
107107

108108
/* stuff for caching query-plans, stolen from contrib/spi/\*.c */
109109
typedefstruct
110110
{
111111
char*ident;
112112
intnplans;
113113
void**splan;
114-
}EPlan;
114+
}EPlan;
115115

116116
staticEPlan*InsertPlans=NULL;
117117
staticEPlan*DeletePlans=NULL;
@@ -403,7 +403,7 @@ is_stopword(char *text)
403403
else
404404
StopHigh=StopMiddle;
405405
}
406-
#endif/* USE_STOP_WORDS */
406+
#endif/* USE_STOP_WORDS */
407407

408408
return (false);
409409
}

‎contrib/fuzzystrmatch/fuzzystrmatch.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,4 +169,4 @@ char_codes[26] = {
169169
/* These prevent GH from becoming F */
170170
#defineNOGHTOF(c)(ENCODE(c) & 16)/* BDH */
171171

172-
#endif/* FUZZYSTRMATCH_H */
172+
#endif/* FUZZYSTRMATCH_H */

‎contrib/isbn_issn/isbn_issn.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
*PostgreSQL type definitions for ISBNs.
33
*
4-
*$Id: isbn_issn.c,v 1.3 2001/02/10 02:31:25 tgl Exp $
4+
*$Id: isbn_issn.c,v 1.4 2001/11/05 17:46:23 momjian Exp $
55
*/
66

77
#include"postgres.h"
@@ -16,7 +16,7 @@ typedef struct isbn
1616
{
1717
charnum[13];
1818
charpad[3];
19-
}isbn;
19+
}isbn;
2020

2121
/*
2222
*Various forward declarations:
@@ -204,7 +204,7 @@ typedef struct issn
204204
{
205205
charnum[9];
206206
charpad[7];
207-
}issn;
207+
}issn;
208208

209209
/*
210210
*Various forward declarations:

‎contrib/pg_dumplo/pg_dumplo.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* -------------------------------------------------------------------------
22
* pg_dumplo
33
*
4-
* $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/pg_dumplo.h,v 1.6 2001/10/28 06:25:40 momjian Exp $
4+
* $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/pg_dumplo.h,v 1.7 2001/11/05 17:46:23 momjian Exp $
55
*
66
*Karel Zak 1999-2000
77
* -------------------------------------------------------------------------
@@ -41,7 +41,7 @@ typedef struct
4141
char*lo_table,
4242
*lo_attr;
4343
Oidlo_oid;
44-
}LOlist;
44+
}LOlist;
4545

4646
typedefstruct
4747
{
@@ -60,7 +60,7 @@ typedef struct
6060
quiet;
6161
PGresult*res;
6262
PGconn*conn;
63-
}LODumpMaster;
63+
}LODumpMaster;
6464

6565
typedefenum
6666
{
@@ -69,7 +69,7 @@ typedef enum
6969
ACTION_EXPORT_ATTR,
7070
ACTION_EXPORT_ALL,
7171
ACTION_IMPORT
72-
}PGLODUMP_ACTIONS;
72+
}PGLODUMP_ACTIONS;
7373

7474
externchar*progname;
7575

@@ -79,4 +79,4 @@ extern void load_lolist(LODumpMaster * pgLO);
7979
externvoidpglo_export(LODumpMaster*pgLO);
8080
externvoidpglo_import(LODumpMaster*pgLO);
8181

82-
#endif/* PG_DUMPLO_H */
82+
#endif/* PG_DUMPLO_H */

‎contrib/pg_logger/pg_logger.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ struct
1818
constchar*tag;
1919
intsize;
2020
intpriority;
21-
}tags[]=
21+
}tags[]=
2222

2323
{
2424
{

‎contrib/pg_resetxlog/pg_resetxlog.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
2424
* Portions Copyright (c) 1994, Regents of the University of California
2525
*
26-
* $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/pg_resetxlog.c,v 1.9 2001/10/28 06:25:41 momjian Exp $
26+
* $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/pg_resetxlog.c,v 1.10 2001/11/05 17:46:23 momjian Exp $
2727
*
2828
*-------------------------------------------------------------------------
2929
*/
@@ -221,7 +221,7 @@ typedef struct crc64V0
221221
{
222222
uint32crc1;
223223
uint32crc2;
224-
}crc64V0;
224+
}crc64V0;
225225

226226
staticuint32crc_tableV0[]= {
227227
0x00000000,0x77073096,0xee0e612c,0x990951ba,0x076dc419,0x706af48f,
@@ -309,7 +309,7 @@ typedef struct ControlFileDataV0
309309
charlc_collate[LOCALE_NAME_BUFLEN_V0];
310310
charlc_ctype[LOCALE_NAME_BUFLEN_V0];
311311
chararchdir[MAXPGPATH];/* where to move offline log files */
312-
}ControlFileDataV0;
312+
}ControlFileDataV0;
313313

314314
typedefstructCheckPointV0
315315
{
@@ -323,7 +323,7 @@ typedef struct CheckPointV0
323323
TransactionIdnextXid;
324324
OidnextOid;
325325
boolShutdown;
326-
}CheckPointV0;
326+
}CheckPointV0;
327327

328328
typedefstructXLogRecordV0
329329
{
@@ -334,14 +334,14 @@ typedef struct XLogRecordV0
334334
uint16xl_len;/* total len of record *data* */
335335
uint8xl_info;
336336
RmgrIdxl_rmid;/* resource manager inserted this record */
337-
}XLogRecordV0;
337+
}XLogRecordV0;
338338

339339
#defineSizeOfXLogRecordV0DOUBLEALIGN(sizeof(XLogRecordV0))
340340

341341
typedefstructXLogContRecordV0
342342
{
343343
uint16xl_len;/* len of data left */
344-
}XLogContRecordV0;
344+
}XLogContRecordV0;
345345

346346
#defineSizeOfXLogContRecordV0DOUBLEALIGN(sizeof(XLogContRecordV0))
347347

@@ -351,7 +351,7 @@ typedef struct XLogPageHeaderDataV0
351351
{
352352
uint32xlp_magic;
353353
uint16xlp_info;
354-
}XLogPageHeaderDataV0;
354+
}XLogPageHeaderDataV0;
355355

356356
#defineSizeOfXLogPHDV0 DOUBLEALIGN(sizeof(XLogPageHeaderDataV0))
357357

‎contrib/pgbench/pgbench.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* $Header: /cvsroot/pgsql/contrib/pgbench/pgbench.c,v 1.12 2001/10/25 05:49:19 momjian Exp $
2+
* $Header: /cvsroot/pgsql/contrib/pgbench/pgbench.c,v 1.13 2001/11/05 17:46:23 momjian Exp $
33
*
44
* pgbench: a simple TPC-B like benchmark program for PostgreSQL
55
* written by Tatsuo Ishii
@@ -39,7 +39,7 @@
3939

4040
/* for getrlimit */
4141
#include<sys/resource.h>
42-
#endif/* WIN32 */
42+
#endif/* WIN32 */
4343

4444
/********************************************************************
4545
* some configurable parameters */
@@ -90,7 +90,7 @@ typedef struct
9090
inttid;/* teller id for this transaction */
9191
intdelta;
9292
intabalance;
93-
}CState;
93+
}CState;
9494

9595
staticvoid
9696
usage()
@@ -680,7 +680,7 @@ main(int argc, char **argv)
680680
#else/* but BSD doesn't ... */
681681
if (getrlimit(RLIMIT_OFILE,&rlim)==-1)
682682
{
683-
#endif/* HAVE_RLIMIT_NOFILE */
683+
#endif/* HAVE_RLIMIT_NOFILE */
684684
fprintf(stderr,"getrlimit failed. reason: %s\n",strerror(errno));
685685
exit(1);
686686
}
@@ -690,7 +690,7 @@ main(int argc, char **argv)
690690
fprintf(stderr,"Use limit/ulimt to increase the limit before using pgbench.\n");
691691
exit(1);
692692
}
693-
#endif/* #ifndef __CYGWIN__ */
693+
#endif/* #ifndef __CYGWIN__ */
694694
break;
695695
case'C':
696696
is_connect=1;

‎contrib/pgcrypto/blf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
#defineinline __inline
4949
#else/* !__GNUC__ */
5050
#defineinline
51-
#endif/* !__GNUC__ */
51+
#endif/* !__GNUC__ */
5252

5353
/* Function for Feistel Networks */
5454

‎contrib/pgcrypto/blf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ typedef struct BlowfishContext
5050
{
5151
uint32S[4][256];/* S-Boxes */
5252
uint32P[BLF_N+2];/* Subkeys */
53-
}blf_ctx;
53+
}blf_ctx;
5454

5555
/* Raw access to customized Blowfish
5656
*blf_key is just:

‎contrib/pgcrypto/crypt-blowfish.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ typedef struct
6161
{
6262
BF_wordS[4][0x100];
6363
BF_keyP;
64-
}BF_ctx;
64+
}BF_ctx;
6565

6666
/*
6767
* Magic IV for 64 Blowfish encryptions that we do at the end.

‎contrib/pgcrypto/crypt-des.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,7 @@ px_crypt_des(const char *key, const char *setting)
713713
p=output+strlen(output);
714714
}
715715
else
716-
#endif/* !DISABLE_XDES */
716+
#endif/* !DISABLE_XDES */
717717
{
718718
/*
719719
* "old"-style: setting - 2 bytes of salt key - up to 8 characters

‎contrib/pgcrypto/internal.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
2727
* SUCH DAMAGE.
2828
*
29-
* $Id: internal.c,v 1.7 2001/10/28 06:25:41 momjian Exp $
29+
* $Id: internal.c,v 1.8 2001/11/05 17:46:23 momjian Exp $
3030
*/
3131

3232

@@ -61,7 +61,7 @@ static struct int_digest
6161
{
6262
char*name;
6363
void(*init) (PX_MD*h);
64-
}int_digest_list[]=
64+
}int_digest_list[]=
6565

6666
{
6767
{
@@ -520,7 +520,7 @@ static struct
520520
{
521521
char*name;
522522
PX_Cipher*(*load) (void);
523-
}int_ciphers[]=
523+
}int_ciphers[]=
524524

525525
{
526526
{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp