Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 6783b23

Browse files
bmomjianbmomjian
committed
Another pgindent run. Fixes enum indenting, and improves #endif
spacing. Also adds space for one-line comments.
1 parent c29797d commit 6783b23

File tree

525 files changed

+2434
-2054
lines changed

Some content is hidden

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

525 files changed

+2434
-2054
lines changed

‎contrib/btree_gist/btree_gist.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ tskey_cmp(const void *a, const void *b)
486486
TimestampGetDatum(((TSKEY *) (((RIX *) a)->r))->lower),
487487
TimestampGetDatum(((TSKEY *) (((RIX *) b)->r))->lower)
488488
)
489-
);
489+
);
490490
}
491491

492492
/**************************************************

‎contrib/dbase/dbf.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ typedef struct
5959
{
6060
u_char dbf_name[DBF_NAMELEN]; /* field-name terminated with \0 */
6161
u_char dbf_type; /* field-type */
62-
u_char dbf_reserved[4]; /* some reserved stuff */
62+
u_char dbf_reserved[4]; /* some reserved stuff */
6363
u_char dbf_flen; /* field-length */
6464
u_char dbf_dec; /* number of decimal positions if type is
6565
* 'N' */
@@ -135,4 +135,5 @@ extern long get_long(u_char *cp);
135135
extern void put_long(u_char *cp, long lval);
136136
extern short get_short(u_char *cp);
137137
extern void put_short(u_char *cp, short lval);
138+
138139
#endif /* _DBF_H */

‎contrib/dblink/dblink.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,5 @@ extern Datum dblink_tok(PG_FUNCTION_ARGS);
6666
* Internal declarations
6767
*/
6868
dblink_results *init_dblink_results(MemoryContext fn_mcxt);
69+
6970
#endif /* DBLINK_H */

‎contrib/lo/lo.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* PostgreSQL type definitions for managed LargeObjects.
33
*
4-
* $Header: /cvsroot/pgsql/contrib/lo/lo.c,v 1.9 2001/10/25 05:49:19 momjian Exp $
4+
* $Header: /cvsroot/pgsql/contrib/lo/lo.c,v 1.10 2001/10/28 06:25:40 momjian Exp $
55
*
66
*/
77

@@ -33,8 +33,8 @@ typedef Oid Blob;
3333
*/
3434

3535
Blob *lo_in(char *str); /* Create from String */
36-
char *lo_out(Blob * addr); /* Output oid as String */
37-
Oid lo_oid(Blob * addr); /* Return oid as an oid */
36+
char *lo_out(Blob * addr); /* Output oid as String */
37+
Oid lo_oid(Blob * addr); /* Return oid as an oid */
3838
Blob *lo(Oid oid); /* Return Blob based on oid */
3939
Datum lo_manage(PG_FUNCTION_ARGS); /* Trigger handler */
4040

@@ -139,7 +139,7 @@ lo_manage(PG_FUNCTION_ARGS)
139139
TupleDesc tupdesc; /* Tuple Descriptor */
140140
HeapTuple rettuple; /* Tuple to be returned */
141141
bool isdelete; /* are we deleting? */
142-
HeapTuple newtuple = NULL; /* The new value for tuple */
142+
HeapTuple newtuple = NULL; /* The new value for tuple */
143143
HeapTuple trigtuple; /* The original value of tuple */
144144

145145
if (!CALLED_AS_TRIGGER(fcinfo))

‎contrib/miscutil/misc_utils.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ int unlisten(char *relname);
66
int max(int x, int y);
77
int min(int x, int y);
88
int active_listeners(text *relname);
9+
910
#endif

‎contrib/pg_dumplo/pg_dumplo.h

Lines changed: 7 additions & 6 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.5 2001/10/25 05:49:19 momjian Exp $
4+
* $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/pg_dumplo.h,v 1.6 2001/10/28 06:25:40 momjian Exp $
55
*
66
* Karel Zak 1999-2000
77
* -------------------------------------------------------------------------
@@ -64,11 +64,11 @@ typedef struct
6464

6565
typedef enum
6666
{
67-
ACTION_NONE,
68-
ACTION_SHOW,
69-
ACTION_EXPORT_ATTR,
70-
ACTION_EXPORT_ALL,
71-
ACTION_IMPORT
67+
ACTION_NONE,
68+
ACTION_SHOW,
69+
ACTION_EXPORT_ATTR,
70+
ACTION_EXPORT_ALL,
71+
ACTION_IMPORT
7272
} PGLODUMP_ACTIONS;
7373

7474
extern char *progname;
@@ -78,4 +78,5 @@ extern void index_file(LODumpMaster * pgLO);
7878
extern void load_lolist(LODumpMaster * pgLO);
7979
extern void pglo_export(LODumpMaster * pgLO);
8080
extern void pglo_import(LODumpMaster * pgLO);
81+
8182
#endif /* PG_DUMPLO_H */

‎contrib/pg_resetxlog/pg_resetxlog.c

Lines changed: 2 additions & 2 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.8 2001/10/25 05:49:19 momjian Exp $
26+
* $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/pg_resetxlog.c,v 1.9 2001/10/28 06:25:41 momjian Exp $
2727
*
2828
*-------------------------------------------------------------------------
2929
*/
@@ -491,7 +491,7 @@ ReadRecordV0(XLogRecPtr *RecPtr, char *buffer)
491491
readFile = XLogFileOpen(readId, readSeg);
492492
if (readFile < 0)
493493
goto next_record_is_invalid;
494-
readOff = (uint32) (-1); /* force read to occur below */
494+
readOff = (uint32) (-1); /* force read to occur below */
495495
}
496496

497497
targetPageOff = ((RecPtr->xrecoff % XLogSegSize) / BLCKSZ) * BLCKSZ;

‎contrib/pgcrypto/blf.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,5 @@ void blf_ecb_decrypt(blf_ctx *, uint8 *, uint32);
7979

8080
void blf_cbc_encrypt(blf_ctx *, uint8 *, uint8 *, uint32);
8181
void blf_cbc_decrypt(blf_ctx *, uint8 *, uint8 *, uint32);
82+
8283
#endif

‎contrib/pgcrypto/crypt-des.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -159,14 +159,14 @@ static uint8 pbox[32] = {
159159

160160
static uint32 _crypt_bits32[32] =
161161
{
162-
0x80000000, 0x40000000, 0x20000000, 0x10000000,
163-
0x08000000, 0x04000000, 0x02000000, 0x01000000,
164-
0x00800000, 0x00400000, 0x00200000, 0x00100000,
165-
0x00080000, 0x00040000, 0x00020000, 0x00010000,
166-
0x00008000, 0x00004000, 0x00002000, 0x00001000,
167-
0x00000800, 0x00000400, 0x00000200, 0x00000100,
168-
0x00000080, 0x00000040, 0x00000020, 0x00000010,
169-
0x00000008, 0x00000004, 0x00000002, 0x00000001
162+
0x80000000, 0x40000000, 0x20000000, 0x10000000,
163+
0x08000000, 0x04000000, 0x02000000, 0x01000000,
164+
0x00800000, 0x00400000, 0x00200000, 0x00100000,
165+
0x00080000, 0x00040000, 0x00020000, 0x00010000,
166+
0x00008000, 0x00004000, 0x00002000, 0x00001000,
167+
0x00000800, 0x00000400, 0x00000200, 0x00000100,
168+
0x00000080, 0x00000040, 0x00000020, 0x00000010,
169+
0x00000008, 0x00000004, 0x00000002, 0x00000001
170170
};
171171

172172
static uint8 _crypt_bits8[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};

‎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.6 2001/10/25 05:49:19 momjian Exp $
29+
* $Id: internal.c,v 1.7 2001/10/28 06:25:41 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
{

‎contrib/pgcrypto/md5.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: md5.h,v 1.5 2001/08/21 00:42:41 momjian Exp $ */
1+
/* $Id: md5.h,v 1.6 2001/10/28 06:25:41 momjian Exp $ */
22
/* $KAME: md5.h,v 1.3 2000/02/22 14:01:18 itojun Exp $ */
33

44
/*
@@ -75,4 +75,5 @@ do { \
7575
md5_pad((y)); \
7676
md5_result((x), (y)); \
7777
} while (0)
78+
7879
#endif /* ! _NETINET6_MD5_H_ */

‎contrib/pgcrypto/openssl.c

Lines changed: 5 additions & 5 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: openssl.c,v 1.6 2001/10/25 05:49:19 momjian Exp $
29+
* $Id: openssl.c,v 1.7 2001/10/28 06:25:41 momjian Exp $
3030
*/
3131

3232
#include <postgres.h>
@@ -331,28 +331,28 @@ struct
331331
"bf-cbc",
332332
{
333333
gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size,
334-
bf_init, bf_cbc_encrypt, bf_cbc_decrypt, gen_evp_free
334+
bf_init, bf_cbc_encrypt, bf_cbc_decrypt, gen_evp_free
335335
}
336336
},
337337
{
338338
"bf-ecb",
339339
{
340340
gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size,
341-
bf_init, bf_ecb_encrypt, bf_ecb_decrypt, gen_evp_free
341+
bf_init, bf_ecb_encrypt, bf_ecb_decrypt, gen_evp_free
342342
}
343343
},
344344
{
345345
"bf-cfb",
346346
{
347347
gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size,
348-
bf_init, bf_cfb64_encrypt, bf_cfb64_decrypt, gen_evp_free
348+
bf_init, bf_cfb64_encrypt, bf_cfb64_decrypt, gen_evp_free
349349
}
350350
},
351351
{
352352
"bf-ofb",
353353
{
354354
gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size,
355-
bf_init, bf_ofb64_encrypt, bf_ofb64_decrypt, gen_evp_free
355+
bf_init, bf_ofb64_encrypt, bf_ofb64_decrypt, gen_evp_free
356356
}
357357
},
358358
{

‎contrib/pgcrypto/pgcrypto.h

Lines changed: 2 additions & 1 deletion
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: pgcrypto.h,v 1.6 2001/10/25 05:49:20 momjian Exp $
29+
* $Id: pgcrypto.h,v 1.7 2001/10/28 06:25:41 momjian Exp $
3030
*/
3131

3232
#ifndef _PG_CRYPTO_H
@@ -45,4 +45,5 @@ Datum pg_decrypt(PG_FUNCTION_ARGS);
4545
Datum pg_encrypt_iv(PG_FUNCTION_ARGS);
4646
Datum pg_decrypt_iv(PG_FUNCTION_ARGS);
4747
Datum pg_cipher_exists(PG_FUNCTION_ARGS);
48+
4849
#endif

‎contrib/pgcrypto/px-crypt.c

Lines changed: 2 additions & 2 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: px-crypt.c,v 1.3 2001/10/25 05:49:20 momjian Exp $
29+
* $Id: px-crypt.c,v 1.4 2001/10/28 06:25:41 momjian Exp $
3030
*/
3131

3232
#include <postgres.h>
@@ -75,7 +75,7 @@ static struct
7575
unsigned id_len;
7676
char *(*crypt) (const char *psw, const char *salt,
7777
char *buf, unsigned len);
78-
} px_crypt_list[] =
78+
} px_crypt_list[] =
7979

8080
{
8181
{

‎contrib/pgcrypto/px-crypt.h

Lines changed: 2 additions & 1 deletion
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: px-crypt.h,v 1.3 2001/10/25 05:49:20 momjian Exp $
29+
* $Id: px-crypt.h,v 1.4 2001/10/28 06:25:41 momjian Exp $
3030
*/
3131

3232
#ifndef _PX_CRYPT_H
@@ -89,4 +89,5 @@ char *px_crypt_des(const char *key, const char *setting);
8989
char *px_crypt_md5(const char *pw, const char *salt,
9090
char *dst, unsigned dstlen);
9191
#endif /* !PX_SYSTEM_CRYPT */
92+
9293
#endif /* _PX_CRYPT_H */

‎contrib/pgcrypto/random.c

Lines changed: 2 additions & 1 deletion
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: random.c,v 1.3 2001/10/25 05:49:20 momjian Exp $
29+
* $Id: random.c,v 1.4 2001/10/28 06:25:41 momjian Exp $
3030
*/
3131

3232

@@ -124,4 +124,5 @@ px_get_random_bytes(uint8 *dst, unsigned count)
124124

125125
return -1;
126126
}
127+
127128
#endif /* RAND_OPENSSL */

‎contrib/pgcrypto/rijndael.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -664,4 +664,5 @@ main()
664664
printf("\n};\n\n");
665665
return 0;
666666
}
667+
667668
#endif

‎contrib/pgcrypto/sha1.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: sha1.c,v 1.8 2001/10/25 05:49:20 momjian Exp $ */
1+
/* $Id: sha1.c,v 1.9 2001/10/28 06:25:41 momjian Exp $ */
22
/* $KAME: sha1.c,v 1.3 2000/02/22 14:01:18 itojun Exp $ */
33

44
/*
@@ -345,4 +345,5 @@ sha1_result(struct sha1_ctxt * ctxt, uint8 *digest0)
345345
digest[19] = ctxt->h.b8[16];
346346
#endif
347347
}
348+
348349
#endif /* unsupported */

‎contrib/pgcrypto/sha1.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: sha1.h,v 1.6 2001/10/25 05:49:20 momjian Exp $ */
1+
/* $Id: sha1.h,v 1.7 2001/10/28 06:25:41 momjian Exp $ */
22
/* $KAME: sha1.h,v 1.4 2000/02/22 14:01:18 itojun Exp $ */
33

44
/*
@@ -71,4 +71,5 @@ typedef struct sha1_ctxt SHA1_CTX;
7171
#define SHA1Final(x, y) sha1_result((y), (x))
7272

7373
#define SHA1_RESULTLEN (160/8)
74+
7475
#endif /* _NETINET6_SHA1_H_ */

‎contrib/rserv/rserv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ _rserv_log_()
4343
char **args; /* argument: argnum */
4444
Relation rel; /* triggered relation */
4545
HeapTuple tuple; /* tuple to return */
46-
HeapTuple newtuple = NULL; /* tuple to return */
46+
HeapTuple newtuple = NULL; /* tuple to return */
4747
TupleDesc tupdesc; /* tuple description */
4848
int keynum;
4949
char *key;

‎contrib/spi/refint.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ check_primary_key(PG_FUNCTION_ARGS)
5252
HeapTuple tuple = NULL; /* tuple to return */
5353
TupleDesc tupdesc; /* tuple description */
5454
EPlan *plan; /* prepared plan */
55-
Oid *argtypes = NULL; /* key types to prepare execution plan */
55+
Oid *argtypes = NULL; /* key types to prepare execution plan */
5656
bool isnull; /* to know is some column NULL or not */
5757
char ident[2 * NAMEDATALEN]; /* to identify myself */
5858
int ret;
@@ -235,10 +235,10 @@ check_foreign_key(PG_FUNCTION_ARGS)
235235
char *relname; /* referencing relation name */
236236
Relation rel; /* triggered relation */
237237
HeapTuple trigtuple = NULL; /* tuple to being changed */
238-
HeapTuple newtuple = NULL; /* tuple to return */
238+
HeapTuple newtuple = NULL; /* tuple to return */
239239
TupleDesc tupdesc; /* tuple description */
240240
EPlan *plan; /* prepared plan(s) */
241-
Oid *argtypes = NULL; /* key types to prepare execution plan */
241+
Oid *argtypes = NULL; /* key types to prepare execution plan */
242242
bool isnull; /* to know is some column NULL or not */
243243
bool isequal = true; /* are keys in both tuples equal (in
244244
* UPDATE) */

‎contrib/tsearch/crc32.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ extern unsigned int crc32_sz(char *buf, int size);
66

77
/* Returns crc32 of null-terminated string */
88
#define crc32(buf) crc32_sz((buf),strlen(buf))
9+
910
#endif

‎contrib/tsearch/deflex.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@
2525
#define FILEPATH 19
2626

2727
extern const char *descr[];
28+
2829
#endif

‎contrib/tsearch/gistidx.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,5 @@ typedef struct
6262
#define GETSIGN(x) ( (BITVECP)( (char*)x+GTHDRSIZE ) )
6363
#define GETARR(x) ( (int4*)( (char*)x+GTHDRSIZE ) )
6464
#define ARRNELEM(x) ( ( ((GISTTYPE*)x)->len - GTHDRSIZE )/sizeof(int4) )
65+
6566
#endif

‎contrib/tsearch/morph.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ void initmorph(void);
66
char *lemmatize(char *word, int *len, int type);
77

88
bool is_stoptype(int type);
9+
910
#endif

‎contrib/tsearch/parser.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ int tsearch_yylex(void);
77
void start_parse_str(char *, int);
88
void start_parse_fh(FILE *, int);
99
void end_parse(void);
10+
1011
#endif

‎contrib/tsearch/query.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ gettoken_query(QPRS_STATE * state, int4 *val, int4 *lenval, char **strval)
104104
{
105105
switch (state->state)
106106
{
107-
case WAITOPERAND:
107+
case WAITOPERAND:
108108
if (*(state->buf) == '!')
109109
{
110110
(state->buf)++;
@@ -408,7 +408,7 @@ rexecqtxt(PG_FUNCTION_ARGS)
408408
execqtxt,
409409
PG_GETARG_DATUM(1),
410410
PG_GETARG_DATUM(0)
411-
);
411+
);
412412
}
413413

414414
Datum

0 commit comments

Comments
 (0)