database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-31 22:04:40 +03:00
Code Activity

Another pgindent run. Fixes enum indenting, and improves #endif

Browse Source 
spacing.  Also adds space for one-line comments.
This commit is contained in:
Bruce Momjian
2001-10-28 06:26:15 +00:00
parent c29797deeb
commit 6783b2372e
525 changed files with 2429 additions and 2049 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/btree_gist/btree_gist.c
View File

@ -486,7 +486,7 @@ tskey_cmp(const void *a, const void *b)
TimestampGetDatum(((TSKEY *) (((RIX *) a)->r))->lower),
TimestampGetDatum(((TSKEY *) (((RIX *) b)->r))->lower)
)
);
);
}
/**************************************************

3
contrib/dbase/dbf.h
View File

@ -59,7 +59,7 @@ typedef struct
{
u_char dbf_name[DBF_NAMELEN]; /* field-name terminated with \0 */
u_char dbf_type; /* field-type */
u_char dbf_reserved[4]; /* some reserved stuff */
u_char dbf_reserved[4]; /* some reserved stuff */
u_char dbf_flen; /* field-length */
u_char dbf_dec; /* number of decimal positions if type is
* 'N' */
@ -135,4 +135,5 @@ extern long get_long(u_char *cp);
extern void put_long(u_char *cp, long lval);
extern short get_short(u_char *cp);
extern void put_short(u_char *cp, short lval);
#endif /* _DBF_H */

1
contrib/dblink/dblink.h
View File

@ -66,4 +66,5 @@ extern Datum dblink_tok(PG_FUNCTION_ARGS);
* Internal declarations
*/
dblink_results *init_dblink_results(MemoryContext fn_mcxt);
#endif /* DBLINK_H */

8
contrib/lo/lo.c
View File

@ -1,7 +1,7 @@
/*
* PostgreSQL type definitions for managed LargeObjects.
*
* $Header: /cvsroot/pgsql/contrib/lo/lo.c,v 1.9 2001/10/25 05:49:19 momjian Exp $
* $Header: /cvsroot/pgsql/contrib/lo/lo.c,v 1.10 2001/10/28 06:25:40 momjian Exp $
*
*/
@ -33,8 +33,8 @@ typedef Oid Blob;
*/
Blob *lo_in(char *str); /* Create from String */
char *lo_out(Blob * addr); /* Output oid as String */
Oid lo_oid(Blob * addr); /* Return oid as an oid */
char *lo_out(Blob * addr); /* Output oid as String */
Oid lo_oid(Blob * addr); /* Return oid as an oid */
Blob *lo(Oid oid); /* Return Blob based on oid */
Datum lo_manage(PG_FUNCTION_ARGS); /* Trigger handler */
@ -139,7 +139,7 @@ lo_manage(PG_FUNCTION_ARGS)
TupleDesc tupdesc; /* Tuple Descriptor */
HeapTuple rettuple; /* Tuple to be returned */
bool isdelete; /* are we deleting? */
HeapTuple newtuple = NULL; /* The new value for tuple */
HeapTuple newtuple = NULL; /* The new value for tuple */
HeapTuple trigtuple; /* The original value of tuple */
if (!CALLED_AS_TRIGGER(fcinfo))

1
contrib/miscutil/misc_utils.h
View File

@ -6,4 +6,5 @@ int unlisten(char *relname);
int max(int x, int y);
int min(int x, int y);
int active_listeners(text *relname);
#endif

13
contrib/pg_dumplo/pg_dumplo.h
View File

@ -1,7 +1,7 @@
/* -------------------------------------------------------------------------
* pg_dumplo
*
* $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/pg_dumplo.h,v 1.5 2001/10/25 05:49:19 momjian Exp $
* $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/pg_dumplo.h,v 1.6 2001/10/28 06:25:40 momjian Exp $
*
* Karel Zak 1999-2000
* -------------------------------------------------------------------------
@ -64,11 +64,11 @@ typedef struct
typedef enum
{
ACTION_NONE,
ACTION_SHOW,
ACTION_EXPORT_ATTR,
ACTION_EXPORT_ALL,
ACTION_IMPORT
ACTION_NONE,
ACTION_SHOW,
ACTION_EXPORT_ATTR,
ACTION_EXPORT_ALL,
ACTION_IMPORT
} PGLODUMP_ACTIONS;
extern char *progname;
@ -78,4 +78,5 @@ extern void index_file(LODumpMaster * pgLO);
extern void load_lolist(LODumpMaster * pgLO);
extern void pglo_export(LODumpMaster * pgLO);
extern void pglo_import(LODumpMaster * pgLO);
#endif /* PG_DUMPLO_H */

4
contrib/pg_resetxlog/pg_resetxlog.c
View File

@ -23,7 +23,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/pg_resetxlog.c,v 1.8 2001/10/25 05:49:19 momjian Exp $
* $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/pg_resetxlog.c,v 1.9 2001/10/28 06:25:41 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -491,7 +491,7 @@ ReadRecordV0(XLogRecPtr *RecPtr, char *buffer)
readFile = XLogFileOpen(readId, readSeg);
if (readFile < 0)
goto next_record_is_invalid;
readOff = (uint32) (-1); /* force read to occur below */
readOff = (uint32) (-1); /* force read to occur below */
}
targetPageOff = ((RecPtr->xrecoff % XLogSegSize) / BLCKSZ) * BLCKSZ;

1
contrib/pgcrypto/blf.h
View File

@ -79,4 +79,5 @@ void blf_ecb_decrypt(blf_ctx *, uint8 *, uint32);
void blf_cbc_encrypt(blf_ctx *, uint8 *, uint8 *, uint32);
void blf_cbc_decrypt(blf_ctx *, uint8 *, uint8 *, uint32);
#endif

16
contrib/pgcrypto/crypt-des.c
View File

@ -159,14 +159,14 @@ static uint8 pbox[32] = {
static uint32 _crypt_bits32[32] =
{
0x80000000, 0x40000000, 0x20000000, 0x10000000,
0x08000000, 0x04000000, 0x02000000, 0x01000000,
0x00800000, 0x00400000, 0x00200000, 0x00100000,
0x00080000, 0x00040000, 0x00020000, 0x00010000,
0x00008000, 0x00004000, 0x00002000, 0x00001000,
0x00000800, 0x00000400, 0x00000200, 0x00000100,
0x00000080, 0x00000040, 0x00000020, 0x00000010,
0x00000008, 0x00000004, 0x00000002, 0x00000001
0x80000000, 0x40000000, 0x20000000, 0x10000000,
0x08000000, 0x04000000, 0x02000000, 0x01000000,
0x00800000, 0x00400000, 0x00200000, 0x00100000,
0x00080000, 0x00040000, 0x00020000, 0x00010000,
0x00008000, 0x00004000, 0x00002000, 0x00001000,
0x00000800, 0x00000400, 0x00000200, 0x00000100,
0x00000080, 0x00000040, 0x00000020, 0x00000010,
0x00000008, 0x00000004, 0x00000002, 0x00000001
};
static uint8 _crypt_bits8[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};

6
contrib/pgcrypto/internal.c
View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: internal.c,v 1.6 2001/10/25 05:49:19 momjian Exp $
* $Id: internal.c,v 1.7 2001/10/28 06:25:41 momjian Exp $
*/
@ -61,7 +61,7 @@ static struct int_digest
{
char *name;
void (*init) (PX_MD * h);
} int_digest_list[] =
} int_digest_list[] =
{
{
@ -520,7 +520,7 @@ static struct
{
char *name;
PX_Cipher *(*load) (void);
} int_ciphers[] =
} int_ciphers[] =
{
{

3
contrib/pgcrypto/md5.h
View File

@ -1,4 +1,4 @@
/* $Id: md5.h,v 1.5 2001/08/21 00:42:41 momjian Exp $ */
/* $Id: md5.h,v 1.6 2001/10/28 06:25:41 momjian Exp $ */
/* $KAME: md5.h,v 1.3 2000/02/22 14:01:18 itojun Exp $ */
/*
@ -75,4 +75,5 @@ do { \
md5_pad((y)); \
md5_result((x), (y)); \
} while (0)
#endif /* ! _NETINET6_MD5_H_ */

10
contrib/pgcrypto/openssl.c
View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: openssl.c,v 1.6 2001/10/25 05:49:19 momjian Exp $
* $Id: openssl.c,v 1.7 2001/10/28 06:25:41 momjian Exp $
*/
#include <postgres.h>
@ -331,28 +331,28 @@ struct
"bf-cbc",
{
gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size,
bf_init, bf_cbc_encrypt, bf_cbc_decrypt, gen_evp_free
bf_init, bf_cbc_encrypt, bf_cbc_decrypt, gen_evp_free
}
},
{
"bf-ecb",
{
gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size,
bf_init, bf_ecb_encrypt, bf_ecb_decrypt, gen_evp_free
bf_init, bf_ecb_encrypt, bf_ecb_decrypt, gen_evp_free
}
},
{
"bf-cfb",
{
gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size,
bf_init, bf_cfb64_encrypt, bf_cfb64_decrypt, gen_evp_free
bf_init, bf_cfb64_encrypt, bf_cfb64_decrypt, gen_evp_free
}
},
{
"bf-ofb",
{
gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size,
bf_init, bf_ofb64_encrypt, bf_ofb64_decrypt, gen_evp_free
bf_init, bf_ofb64_encrypt, bf_ofb64_decrypt, gen_evp_free
}
},
{

3
contrib/pgcrypto/pgcrypto.h
View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: pgcrypto.h,v 1.6 2001/10/25 05:49:20 momjian Exp $
* $Id: pgcrypto.h,v 1.7 2001/10/28 06:25:41 momjian Exp $
*/
#ifndef _PG_CRYPTO_H
@ -45,4 +45,5 @@ Datum pg_decrypt(PG_FUNCTION_ARGS);
Datum pg_encrypt_iv(PG_FUNCTION_ARGS);
Datum pg_decrypt_iv(PG_FUNCTION_ARGS);
Datum pg_cipher_exists(PG_FUNCTION_ARGS);
#endif

4
contrib/pgcrypto/px-crypt.c
View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: px-crypt.c,v 1.3 2001/10/25 05:49:20 momjian Exp $
* $Id: px-crypt.c,v 1.4 2001/10/28 06:25:41 momjian Exp $
*/
#include <postgres.h>
@ -75,7 +75,7 @@ static struct
unsigned id_len;
char *(*crypt) (const char *psw, const char *salt,
char *buf, unsigned len);
} px_crypt_list[] =
} px_crypt_list[] =
{
{

3
contrib/pgcrypto/px-crypt.h
View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: px-crypt.h,v 1.3 2001/10/25 05:49:20 momjian Exp $
* $Id: px-crypt.h,v 1.4 2001/10/28 06:25:41 momjian Exp $
*/
#ifndef _PX_CRYPT_H
@ -89,4 +89,5 @@ char *px_crypt_des(const char *key, const char *setting);
char *px_crypt_md5(const char *pw, const char *salt,
char *dst, unsigned dstlen);
#endif /* !PX_SYSTEM_CRYPT */
#endif /* _PX_CRYPT_H */

3
contrib/pgcrypto/random.c
View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: random.c,v 1.3 2001/10/25 05:49:20 momjian Exp $
* $Id: random.c,v 1.4 2001/10/28 06:25:41 momjian Exp $
*/
@ -124,4 +124,5 @@ px_get_random_bytes(uint8 *dst, unsigned count)
return -1;
}
#endif /* RAND_OPENSSL */

1
contrib/pgcrypto/rijndael.c
View File

@ -664,4 +664,5 @@ main()
printf("\n};\n\n");
return 0;
}
#endif

3
contrib/pgcrypto/sha1.c
View File

@ -1,4 +1,4 @@
/* $Id: sha1.c,v 1.8 2001/10/25 05:49:20 momjian Exp $ */
/* $Id: sha1.c,v 1.9 2001/10/28 06:25:41 momjian Exp $ */
/* $KAME: sha1.c,v 1.3 2000/02/22 14:01:18 itojun Exp $ */
/*
@ -345,4 +345,5 @@ sha1_result(struct sha1_ctxt * ctxt, uint8 *digest0)
digest[19] = ctxt->h.b8[16];
#endif
}
#endif /* unsupported */

3
contrib/pgcrypto/sha1.h
View File

@ -1,4 +1,4 @@
/* $Id: sha1.h,v 1.6 2001/10/25 05:49:20 momjian Exp $ */
/* $Id: sha1.h,v 1.7 2001/10/28 06:25:41 momjian Exp $ */
/* $KAME: sha1.h,v 1.4 2000/02/22 14:01:18 itojun Exp $ */
/*
@ -71,4 +71,5 @@ typedef struct sha1_ctxt SHA1_CTX;
#define SHA1Final(x, y) sha1_result((y), (x))
#define SHA1_RESULTLEN (160/8)
#endif /* _NETINET6_SHA1_H_ */

2
contrib/rserv/rserv.c
View File

@ -43,7 +43,7 @@ _rserv_log_()
char **args; /* argument: argnum */
Relation rel; /* triggered relation */
HeapTuple tuple; /* tuple to return */
HeapTuple newtuple = NULL; /* tuple to return */
HeapTuple newtuple = NULL; /* tuple to return */
TupleDesc tupdesc; /* tuple description */
int keynum;
char *key;

6
contrib/spi/refint.c
View File

@ -52,7 +52,7 @@ check_primary_key(PG_FUNCTION_ARGS)
HeapTuple tuple = NULL; /* tuple to return */
TupleDesc tupdesc; /* tuple description */
EPlan *plan; /* prepared plan */
Oid *argtypes = NULL; /* key types to prepare execution plan */
Oid *argtypes = NULL; /* key types to prepare execution plan */
bool isnull; /* to know is some column NULL or not */
char ident[2 * NAMEDATALEN]; /* to identify myself */
int ret;
@ -235,10 +235,10 @@ check_foreign_key(PG_FUNCTION_ARGS)
char *relname; /* referencing relation name */
Relation rel; /* triggered relation */
HeapTuple trigtuple = NULL; /* tuple to being changed */
HeapTuple newtuple = NULL; /* tuple to return */
HeapTuple newtuple = NULL; /* tuple to return */
TupleDesc tupdesc; /* tuple description */
EPlan *plan; /* prepared plan(s) */
Oid *argtypes = NULL; /* key types to prepare execution plan */
Oid *argtypes = NULL; /* key types to prepare execution plan */
bool isnull; /* to know is some column NULL or not */
bool isequal = true; /* are keys in both tuples equal (in
* UPDATE) */

1
contrib/tsearch/crc32.h
View File

@ -6,4 +6,5 @@ extern unsigned int crc32_sz(char *buf, int size);
/* Returns crc32 of null-terminated string */
#define crc32(buf) crc32_sz((buf),strlen(buf))
#endif

1
contrib/tsearch/deflex.h
View File

@ -25,4 +25,5 @@
#define FILEPATH 19
extern const char *descr[];
#endif

1
contrib/tsearch/gistidx.h
View File

@ -62,4 +62,5 @@ typedef struct
#define GETSIGN(x) ( (BITVECP)( (char*)x+GTHDRSIZE ) )
#define GETARR(x) ( (int4*)( (char*)x+GTHDRSIZE ) )
#define ARRNELEM(x) ( ( ((GISTTYPE*)x)->len - GTHDRSIZE )/sizeof(int4) )
#endif

1
contrib/tsearch/morph.h
View File

@ -6,4 +6,5 @@ void initmorph(void);
char *lemmatize(char *word, int *len, int type);
bool is_stoptype(int type);
#endif

1
contrib/tsearch/parser.h
View File

@ -7,4 +7,5 @@ int tsearch_yylex(void);
void start_parse_str(char *, int);
void start_parse_fh(FILE *, int);
void end_parse(void);
#endif

4
contrib/tsearch/query.c
View File

@ -104,7 +104,7 @@ gettoken_query(QPRS_STATE * state, int4 *val, int4 *lenval, char **strval)
{
switch (state->state)
{
case WAITOPERAND:
case WAITOPERAND:
if (*(state->buf) == '!')
{
(state->buf)++;
@ -408,7 +408,7 @@ rexecqtxt(PG_FUNCTION_ARGS)
execqtxt,
PG_GETARG_DATUM(1),
PG_GETARG_DATUM(0)
);
);
}
Datum

1
contrib/tsearch/query.h
View File

@ -48,4 +48,5 @@ typedef struct
bool execute(ITEM * curitem, void *checkval,
bool calcnot, bool (*chkcond) (void *checkval, ITEM * val));
#endif

1
contrib/tsearch/rewrite.h
View File

@ -3,4 +3,5 @@
ITEM *clean_NOT(ITEM * ptr, int4 *len);
ITEM *clean_fakeval(ITEM * ptr, int4 *len);
#endif

4
contrib/tsearch/txtidx.c
View File

@ -327,7 +327,7 @@ typedef struct
{
uint16 len;
char *word;
} WORD;
} WORD;
typedef struct
{
@ -402,7 +402,7 @@ compareWORD(const void *a, const void *b)
}
static int
uniqueWORD(WORD * a, int4 l)
uniqueWORD(WORD *a, int4 l)
{
WORD *ptr,
*res;

1
contrib/tsearch/txtidx.h
View File

@ -44,4 +44,5 @@ typedef struct
} TI_IN_STATE;
int4 gettoken_txtidx(TI_IN_STATE * state);
#endif