mirror of
https://github.com/postgres/postgres.git
synced 2025-09-03 15:22:11 +03:00
New pgindent run with fixes suggested by Tom. Patch manually reviewed,
initdb/regression tests pass.
This commit is contained in:
@@ -33,7 +33,7 @@
|
||||
* ENHANCEMENTS, OR MODIFICATIONS.
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/pl/plperl/plperl.c,v 1.25 2001/10/25 05:50:17 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/pl/plperl/plperl.c,v 1.26 2001/11/05 17:46:39 momjian Exp $
|
||||
*
|
||||
**********************************************************************/
|
||||
|
||||
@@ -99,7 +99,7 @@ typedef struct plperl_proc_desc
|
||||
Oid arg_out_elem[FUNC_MAX_ARGS];
|
||||
int arg_is_rel[FUNC_MAX_ARGS];
|
||||
SV *reference;
|
||||
} plperl_proc_desc;
|
||||
} plperl_proc_desc;
|
||||
|
||||
|
||||
/**********************************************************************
|
||||
|
@@ -284,6 +284,6 @@ SV *sv;
|
||||
PL_curcop->cop_line = oldline;
|
||||
}
|
||||
#endif
|
||||
#endif /* newCONSTSUB */
|
||||
#endif /* newCONSTSUB */
|
||||
|
||||
#endif /* _P_P_PORTABILITY_H_ */
|
||||
#endif /* _P_P_PORTABILITY_H_ */
|
||||
|
@@ -3,7 +3,7 @@
|
||||
* procedural language
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/plpgsql.h,v 1.21 2001/10/28 06:26:15 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/plpgsql.h,v 1.22 2001/11/05 17:46:39 momjian Exp $
|
||||
*
|
||||
* This software is copyrighted by Jan Wieck - Hamburg.
|
||||
*
|
||||
@@ -133,7 +133,7 @@ typedef struct
|
||||
int alloc;
|
||||
int used;
|
||||
char *value;
|
||||
} PLpgSQL_dstring;
|
||||
} PLpgSQL_dstring;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -145,14 +145,14 @@ typedef struct
|
||||
int16 typlen;
|
||||
bool typbyval;
|
||||
int32 atttypmod;
|
||||
} PLpgSQL_type;
|
||||
} PLpgSQL_type;
|
||||
|
||||
|
||||
typedef struct
|
||||
{ /* Generic datum array item */
|
||||
int dtype;
|
||||
int dno;
|
||||
} PLpgSQL_datum;
|
||||
} PLpgSQL_datum;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -166,7 +166,7 @@ typedef struct
|
||||
Oid *plan_argtypes;
|
||||
int nparams;
|
||||
int params[1];
|
||||
} PLpgSQL_expr;
|
||||
} PLpgSQL_expr;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -186,7 +186,7 @@ typedef struct
|
||||
Datum value;
|
||||
bool isnull;
|
||||
bool freeval;
|
||||
} PLpgSQL_var;
|
||||
} PLpgSQL_var;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -200,7 +200,7 @@ typedef struct
|
||||
int nfields;
|
||||
char **fieldnames;
|
||||
int *varnos;
|
||||
} PLpgSQL_row;
|
||||
} PLpgSQL_row;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -214,7 +214,7 @@ typedef struct
|
||||
TupleDesc tupdesc;
|
||||
bool freetup;
|
||||
bool freetupdesc;
|
||||
} PLpgSQL_rec;
|
||||
} PLpgSQL_rec;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -223,7 +223,7 @@ typedef struct
|
||||
int rfno;
|
||||
char *fieldname;
|
||||
int recno;
|
||||
} PLpgSQL_recfield;
|
||||
} PLpgSQL_recfield;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -231,7 +231,7 @@ typedef struct
|
||||
int dtype;
|
||||
int dno;
|
||||
PLpgSQL_expr *argnum;
|
||||
} PLpgSQL_trigarg;
|
||||
} PLpgSQL_trigarg;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -239,7 +239,7 @@ typedef struct
|
||||
int itemtype;
|
||||
int itemno;
|
||||
char name[1];
|
||||
} PLpgSQL_nsitem;
|
||||
} PLpgSQL_nsitem;
|
||||
|
||||
|
||||
typedef struct PLpgSQL_ns
|
||||
@@ -248,7 +248,7 @@ typedef struct PLpgSQL_ns
|
||||
int items_used;
|
||||
PLpgSQL_nsitem **items;
|
||||
struct PLpgSQL_ns *upper;
|
||||
} PLpgSQL_ns;
|
||||
} PLpgSQL_ns;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -256,14 +256,14 @@ typedef struct
|
||||
int stmts_alloc;
|
||||
int stmts_used;
|
||||
struct PLpgSQL_stmt **stmts;
|
||||
} PLpgSQL_stmts;
|
||||
} PLpgSQL_stmts;
|
||||
|
||||
|
||||
typedef struct
|
||||
{ /* Generic execution node */
|
||||
int cmd_type;
|
||||
int lineno;
|
||||
} PLpgSQL_stmt;
|
||||
} PLpgSQL_stmt;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -274,7 +274,7 @@ typedef struct
|
||||
PLpgSQL_stmts *body;
|
||||
int n_initvars;
|
||||
int *initvarnos;
|
||||
} PLpgSQL_stmt_block;
|
||||
} PLpgSQL_stmt_block;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -283,14 +283,14 @@ typedef struct
|
||||
int lineno;
|
||||
int varno;
|
||||
PLpgSQL_expr *expr;
|
||||
} PLpgSQL_stmt_assign;
|
||||
} PLpgSQL_stmt_assign;
|
||||
|
||||
|
||||
typedef struct
|
||||
{ /* Get Diagnostics item */
|
||||
int item; /* id for diagnostic value desired */
|
||||
int target; /* where to assign it */
|
||||
} PLpgSQL_diag_item;
|
||||
} PLpgSQL_diag_item;
|
||||
|
||||
typedef struct
|
||||
{ /* Get Diagnostics statement */
|
||||
@@ -298,7 +298,7 @@ typedef struct
|
||||
int lineno;
|
||||
int ndtitems;
|
||||
PLpgSQL_diag_item *dtitems;
|
||||
} PLpgSQL_stmt_getdiag;
|
||||
} PLpgSQL_stmt_getdiag;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -308,7 +308,7 @@ typedef struct
|
||||
PLpgSQL_expr *cond;
|
||||
PLpgSQL_stmts *true_body;
|
||||
PLpgSQL_stmts *false_body;
|
||||
} PLpgSQL_stmt_if;
|
||||
} PLpgSQL_stmt_if;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -317,7 +317,7 @@ typedef struct
|
||||
int lineno;
|
||||
char *label;
|
||||
PLpgSQL_stmts *body;
|
||||
} PLpgSQL_stmt_loop;
|
||||
} PLpgSQL_stmt_loop;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -327,7 +327,7 @@ typedef struct
|
||||
char *label;
|
||||
PLpgSQL_expr *cond;
|
||||
PLpgSQL_stmts *body;
|
||||
} PLpgSQL_stmt_while;
|
||||
} PLpgSQL_stmt_while;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -340,7 +340,7 @@ typedef struct
|
||||
PLpgSQL_expr *upper;
|
||||
int reverse;
|
||||
PLpgSQL_stmts *body;
|
||||
} PLpgSQL_stmt_fori;
|
||||
} PLpgSQL_stmt_fori;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -352,7 +352,7 @@ typedef struct
|
||||
PLpgSQL_row *row;
|
||||
PLpgSQL_expr *query;
|
||||
PLpgSQL_stmts *body;
|
||||
} PLpgSQL_stmt_fors;
|
||||
} PLpgSQL_stmt_fors;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -364,7 +364,7 @@ typedef struct
|
||||
PLpgSQL_row *row;
|
||||
PLpgSQL_expr *query;
|
||||
PLpgSQL_stmts *body;
|
||||
} PLpgSQL_stmt_dynfors;
|
||||
} PLpgSQL_stmt_dynfors;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -374,7 +374,7 @@ typedef struct
|
||||
PLpgSQL_rec *rec;
|
||||
PLpgSQL_row *row;
|
||||
PLpgSQL_expr *query;
|
||||
} PLpgSQL_stmt_select;
|
||||
} PLpgSQL_stmt_select;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -386,7 +386,7 @@ typedef struct
|
||||
PLpgSQL_expr *argquery;
|
||||
PLpgSQL_expr *query;
|
||||
PLpgSQL_expr *dynquery;
|
||||
} PLpgSQL_stmt_open;
|
||||
} PLpgSQL_stmt_open;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -396,7 +396,7 @@ typedef struct
|
||||
PLpgSQL_rec *rec;
|
||||
PLpgSQL_row *row;
|
||||
int curvar;
|
||||
} PLpgSQL_stmt_fetch;
|
||||
} PLpgSQL_stmt_fetch;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -404,7 +404,7 @@ typedef struct
|
||||
int cmd_type;
|
||||
int lineno;
|
||||
int curvar;
|
||||
} PLpgSQL_stmt_close;
|
||||
} PLpgSQL_stmt_close;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -413,7 +413,7 @@ typedef struct
|
||||
int lineno;
|
||||
char *label;
|
||||
PLpgSQL_expr *cond;
|
||||
} PLpgSQL_stmt_exit;
|
||||
} PLpgSQL_stmt_exit;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -423,7 +423,7 @@ typedef struct
|
||||
bool retistuple;
|
||||
PLpgSQL_expr *expr;
|
||||
int retrecno;
|
||||
} PLpgSQL_stmt_return;
|
||||
} PLpgSQL_stmt_return;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -434,7 +434,7 @@ typedef struct
|
||||
char *message;
|
||||
int nparams;
|
||||
int *params;
|
||||
} PLpgSQL_stmt_raise;
|
||||
} PLpgSQL_stmt_raise;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -442,7 +442,7 @@ typedef struct
|
||||
int cmd_type;
|
||||
int lineno;
|
||||
PLpgSQL_expr *sqlstmt;
|
||||
} PLpgSQL_stmt_execsql;
|
||||
} PLpgSQL_stmt_execsql;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -450,7 +450,7 @@ typedef struct
|
||||
int cmd_type;
|
||||
int lineno;
|
||||
PLpgSQL_expr *query;
|
||||
} PLpgSQL_stmt_dynexecute;
|
||||
} PLpgSQL_stmt_dynexecute;
|
||||
|
||||
|
||||
typedef struct PLpgSQL_function
|
||||
@@ -487,7 +487,7 @@ typedef struct PLpgSQL_function
|
||||
PLpgSQL_stmt_block *action;
|
||||
|
||||
struct PLpgSQL_function *next; /* for chaining list of functions */
|
||||
} PLpgSQL_function;
|
||||
} PLpgSQL_function;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -512,7 +512,7 @@ typedef struct
|
||||
uint32 eval_processed;
|
||||
Oid eval_lastoid;
|
||||
ExprContext *eval_econtext;
|
||||
} PLpgSQL_execstate;
|
||||
} PLpgSQL_execstate;
|
||||
|
||||
|
||||
/**********************************************************************
|
||||
@@ -612,4 +612,4 @@ extern int plpgsql_yylex(void);
|
||||
extern void plpgsql_push_back_token(int token);
|
||||
extern void plpgsql_setinput(char *s, int functype);
|
||||
|
||||
#endif /* PLPGSQL_H */
|
||||
#endif /* PLPGSQL_H */
|
||||
|
@@ -29,7 +29,7 @@
|
||||
* MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/pl/plpython/plpython.c,v 1.11 2001/10/28 06:26:15 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/pl/plpython/plpython.c,v 1.12 2001/11/05 17:46:39 momjian Exp $
|
||||
*
|
||||
*********************************************************************
|
||||
*/
|
||||
@@ -76,19 +76,19 @@ typedef struct PLyDatumToOb
|
||||
FmgrInfo typfunc;
|
||||
Oid typelem;
|
||||
bool typbyval;
|
||||
} PLyDatumToOb;
|
||||
} PLyDatumToOb;
|
||||
|
||||
typedef struct PLyTupleToOb
|
||||
{
|
||||
PLyDatumToOb *atts;
|
||||
int natts;
|
||||
} PLyTupleToOb;
|
||||
} PLyTupleToOb;
|
||||
|
||||
typedef union PLyTypeInput
|
||||
{
|
||||
PLyDatumToOb d;
|
||||
PLyTupleToOb r;
|
||||
} PLyTypeInput;
|
||||
} PLyTypeInput;
|
||||
|
||||
/* convert PyObject to a Postgresql Datum or tuple.
|
||||
* output from Python
|
||||
@@ -98,19 +98,19 @@ typedef struct PLyObToDatum
|
||||
FmgrInfo typfunc;
|
||||
Oid typelem;
|
||||
bool typbyval;
|
||||
} PLyObToDatum;
|
||||
} PLyObToDatum;
|
||||
|
||||
typedef struct PLyObToTuple
|
||||
{
|
||||
PLyObToDatum *atts;
|
||||
int natts;
|
||||
} PLyObToTuple;
|
||||
} PLyObToTuple;
|
||||
|
||||
typedef union PLyTypeOutput
|
||||
{
|
||||
PLyObToDatum d;
|
||||
PLyObToTuple r;
|
||||
} PLyTypeOutput;
|
||||
} PLyTypeOutput;
|
||||
|
||||
/* all we need to move Postgresql data to Python objects,
|
||||
* and vis versa
|
||||
@@ -120,7 +120,7 @@ typedef struct PLyTypeInfo
|
||||
PLyTypeInput in;
|
||||
PLyTypeOutput out;
|
||||
int is_rel;
|
||||
} PLyTypeInfo;
|
||||
} PLyTypeInfo;
|
||||
|
||||
|
||||
/* cached procedure data
|
||||
@@ -141,7 +141,7 @@ typedef struct PLyProcedure
|
||||
PyObject *globals; /* data saved across calls, global score */
|
||||
PyObject *me; /* PyCObject containing pointer to this
|
||||
* PLyProcedure */
|
||||
} PLyProcedure;
|
||||
} PLyProcedure;
|
||||
|
||||
|
||||
/* Python objects.
|
||||
@@ -154,7 +154,7 @@ typedef struct PLyPlanObject
|
||||
Oid *types;
|
||||
Datum *values;
|
||||
PLyTypeInfo *args;
|
||||
} PLyPlanObject;
|
||||
} PLyPlanObject;
|
||||
|
||||
typedef struct PLyResultObject
|
||||
{
|
||||
@@ -163,7 +163,7 @@ typedef struct PLyResultObject
|
||||
PyObject *nrows; /* number of rows returned by query */
|
||||
PyObject *rows; /* data rows, or None if no data returned */
|
||||
PyObject *status; /* query status, SPI_OK_*, or SPI_ERR_* */
|
||||
} PLyResultObject;
|
||||
} PLyResultObject;
|
||||
|
||||
|
||||
/* function declarations
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* $Header: /cvsroot/pgsql/src/pl/plpython/Attic/plpython.h,v 1.4 2001/10/28 06:26:15 momjian Exp $ */
|
||||
/* $Header: /cvsroot/pgsql/src/pl/plpython/Attic/plpython.h,v 1.5 2001/11/05 17:46:39 momjian Exp $ */
|
||||
|
||||
#ifndef PLPYTHON_H
|
||||
#define PLPYTHON_H
|
||||
@@ -65,4 +65,4 @@
|
||||
#define refc(O)
|
||||
#endif
|
||||
|
||||
#endif /* PLPYTHON_H */
|
||||
#endif /* PLPYTHON_H */
|
||||
|
@@ -31,7 +31,7 @@
|
||||
* ENHANCEMENTS, OR MODIFICATIONS.
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.47 2001/10/25 05:50:21 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.48 2001/11/05 17:46:39 momjian Exp $
|
||||
*
|
||||
**********************************************************************/
|
||||
|
||||
@@ -93,7 +93,7 @@ utf_e2u(unsigned char *src)
|
||||
#define UTF_END
|
||||
#define UTF_U2E(x) (x)
|
||||
#define UTF_E2U(x) (x)
|
||||
#endif /* PLTCL_UTF */
|
||||
#endif /* PLTCL_UTF */
|
||||
|
||||
/**********************************************************************
|
||||
* The information we cache about loaded procedures
|
||||
@@ -110,7 +110,7 @@ typedef struct pltcl_proc_desc
|
||||
FmgrInfo arg_out_func[FUNC_MAX_ARGS];
|
||||
Oid arg_out_elem[FUNC_MAX_ARGS];
|
||||
int arg_is_rel[FUNC_MAX_ARGS];
|
||||
} pltcl_proc_desc;
|
||||
} pltcl_proc_desc;
|
||||
|
||||
|
||||
/**********************************************************************
|
||||
@@ -126,7 +126,7 @@ typedef struct pltcl_query_desc
|
||||
Oid *argtypelems;
|
||||
bool *argbyvals;
|
||||
Datum *argvalues;
|
||||
} pltcl_query_desc;
|
||||
} pltcl_query_desc;
|
||||
|
||||
|
||||
/**********************************************************************
|
||||
|
Reference in New Issue
Block a user