database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-15 03:41:20 +03:00
Code Activity

Run pgindent on 9.2 source tree in preparation for first 9.3

Browse Source 
commit-fest.
This commit is contained in:
Bruce Momjian
2012-06-10 15:20:04 -04:00
parent 60801944fa
commit 927d61eeff
494 changed files with 7343 additions and 7046 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/nodes/bitmapset.c
View File

@@ -362,8 +362,8 @@ bms_subset_compare(const Bitmapset *a, const Bitmapset *b)
shortlen = Min(a->nwords, b->nwords);
for (i = 0; i < shortlen; i++)
{
bitmapword aword = a->words[i];
bitmapword bword = b->words[i];
bitmapword aword = a->words[i];
bitmapword bword = b->words[i];
if ((aword & ~bword) != 0)
{

4
src/backend/nodes/copyfuncs.c
View File

@@ -381,7 +381,7 @@ _copyIndexScan(const IndexScan *from)
static IndexOnlyScan *
_copyIndexOnlyScan(const IndexOnlyScan *from)
{
IndexOnlyScan *newnode = makeNode(IndexOnlyScan);
IndexOnlyScan *newnode = makeNode(IndexOnlyScan);
/*
* copy node superclass fields
@@ -4473,7 +4473,7 @@ copyObject(const void *from)
default:
elog(ERROR, "unrecognized node type: %d", (int) nodeTag(from));
retval = 0; /* keep compiler quiet */
retval = 0; /* keep compiler quiet */
break;
}

4
src/backend/nodes/equalfuncs.c
View File

@@ -2360,8 +2360,8 @@ _equalXmlSerialize(const XmlSerialize *a, const XmlSerialize *b)
static bool
_equalList(const List *a, const List *b)
{
const ListCell *item_a;
const ListCell *item_b;
const ListCell *item_a;
const ListCell *item_b;
/*
* Try to reject by simple scalar checks before grovelling through all the

26
src/backend/nodes/list.c
View File

@@ -443,7 +443,7 @@ list_nth_oid(const List *list, int n)
bool
list_member(const List *list, const void *datum)
{
const ListCell *cell;
const ListCell *cell;
Assert(IsPointerList(list));
check_list_invariants(list);
@@ -464,7 +464,7 @@ list_member(const List *list, const void *datum)
bool
list_member_ptr(const List *list, const void *datum)
{
const ListCell *cell;
const ListCell *cell;
Assert(IsPointerList(list));
check_list_invariants(list);
@@ -484,7 +484,7 @@ list_member_ptr(const List *list, const void *datum)
bool
list_member_int(const List *list, int datum)
{
const ListCell *cell;
const ListCell *cell;
Assert(IsIntegerList(list));
check_list_invariants(list);
@@ -504,7 +504,7 @@ list_member_int(const List *list, int datum)
bool
list_member_oid(const List *list, Oid datum)
{
const ListCell *cell;
const ListCell *cell;
Assert(IsOidList(list));
check_list_invariants(list);
@@ -697,7 +697,7 @@ List *
list_union(const List *list1, const List *list2)
{
List *result;
const ListCell *cell;
const ListCell *cell;
Assert(IsPointerList(list1));
Assert(IsPointerList(list2));
@@ -721,7 +721,7 @@ List *
list_union_ptr(const List *list1, const List *list2)
{
List *result;
const ListCell *cell;
const ListCell *cell;
Assert(IsPointerList(list1));
Assert(IsPointerList(list2));
@@ -744,7 +744,7 @@ List *
list_union_int(const List *list1, const List *list2)
{
List *result;
const ListCell *cell;
const ListCell *cell;
Assert(IsIntegerList(list1));
Assert(IsIntegerList(list2));
@@ -767,7 +767,7 @@ List *
list_union_oid(const List *list1, const List *list2)
{
List *result;
const ListCell *cell;
const ListCell *cell;
Assert(IsOidList(list1));
Assert(IsOidList(list2));
@@ -800,7 +800,7 @@ List *
list_intersection(const List *list1, const List *list2)
{
List *result;
const ListCell *cell;
const ListCell *cell;
if (list1 == NIL || list2 == NIL)
return NIL;
@@ -831,7 +831,7 @@ list_intersection(const List *list1, const List *list2)
List *
list_difference(const List *list1, const List *list2)
{
const ListCell *cell;
const ListCell *cell;
List *result = NIL;
Assert(IsPointerList(list1));
@@ -857,7 +857,7 @@ list_difference(const List *list1, const List *list2)
List *
list_difference_ptr(const List *list1, const List *list2)
{
const ListCell *cell;
const ListCell *cell;
List *result = NIL;
Assert(IsPointerList(list1));
@@ -882,7 +882,7 @@ list_difference_ptr(const List *list1, const List *list2)
List *
list_difference_int(const List *list1, const List *list2)
{
const ListCell *cell;
const ListCell *cell;
List *result = NIL;
Assert(IsIntegerList(list1));
@@ -907,7 +907,7 @@ list_difference_int(const List *list1, const List *list2)
List *
list_difference_oid(const List *list1, const List *list2)
{
const ListCell *cell;
const ListCell *cell;
List *result = NIL;
Assert(IsOidList(list1));

36
src/backend/nodes/nodeFuncs.c
View File

@@ -59,7 +59,7 @@ exprType(const Node *expr)
break;
case T_ArrayRef:
{
const ArrayRef *arrayref = (const ArrayRef *) expr;
const ArrayRef *arrayref = (const ArrayRef *) expr;
/* slice and/or store operations yield the array type */
if (arrayref->reflowerindexpr || arrayref->refassgnexpr)
@@ -91,7 +91,7 @@ exprType(const Node *expr)
break;
case T_SubLink:
{
const SubLink *sublink = (const SubLink *) expr;
const SubLink *sublink = (const SubLink *) expr;
if (sublink->subLinkType == EXPR_SUBLINK ||
sublink->subLinkType == ARRAY_SUBLINK)
@@ -125,7 +125,7 @@ exprType(const Node *expr)
break;
case T_SubPlan:
{
const SubPlan *subplan = (const SubPlan *) expr;
const SubPlan *subplan = (const SubPlan *) expr;
if (subplan->subLinkType == EXPR_SUBLINK ||
subplan->subLinkType == ARRAY_SUBLINK)
@@ -282,7 +282,7 @@ exprTypmod(const Node *expr)
break;
case T_SubLink:
{
const SubLink *sublink = (const SubLink *) expr;
const SubLink *sublink = (const SubLink *) expr;
if (sublink->subLinkType == EXPR_SUBLINK ||
sublink->subLinkType == ARRAY_SUBLINK)
@@ -303,7 +303,7 @@ exprTypmod(const Node *expr)
break;
case T_SubPlan:
{
const SubPlan *subplan = (const SubPlan *) expr;
const SubPlan *subplan = (const SubPlan *) expr;
if (subplan->subLinkType == EXPR_SUBLINK ||
subplan->subLinkType == ARRAY_SUBLINK)
@@ -341,7 +341,7 @@ exprTypmod(const Node *expr)
* If all the alternatives agree on type/typmod, return that
* typmod, else use -1
*/
const CaseExpr *cexpr = (const CaseExpr *) expr;
const CaseExpr *cexpr = (const CaseExpr *) expr;
Oid casetype = cexpr->casetype;
int32 typmod;
ListCell *arg;
@@ -374,7 +374,7 @@ exprTypmod(const Node *expr)
* If all the elements agree on type/typmod, return that
* typmod, else use -1
*/
const ArrayExpr *arrayexpr = (const ArrayExpr *) expr;
const ArrayExpr *arrayexpr = (const ArrayExpr *) expr;
Oid commontype;
int32 typmod;
ListCell *elem;
@@ -493,7 +493,7 @@ exprIsLengthCoercion(const Node *expr, int32 *coercedTypmod)
*/
if (expr && IsA(expr, FuncExpr))
{
const FuncExpr *func = (const FuncExpr *) expr;
const FuncExpr *func = (const FuncExpr *) expr;
int nargs;
Const *second_arg;
@@ -707,7 +707,7 @@ exprCollation(const Node *expr)
break;
case T_SubLink:
{
const SubLink *sublink = (const SubLink *) expr;
const SubLink *sublink = (const SubLink *) expr;
if (sublink->subLinkType == EXPR_SUBLINK ||
sublink->subLinkType == ARRAY_SUBLINK)
@@ -733,7 +733,7 @@ exprCollation(const Node *expr)
break;
case T_SubPlan:
{
const SubPlan *subplan = (const SubPlan *) expr;
const SubPlan *subplan = (const SubPlan *) expr;
if (subplan->subLinkType == EXPR_SUBLINK ||
subplan->subLinkType == ARRAY_SUBLINK)
@@ -1137,7 +1137,7 @@ exprLocation(const Node *expr)
break;
case T_FuncExpr:
{
const FuncExpr *fexpr = (const FuncExpr *) expr;
const FuncExpr *fexpr = (const FuncExpr *) expr;
/* consider both function name and leftmost arg */
loc = leftmostLoc(fexpr->location,
@@ -1157,7 +1157,7 @@ exprLocation(const Node *expr)
case T_DistinctExpr: /* struct-equivalent to OpExpr */
case T_NullIfExpr: /* struct-equivalent to OpExpr */
{
const OpExpr *opexpr = (const OpExpr *) expr;
const OpExpr *opexpr = (const OpExpr *) expr;
/* consider both operator name and leftmost arg */
loc = leftmostLoc(opexpr->location,
@@ -1175,7 +1175,7 @@ exprLocation(const Node *expr)
break;
case T_BoolExpr:
{
const BoolExpr *bexpr = (const BoolExpr *) expr;
const BoolExpr *bexpr = (const BoolExpr *) expr;
/*
* Same as above, to handle either NOT or AND/OR. We can't
@@ -1188,7 +1188,7 @@ exprLocation(const Node *expr)
break;
case T_SubLink:
{
const SubLink *sublink = (const SubLink *) expr;
const SubLink *sublink = (const SubLink *) expr;
/* check the testexpr, if any, and the operator/keyword */
loc = leftmostLoc(exprLocation(sublink->testexpr),
@@ -1273,7 +1273,7 @@ exprLocation(const Node *expr)
break;
case T_XmlExpr:
{
const XmlExpr *xexpr = (const XmlExpr *) expr;
const XmlExpr *xexpr = (const XmlExpr *) expr;
/* consider both function name and leftmost arg */
loc = leftmostLoc(xexpr->location,
@@ -1327,7 +1327,7 @@ exprLocation(const Node *expr)
break;
case T_A_Expr:
{
const A_Expr *aexpr = (const A_Expr *) expr;
const A_Expr *aexpr = (const A_Expr *) expr;
/* use leftmost of operator or left operand (if any) */
/* we assume right operand can't be to left of operator */
@@ -1346,7 +1346,7 @@ exprLocation(const Node *expr)
break;
case T_FuncCall:
{
const FuncCall *fc = (const FuncCall *) expr;
const FuncCall *fc = (const FuncCall *) expr;
/* consider both function name and leftmost arg */
/* (we assume any ORDER BY nodes must be to right of name) */
@@ -1364,7 +1364,7 @@ exprLocation(const Node *expr)
break;
case T_TypeCast:
{
const TypeCast *tc = (const TypeCast *) expr;
const TypeCast *tc = (const TypeCast *) expr;
/*
* This could represent CAST(), ::, or TypeName 'literal', so

2
src/backend/nodes/outfuncs.c
View File

@@ -141,7 +141,7 @@ _outToken(StringInfo str, const char *s)
static void
_outList(StringInfo str, const List *node)
{
const ListCell *lc;
const ListCell *lc;
appendStringInfoChar(str, '(');

14
src/backend/nodes/print.c
View File

@@ -251,7 +251,7 @@ pretty_format_node_dump(const char *dump)
void
print_rt(const List *rtable)
{
const ListCell *l;
const ListCell *l;
int i = 1;
printf("resno\trefname \trelid\tinFromCl\n");
@@ -314,7 +314,7 @@ print_expr(const Node *expr, const List *rtable)
if (IsA(expr, Var))
{
const Var *var = (const Var *) expr;
const Var *var = (const Var *) expr;
char *relname,
*attname;
@@ -348,7 +348,7 @@ print_expr(const Node *expr, const List *rtable)
}
else if (IsA(expr, Const))
{
const Const *c = (const Const *) expr;
const Const *c = (const Const *) expr;
Oid typoutput;
bool typIsVarlena;
char *outputstr;
@@ -368,7 +368,7 @@ print_expr(const Node *expr, const List *rtable)
}
else if (IsA(expr, OpExpr))
{
const OpExpr *e = (const OpExpr *) expr;
const OpExpr *e = (const OpExpr *) expr;
char *opname;
opname = get_opname(e->opno);
@@ -387,7 +387,7 @@ print_expr(const Node *expr, const List *rtable)
}
else if (IsA(expr, FuncExpr))
{
const FuncExpr *e = (const FuncExpr *) expr;
const FuncExpr *e = (const FuncExpr *) expr;
char *funcname;
ListCell *l;
@@ -412,7 +412,7 @@ print_expr(const Node *expr, const List *rtable)
void
print_pathkeys(const List *pathkeys, const List *rtable)
{
const ListCell *i;
const ListCell *i;
printf("(");
foreach(i, pathkeys)
@@ -452,7 +452,7 @@ print_pathkeys(const List *pathkeys, const List *rtable)
void
print_tl(const List *tlist, const List *rtable)
{
const ListCell *tl;
const ListCell *tl;
printf("(\n");
foreach(tl, tlist)

4
src/backend/nodes/readfuncs.c
View File

@@ -49,7 +49,7 @@
#define READ_TEMP_LOCALS() \
char *token; \
int length; \
(void) token /* possibly unused */
(void) token /* possibly unused */
/* ... but most need both */
#define READ_LOCALS(nodeTypeName) \
@@ -195,7 +195,7 @@ _readQuery(void)
READ_ENUM_FIELD(commandType, CmdType);
READ_ENUM_FIELD(querySource, QuerySource);
local_node->queryId = 0; /* not saved in output format */
local_node->queryId = 0; /* not saved in output format */
READ_BOOL_FIELD(canSetTag);
READ_NODE_FIELD(utilityStmt);
READ_INT_FIELD(resultRelation);

16
src/backend/nodes/tidbitmap.c
View File

@@ -956,7 +956,7 @@ tbm_lossify(TIDBitmap *tbm)
*
* Since we are called as soon as nentries exceeds maxentries, we should
* push nentries down to significantly less than maxentries, or else we'll
* just end up doing this again very soon. We shoot for maxentries/2.
* just end up doing this again very soon. We shoot for maxentries/2.
*/
Assert(!tbm->iterating);
Assert(tbm->status == TBM_HASH);
@@ -992,14 +992,14 @@ tbm_lossify(TIDBitmap *tbm)
}
/*
* With a big bitmap and small work_mem, it's possible that we cannot
* get under maxentries. Again, if that happens, we'd end up uselessly
* With a big bitmap and small work_mem, it's possible that we cannot get
* under maxentries. Again, if that happens, we'd end up uselessly
* calling tbm_lossify over and over. To prevent this from becoming a
* performance sink, force maxentries up to at least double the current
* number of entries. (In essence, we're admitting inability to fit
* within work_mem when we do this.) Note that this test will not fire
* if we broke out of the loop early; and if we didn't, the current
* number of entries is simply not reducible any further.
* within work_mem when we do this.) Note that this test will not fire if
* we broke out of the loop early; and if we didn't, the current number of
* entries is simply not reducible any further.
*/
if (tbm->nentries > tbm->maxentries / 2)
tbm->maxentries = Min(tbm->nentries, (INT_MAX - 1) / 2) * 2;
@@ -1011,8 +1011,8 @@ tbm_lossify(TIDBitmap *tbm)
static int
tbm_comparator(const void *left, const void *right)
{
BlockNumber l = (*((PagetableEntry * const *) left))->blockno;
BlockNumber r = (*((PagetableEntry * const *) right))->blockno;
BlockNumber l = (*((PagetableEntry *const *) left))->blockno;
BlockNumber r = (*((PagetableEntry *const *) right))->blockno;
if (l < r)
return -1;