Clean up newlines following left parentheses
authorAlvaro Herrera <[email protected]>
Thu, 30 Jan 2020 16:42:14 +0000 (13:42 -0300)
committerAlvaro Herrera <[email protected]>
Thu, 30 Jan 2020 16:42:14 +0000 (13:42 -0300)
We used to strategically place newlines after some function call left
parentheses to make pgindent move the argument list a few chars to the
left, so that the whole line would fit under 80 chars.  However,
pgindent no longer does that, so the newlines just made the code
vertically longer for no reason.  Remove those newlines, and reflow some
of those lines for some extra naturality.

Reviewed-by: Michael Paquier, Tom Lane
Discussion: https://postgr.es/m/20200129200401[email protected]

78 files changed:
contrib/btree_gin/btree_gin.c
contrib/btree_gist/btree_cash.c
contrib/btree_gist/btree_date.c
contrib/btree_gist/btree_enum.c
contrib/btree_gist/btree_float4.c
contrib/btree_gist/btree_float8.c
contrib/btree_gist/btree_inet.c
contrib/btree_gist/btree_int2.c
contrib/btree_gist/btree_int4.c
contrib/btree_gist/btree_int8.c
contrib/btree_gist/btree_interval.c
contrib/btree_gist/btree_macaddr.c
contrib/btree_gist/btree_macaddr8.c
contrib/btree_gist/btree_numeric.c
contrib/btree_gist/btree_oid.c
contrib/btree_gist/btree_time.c
contrib/btree_gist/btree_ts.c
contrib/btree_gist/btree_utils_var.c
contrib/btree_gist/btree_uuid.c
contrib/cube/cube.c
contrib/dblink/dblink.c
contrib/fuzzystrmatch/dmetaphone.c
contrib/hstore/hstore_op.c
contrib/intarray/_int_op.c
contrib/ltree/_ltree_gist.c
contrib/ltree/lquery_op.c
contrib/ltree/ltree_gist.c
contrib/ltree/ltxtquery_op.c
contrib/oid2name/oid2name.c
contrib/pageinspect/heapfuncs.c
contrib/pg_trgm/trgm_gist.c
contrib/pg_trgm/trgm_op.c
contrib/seg/seg.c
contrib/test_decoding/test_decoding.c
src/backend/access/gin/ginlogic.c
src/backend/access/gist/gistproc.c
src/backend/access/heap/heapam.c
src/backend/access/rmgrdesc/xactdesc.c
src/backend/access/spgist/spgscan.c
src/backend/access/transam/xact.c
src/backend/catalog/heap.c
src/backend/commands/event_trigger.c
src/backend/commands/tablecmds.c
src/backend/executor/execExprInterp.c
src/backend/executor/nodeAgg.c
src/backend/libpq/auth.c
src/backend/optimizer/path/joinpath.c
src/backend/optimizer/plan/createplan.c
src/backend/postmaster/pgstat.c
src/backend/replication/logical/logicalfuncs.c
src/backend/replication/logical/reorderbuffer.c
src/backend/tcop/utility.c
src/backend/tsearch/dict_thesaurus.c
src/backend/tsearch/to_tsany.c
src/backend/tsearch/ts_parse.c
src/backend/utils/adt/formatting.c
src/backend/utils/adt/pgstatfuncs.c
src/backend/utils/adt/rangetypes_spgist.c
src/backend/utils/adt/rangetypes_typanalyze.c
src/backend/utils/adt/ruleutils.c
src/backend/utils/adt/timestamp.c
src/backend/utils/adt/tsgistidx.c
src/backend/utils/adt/tsquery_op.c
src/backend/utils/adt/tsvector_op.c
src/backend/utils/misc/pg_controldata.c
src/bin/pg_upgrade/tablespace.c
src/bin/psql/help.c
src/interfaces/libpq/fe-connect.c
src/interfaces/libpq/fe-misc.c
src/interfaces/libpq/fe-protocol2.c
src/interfaces/libpq/fe-protocol3.c
src/interfaces/libpq/fe-secure-openssl.c
src/interfaces/libpq/fe-secure.c
src/interfaces/libpq/win32.c
src/pl/plperl/plperl.c
src/pl/plpython/plpy_elog.c
src/pl/tcl/pltcl.c
src/port/gettimeofday.c

index 0ed3d580df11300fa63ab534dc59e0b3aca85589..e05b5c60ca5fafa0de4cefe2e56afe374975005c 100644 (file)
@@ -114,8 +114,7 @@ gin_btree_compare_prefix(FunctionCallInfo fcinfo)
    int32       res,
                cmp;
 
-   cmp = DatumGetInt32(CallerFInfoFunctionCall2(
-                                                data->typecmp,
+   cmp = DatumGetInt32(CallerFInfoFunctionCall2(data->typecmp,
                                                 fcinfo->flinfo,
                                                 PG_GET_COLLATION(),
                                                 (data->strategy == BTLessStrategyNumber ||
@@ -463,8 +462,7 @@ gin_enum_cmp(PG_FUNCTION_ARGS)
    }
    else
    {
-       res = DatumGetInt32(CallerFInfoFunctionCall2(
-                                                    enum_cmp,
+       res = DatumGetInt32(CallerFInfoFunctionCall2(enum_cmp,
                                                     fcinfo->flinfo,
                                                     PG_GET_COLLATION(),
                                                     ObjectIdGetDatum(a),
index 894d0a266559b5ce4c34937642b7d56e837d88d6..dfa23224b6f0966346ccbc5e9552760e891cd493 100644 (file)
@@ -150,9 +150,9 @@ gbt_cash_consistent(PG_FUNCTION_ARGS)
    key.lower = (GBT_NUMKEY *) &kkk->lower;
    key.upper = (GBT_NUMKEY *) &kkk->upper;
 
-   PG_RETURN_BOOL(
-                  gbt_num_consistent(&key, (void *) &query, &strategy, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_BOOL(gbt_num_consistent(&key, (void *) &query, &strategy,
+                                     GIST_LEAF(entry), &tinfo,
+                                     fcinfo->flinfo));
 }
 
 
@@ -169,9 +169,8 @@ gbt_cash_distance(PG_FUNCTION_ARGS)
    key.lower = (GBT_NUMKEY *) &kkk->lower;
    key.upper = (GBT_NUMKEY *) &kkk->upper;
 
-   PG_RETURN_FLOAT8(
-                    gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_FLOAT8(gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry),
+                                     &tinfo, fcinfo->flinfo));
 }
 
 
@@ -202,11 +201,9 @@ gbt_cash_penalty(PG_FUNCTION_ARGS)
 Datum
 gbt_cash_picksplit(PG_FUNCTION_ARGS)
 {
-   PG_RETURN_POINTER(gbt_num_picksplit(
-                                       (GistEntryVector *) PG_GETARG_POINTER(0),
+   PG_RETURN_POINTER(gbt_num_picksplit((GistEntryVector *) PG_GETARG_POINTER(0),
                                        (GIST_SPLITVEC *) PG_GETARG_POINTER(1),
-                                       &tinfo, fcinfo->flinfo
-                                       ));
+                                       &tinfo, fcinfo->flinfo));
 }
 
 Datum
index 992ce57507312ab2aa794810cba579cfc26216fd..455a265a497538f44c2dbedd8eb603cf945cfc95 100644 (file)
@@ -29,41 +29,42 @@ PG_FUNCTION_INFO_V1(gbt_date_same);
 static bool
 gbt_dategt(const void *a, const void *b, FmgrInfo *flinfo)
 {
-   return DatumGetBool(
-                       DirectFunctionCall2(date_gt, DateADTGetDatum(*((const DateADT *) a)), DateADTGetDatum(*((const DateADT *) b)))
-       );
+   return DatumGetBool(DirectFunctionCall2(date_gt,
+                                           DateADTGetDatum(*((const DateADT *) a)),
+                                           DateADTGetDatum(*((const DateADT *) b))));
 }
 
 static bool
 gbt_datege(const void *a, const void *b, FmgrInfo *flinfo)
 {
-   return DatumGetBool(
-                       DirectFunctionCall2(date_ge, DateADTGetDatum(*((const DateADT *) a)), DateADTGetDatum(*((const DateADT *) b)))
-       );
+   return DatumGetBool(DirectFunctionCall2(date_ge,
+                                           DateADTGetDatum(*((const DateADT *) a)),
+                                           DateADTGetDatum(*((const DateADT *) b))));
 }
 
 static bool
 gbt_dateeq(const void *a, const void *b, FmgrInfo *flinfo)
 {
-   return DatumGetBool(
-                       DirectFunctionCall2(date_eq, DateADTGetDatum(*((const DateADT *) a)), DateADTGetDatum(*((const DateADT *) b)))
+   return DatumGetBool(DirectFunctionCall2(date_eq,
+                                           DateADTGetDatum(*((const DateADT *) a)),
+                                           DateADTGetDatum(*((const DateADT *) b)))
        );
 }
 
 static bool
 gbt_datele(const void *a, const void *b, FmgrInfo *flinfo)
 {
-   return DatumGetBool(
-                       DirectFunctionCall2(date_le, DateADTGetDatum(*((const DateADT *) a)), DateADTGetDatum(*((const DateADT *) b)))
-       );
+   return DatumGetBool(DirectFunctionCall2(date_le,
+                                           DateADTGetDatum(*((const DateADT *) a)),
+                                           DateADTGetDatum(*((const DateADT *) b))));
 }
 
 static bool
 gbt_datelt(const void *a, const void *b, FmgrInfo *flinfo)
 {
-   return DatumGetBool(
-                       DirectFunctionCall2(date_lt, DateADTGetDatum(*((const DateADT *) a)), DateADTGetDatum(*((const DateADT *) b)))
-       );
+   return DatumGetBool(DirectFunctionCall2(date_lt,
+                                           DateADTGetDatum(*((const DateADT *) a)),
+                                           DateADTGetDatum(*((const DateADT *) b))));
 }
 
 
@@ -75,9 +76,13 @@ gbt_datekey_cmp(const void *a, const void *b, FmgrInfo *flinfo)
    dateKEY    *ib = (dateKEY *) (((const Nsrt *) b)->t);
    int         res;
 
-   res = DatumGetInt32(DirectFunctionCall2(date_cmp, DateADTGetDatum(ia->lower), DateADTGetDatum(ib->lower)));
+   res = DatumGetInt32(DirectFunctionCall2(date_cmp,
+                                           DateADTGetDatum(ia->lower),
+                                           DateADTGetDatum(ib->lower)));
    if (res == 0)
-       return DatumGetInt32(DirectFunctionCall2(date_cmp, DateADTGetDatum(ia->upper), DateADTGetDatum(ib->upper)));
+       return DatumGetInt32(DirectFunctionCall2(date_cmp,
+                                                DateADTGetDatum(ia->upper),
+                                                DateADTGetDatum(ib->upper)));
 
    return res;
 }
@@ -162,9 +167,9 @@ gbt_date_consistent(PG_FUNCTION_ARGS)
    key.lower = (GBT_NUMKEY *) &kkk->lower;
    key.upper = (GBT_NUMKEY *) &kkk->upper;
 
-   PG_RETURN_BOOL(
-                  gbt_num_consistent(&key, (void *) &query, &strategy, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_BOOL(gbt_num_consistent(&key, (void *) &query, &strategy,
+                                     GIST_LEAF(entry), &tinfo,
+                                     fcinfo->flinfo));
 }
 
 
@@ -181,9 +186,8 @@ gbt_date_distance(PG_FUNCTION_ARGS)
    key.lower = (GBT_NUMKEY *) &kkk->lower;
    key.upper = (GBT_NUMKEY *) &kkk->upper;
 
-   PG_RETURN_FLOAT8(
-                    gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_FLOAT8(gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry),
+                                     &tinfo, fcinfo->flinfo));
 }
 
 
@@ -207,15 +211,13 @@ gbt_date_penalty(PG_FUNCTION_ARGS)
    int32       diff,
                res;
 
-   diff = DatumGetInt32(DirectFunctionCall2(
-                                            date_mi,
+   diff = DatumGetInt32(DirectFunctionCall2(date_mi,
                                             DateADTGetDatum(newentry->upper),
                                             DateADTGetDatum(origentry->upper)));
 
    res = Max(diff, 0);
 
-   diff = DatumGetInt32(DirectFunctionCall2(
-                                            date_mi,
+   diff = DatumGetInt32(DirectFunctionCall2(date_mi,
                                             DateADTGetDatum(origentry->lower),
                                             DateADTGetDatum(newentry->lower)));
 
@@ -225,8 +227,7 @@ gbt_date_penalty(PG_FUNCTION_ARGS)
 
    if (res > 0)
    {
-       diff = DatumGetInt32(DirectFunctionCall2(
-                                                date_mi,
+       diff = DatumGetInt32(DirectFunctionCall2(date_mi,
                                                 DateADTGetDatum(origentry->upper),
                                                 DateADTGetDatum(origentry->lower)));
        *result += FLT_MIN;
@@ -241,11 +242,9 @@ gbt_date_penalty(PG_FUNCTION_ARGS)
 Datum
 gbt_date_picksplit(PG_FUNCTION_ARGS)
 {
-   PG_RETURN_POINTER(gbt_num_picksplit(
-                                       (GistEntryVector *) PG_GETARG_POINTER(0),
+   PG_RETURN_POINTER(gbt_num_picksplit((GistEntryVector *) PG_GETARG_POINTER(0),
                                        (GIST_SPLITVEC *) PG_GETARG_POINTER(1),
-                                       &tinfo, fcinfo->flinfo
-                                       ));
+                                       &tinfo, fcinfo->flinfo));
 }
 
 Datum
index b56301270f7e7ea6f6c9628d1256c9630e7b4eed..d4dc38a38e524002e1cb88447aa21ac2f50ee255 100644 (file)
@@ -31,16 +31,16 @@ PG_FUNCTION_INFO_V1(gbt_enum_same);
 static bool
 gbt_enumgt(const void *a, const void *b, FmgrInfo *flinfo)
 {
-   return DatumGetBool(
-                       CallerFInfoFunctionCall2(enum_gt, flinfo, InvalidOid, ObjectIdGetDatum(*((const Oid *) a)), ObjectIdGetDatum(*((const Oid *) b)))
-       );
+   return DatumGetBool(CallerFInfoFunctionCall2(enum_gt, flinfo, InvalidOid,
+                                                ObjectIdGetDatum(*((const Oid *) a)),
+                                                ObjectIdGetDatum(*((const Oid *) b))));
 }
 static bool
 gbt_enumge(const void *a, const void *b, FmgrInfo *flinfo)
 {
-   return DatumGetBool(
-                       CallerFInfoFunctionCall2(enum_ge, flinfo, InvalidOid, ObjectIdGetDatum(*((const Oid *) a)), ObjectIdGetDatum(*((const Oid *) b)))
-       );
+   return DatumGetBool(CallerFInfoFunctionCall2(enum_ge, flinfo, InvalidOid,
+                                                ObjectIdGetDatum(*((const Oid *) a)),
+                                                ObjectIdGetDatum(*((const Oid *) b))));
 }
 static bool
 gbt_enumeq(const void *a, const void *b, FmgrInfo *flinfo)
@@ -50,16 +50,16 @@ gbt_enumeq(const void *a, const void *b, FmgrInfo *flinfo)
 static bool
 gbt_enumle(const void *a, const void *b, FmgrInfo *flinfo)
 {
-   return DatumGetBool(
-                       CallerFInfoFunctionCall2(enum_le, flinfo, InvalidOid, ObjectIdGetDatum(*((const Oid *) a)), ObjectIdGetDatum(*((const Oid *) b)))
-       );
+   return DatumGetBool(CallerFInfoFunctionCall2(enum_le, flinfo, InvalidOid,
+                                                ObjectIdGetDatum(*((const Oid *) a)),
+                                                ObjectIdGetDatum(*((const Oid *) b))));
 }
 static bool
 gbt_enumlt(const void *a, const void *b, FmgrInfo *flinfo)
 {
-   return DatumGetBool(
-                       CallerFInfoFunctionCall2(enum_lt, flinfo, InvalidOid, ObjectIdGetDatum(*((const Oid *) a)), ObjectIdGetDatum(*((const Oid *) b)))
-       );
+   return DatumGetBool(CallerFInfoFunctionCall2(enum_lt, flinfo, InvalidOid,
+                                                ObjectIdGetDatum(*((const Oid *) a)),
+                                                ObjectIdGetDatum(*((const Oid *) b))));
 }
 
 static int
@@ -73,14 +73,14 @@ gbt_enumkey_cmp(const void *a, const void *b, FmgrInfo *flinfo)
        if (ia->upper == ib->upper)
            return 0;
 
-       return DatumGetInt32(
-                            CallerFInfoFunctionCall2(enum_cmp, flinfo, InvalidOid, ObjectIdGetDatum(ia->upper), ObjectIdGetDatum(ib->upper))
-           );
+       return DatumGetInt32(CallerFInfoFunctionCall2(enum_cmp, flinfo, InvalidOid,
+                                                     ObjectIdGetDatum(ia->upper),
+                                                     ObjectIdGetDatum(ib->upper)));
    }
 
-   return DatumGetInt32(
-                        CallerFInfoFunctionCall2(enum_cmp, flinfo, InvalidOid, ObjectIdGetDatum(ia->lower), ObjectIdGetDatum(ib->lower))
-       );
+   return DatumGetInt32(CallerFInfoFunctionCall2(enum_cmp, flinfo, InvalidOid,
+                                                 ObjectIdGetDatum(ia->lower),
+                                                 ObjectIdGetDatum(ib->lower)));
 }
 
 static const gbtree_ninfo tinfo =
@@ -137,9 +137,9 @@ gbt_enum_consistent(PG_FUNCTION_ARGS)
    key.lower = (GBT_NUMKEY *) &kkk->lower;
    key.upper = (GBT_NUMKEY *) &kkk->upper;
 
-   PG_RETURN_BOOL(
-                  gbt_num_consistent(&key, (void *) &query, &strategy, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_BOOL(gbt_num_consistent(&key, (void *) &query, &strategy,
+                                     GIST_LEAF(entry), &tinfo,
+                                     fcinfo->flinfo));
 }
 
 Datum
@@ -168,11 +168,9 @@ gbt_enum_penalty(PG_FUNCTION_ARGS)
 Datum
 gbt_enum_picksplit(PG_FUNCTION_ARGS)
 {
-   PG_RETURN_POINTER(gbt_num_picksplit(
-                                       (GistEntryVector *) PG_GETARG_POINTER(0),
+   PG_RETURN_POINTER(gbt_num_picksplit((GistEntryVector *) PG_GETARG_POINTER(0),
                                        (GIST_SPLITVEC *) PG_GETARG_POINTER(1),
-                                       &tinfo, fcinfo->flinfo
-                                       ));
+                                       &tinfo, fcinfo->flinfo));
 }
 
 Datum
index 6b20f44a48f9b1c5f08a2ae3d75cc4db87411a8d..3604c73313a958c3031ca51f31d2c1c86700a8a7 100644 (file)
@@ -143,9 +143,9 @@ gbt_float4_consistent(PG_FUNCTION_ARGS)
    key.lower = (GBT_NUMKEY *) &kkk->lower;
    key.upper = (GBT_NUMKEY *) &kkk->upper;
 
-   PG_RETURN_BOOL(
-                  gbt_num_consistent(&key, (void *) &query, &strategy, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_BOOL(gbt_num_consistent(&key, (void *) &query, &strategy,
+                                     GIST_LEAF(entry), &tinfo,
+                                     fcinfo->flinfo));
 }
 
 
@@ -162,9 +162,8 @@ gbt_float4_distance(PG_FUNCTION_ARGS)
    key.lower = (GBT_NUMKEY *) &kkk->lower;
    key.upper = (GBT_NUMKEY *) &kkk->upper;
 
-   PG_RETURN_FLOAT8(
-                    gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_FLOAT8(gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry),
+                                     &tinfo, fcinfo->flinfo));
 }
 
 
@@ -195,11 +194,9 @@ gbt_float4_penalty(PG_FUNCTION_ARGS)
 Datum
 gbt_float4_picksplit(PG_FUNCTION_ARGS)
 {
-   PG_RETURN_POINTER(gbt_num_picksplit(
-                                       (GistEntryVector *) PG_GETARG_POINTER(0),
+   PG_RETURN_POINTER(gbt_num_picksplit((GistEntryVector *) PG_GETARG_POINTER(0),
                                        (GIST_SPLITVEC *) PG_GETARG_POINTER(1),
-                                       &tinfo, fcinfo->flinfo
-                                       ));
+                                       &tinfo, fcinfo->flinfo));
 }
 
 Datum
index ee114cbe4273af983569cf4930395b81ab9b70d7..10a5262aaa7ca98698987fd36b09dae9ce01f347 100644 (file)
@@ -150,9 +150,9 @@ gbt_float8_consistent(PG_FUNCTION_ARGS)
    key.lower = (GBT_NUMKEY *) &kkk->lower;
    key.upper = (GBT_NUMKEY *) &kkk->upper;
 
-   PG_RETURN_BOOL(
-                  gbt_num_consistent(&key, (void *) &query, &strategy, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_BOOL(gbt_num_consistent(&key, (void *) &query, &strategy,
+                                     GIST_LEAF(entry), &tinfo,
+                                     fcinfo->flinfo));
 }
 
 
@@ -169,9 +169,8 @@ gbt_float8_distance(PG_FUNCTION_ARGS)
    key.lower = (GBT_NUMKEY *) &kkk->lower;
    key.upper = (GBT_NUMKEY *) &kkk->upper;
 
-   PG_RETURN_FLOAT8(
-                    gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_FLOAT8(gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry),
+                                     &tinfo, fcinfo->flinfo));
 }
 
 
@@ -202,11 +201,9 @@ gbt_float8_penalty(PG_FUNCTION_ARGS)
 Datum
 gbt_float8_picksplit(PG_FUNCTION_ARGS)
 {
-   PG_RETURN_POINTER(gbt_num_picksplit(
-                                       (GistEntryVector *) PG_GETARG_POINTER(0),
+   PG_RETURN_POINTER(gbt_num_picksplit((GistEntryVector *) PG_GETARG_POINTER(0),
                                        (GIST_SPLITVEC *) PG_GETARG_POINTER(1),
-                                       &tinfo, fcinfo->flinfo
-                                       ));
+                                       &tinfo, fcinfo->flinfo));
 }
 
 Datum
index a3b4301c49a94e97a1273836e5892347cd3fdf64..e4b3a946b277008c1a9179ef96dbee4fab8faa89 100644 (file)
@@ -171,11 +171,9 @@ gbt_inet_penalty(PG_FUNCTION_ARGS)
 Datum
 gbt_inet_picksplit(PG_FUNCTION_ARGS)
 {
-   PG_RETURN_POINTER(gbt_num_picksplit(
-                                       (GistEntryVector *) PG_GETARG_POINTER(0),
+   PG_RETURN_POINTER(gbt_num_picksplit((GistEntryVector *) PG_GETARG_POINTER(0),
                                        (GIST_SPLITVEC *) PG_GETARG_POINTER(1),
-                                       &tinfo, fcinfo->flinfo
-                                       ));
+                                       &tinfo, fcinfo->flinfo));
 }
 
 Datum
index 7674e2d292bb90fe2d1f5e026a21451569d8f85d..a91b95ff3985335bd42f1deb798c7bd377fde26d 100644 (file)
@@ -150,9 +150,8 @@ gbt_int2_consistent(PG_FUNCTION_ARGS)
    key.lower = (GBT_NUMKEY *) &kkk->lower;
    key.upper = (GBT_NUMKEY *) &kkk->upper;
 
-   PG_RETURN_BOOL(
-                  gbt_num_consistent(&key, (void *) &query, &strategy, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_BOOL(gbt_num_consistent(&key, (void *) &query, &strategy,
+                                     GIST_LEAF(entry), &tinfo, fcinfo->flinfo));
 }
 
 
@@ -169,9 +168,8 @@ gbt_int2_distance(PG_FUNCTION_ARGS)
    key.lower = (GBT_NUMKEY *) &kkk->lower;
    key.upper = (GBT_NUMKEY *) &kkk->upper;
 
-   PG_RETURN_FLOAT8(
-                    gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_FLOAT8(gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry),
+                                     &tinfo, fcinfo->flinfo));
 }
 
 
@@ -201,11 +199,9 @@ gbt_int2_penalty(PG_FUNCTION_ARGS)
 Datum
 gbt_int2_picksplit(PG_FUNCTION_ARGS)
 {
-   PG_RETURN_POINTER(gbt_num_picksplit(
-                                       (GistEntryVector *) PG_GETARG_POINTER(0),
+   PG_RETURN_POINTER(gbt_num_picksplit((GistEntryVector *) PG_GETARG_POINTER(0),
                                        (GIST_SPLITVEC *) PG_GETARG_POINTER(1),
-                                       &tinfo, fcinfo->flinfo
-                                       ));
+                                       &tinfo, fcinfo->flinfo));
 }
 
 Datum
index 80005ab65d964e12b5bd6f90a180a51ab637ee8f..7ea98c478c73bb33343fabb9f4112f3446c291d5 100644 (file)
@@ -151,9 +151,8 @@ gbt_int4_consistent(PG_FUNCTION_ARGS)
    key.lower = (GBT_NUMKEY *) &kkk->lower;
    key.upper = (GBT_NUMKEY *) &kkk->upper;
 
-   PG_RETURN_BOOL(
-                  gbt_num_consistent(&key, (void *) &query, &strategy, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_BOOL(gbt_num_consistent(&key, (void *) &query, &strategy,
+                                     GIST_LEAF(entry), &tinfo, fcinfo->flinfo));
 }
 
 
@@ -170,9 +169,8 @@ gbt_int4_distance(PG_FUNCTION_ARGS)
    key.lower = (GBT_NUMKEY *) &kkk->lower;
    key.upper = (GBT_NUMKEY *) &kkk->upper;
 
-   PG_RETURN_FLOAT8(
-                    gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_FLOAT8(gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry),
+                                     &tinfo, fcinfo->flinfo));
 }
 
 
@@ -202,11 +200,9 @@ gbt_int4_penalty(PG_FUNCTION_ARGS)
 Datum
 gbt_int4_picksplit(PG_FUNCTION_ARGS)
 {
-   PG_RETURN_POINTER(gbt_num_picksplit(
-                                       (GistEntryVector *) PG_GETARG_POINTER(0),
+   PG_RETURN_POINTER(gbt_num_picksplit((GistEntryVector *) PG_GETARG_POINTER(0),
                                        (GIST_SPLITVEC *) PG_GETARG_POINTER(1),
-                                       &tinfo, fcinfo->flinfo
-                                       ));
+                                       &tinfo, fcinfo->flinfo));
 }
 
 Datum
index b0fd3e1277d07c15a2d4e581adcda4b08a72cac8..df2b0d174b965fc96baf1cb1467372aa999f6229 100644 (file)
@@ -151,9 +151,8 @@ gbt_int8_consistent(PG_FUNCTION_ARGS)
    key.lower = (GBT_NUMKEY *) &kkk->lower;
    key.upper = (GBT_NUMKEY *) &kkk->upper;
 
-   PG_RETURN_BOOL(
-                  gbt_num_consistent(&key, (void *) &query, &strategy, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_BOOL(gbt_num_consistent(&key, (void *) &query, &strategy,
+                                     GIST_LEAF(entry), &tinfo, fcinfo->flinfo));
 }
 
 
@@ -170,9 +169,8 @@ gbt_int8_distance(PG_FUNCTION_ARGS)
    key.lower = (GBT_NUMKEY *) &kkk->lower;
    key.upper = (GBT_NUMKEY *) &kkk->upper;
 
-   PG_RETURN_FLOAT8(
-                    gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_FLOAT8(gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry),
+                                     &tinfo, fcinfo->flinfo));
 }
 
 
@@ -202,11 +200,9 @@ gbt_int8_penalty(PG_FUNCTION_ARGS)
 Datum
 gbt_int8_picksplit(PG_FUNCTION_ARGS)
 {
-   PG_RETURN_POINTER(gbt_num_picksplit(
-                                       (GistEntryVector *) PG_GETARG_POINTER(0),
+   PG_RETURN_POINTER(gbt_num_picksplit((GistEntryVector *) PG_GETARG_POINTER(0),
                                        (GIST_SPLITVEC *) PG_GETARG_POINTER(1),
-                                       &tinfo, fcinfo->flinfo
-                                       ));
+                                       &tinfo, fcinfo->flinfo));
 }
 
 Datum
index 3a527a75fa0000c158ea6895fa83fcb6870953dd..a4b3b2b1e6fe44fdc5a9a9f01d713a70fc2a5138 100644 (file)
@@ -225,9 +225,8 @@ gbt_intv_consistent(PG_FUNCTION_ARGS)
    key.lower = (GBT_NUMKEY *) &kkk->lower;
    key.upper = (GBT_NUMKEY *) &kkk->upper;
 
-   PG_RETURN_BOOL(
-                  gbt_num_consistent(&key, (void *) query, &strategy, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_BOOL(gbt_num_consistent(&key, (void *) query, &strategy,
+                                     GIST_LEAF(entry), &tinfo, fcinfo->flinfo));
 }
 
 
@@ -244,9 +243,8 @@ gbt_intv_distance(PG_FUNCTION_ARGS)
    key.lower = (GBT_NUMKEY *) &kkk->lower;
    key.upper = (GBT_NUMKEY *) &kkk->upper;
 
-   PG_RETURN_FLOAT8(
-                    gbt_num_distance(&key, (void *) query, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_FLOAT8(gbt_num_distance(&key, (void *) query, GIST_LEAF(entry),
+                                     &tinfo, fcinfo->flinfo));
 }
 
 
@@ -284,11 +282,9 @@ gbt_intv_penalty(PG_FUNCTION_ARGS)
 Datum
 gbt_intv_picksplit(PG_FUNCTION_ARGS)
 {
-   PG_RETURN_POINTER(gbt_num_picksplit(
-                                       (GistEntryVector *) PG_GETARG_POINTER(0),
+   PG_RETURN_POINTER(gbt_num_picksplit((GistEntryVector *) PG_GETARG_POINTER(0),
                                        (GIST_SPLITVEC *) PG_GETARG_POINTER(1),
-                                       &tinfo, fcinfo->flinfo
-                                       ));
+                                       &tinfo, fcinfo->flinfo));
 }
 
 Datum
index 0486c357308368f0d85e4210b030dad80d249413..7f0e9e9c91254b52e55da33a99cc31322ae0b830 100644 (file)
@@ -141,9 +141,8 @@ gbt_macad_consistent(PG_FUNCTION_ARGS)
    key.lower = (GBT_NUMKEY *) &kkk->lower;
    key.upper = (GBT_NUMKEY *) &kkk->upper;
 
-   PG_RETURN_BOOL(
-                  gbt_num_consistent(&key, (void *) query, &strategy, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_BOOL(gbt_num_consistent(&key, (void *) query, &strategy,
+                                     GIST_LEAF(entry), &tinfo, fcinfo->flinfo));
 }
 
 
@@ -181,11 +180,9 @@ gbt_macad_penalty(PG_FUNCTION_ARGS)
 Datum
 gbt_macad_picksplit(PG_FUNCTION_ARGS)
 {
-   PG_RETURN_POINTER(gbt_num_picksplit(
-                                       (GistEntryVector *) PG_GETARG_POINTER(0),
+   PG_RETURN_POINTER(gbt_num_picksplit((GistEntryVector *) PG_GETARG_POINTER(0),
                                        (GIST_SPLITVEC *) PG_GETARG_POINTER(1),
-                                       &tinfo, fcinfo->flinfo
-                                       ));
+                                       &tinfo, fcinfo->flinfo));
 }
 
 Datum
index 30a1391d733ac68e6979cfb84b03117f07403602..ab4bca5d50d84766caabefa9cb6a48059929fdd9 100644 (file)
@@ -141,9 +141,8 @@ gbt_macad8_consistent(PG_FUNCTION_ARGS)
    key.lower = (GBT_NUMKEY *) &kkk->lower;
    key.upper = (GBT_NUMKEY *) &kkk->upper;
 
-   PG_RETURN_BOOL(
-                  gbt_num_consistent(&key, (void *) query, &strategy, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_BOOL(gbt_num_consistent(&key, (void *) query, &strategy,
+                                     GIST_LEAF(entry), &tinfo, fcinfo->flinfo));
 }
 
 
@@ -181,11 +180,9 @@ gbt_macad8_penalty(PG_FUNCTION_ARGS)
 Datum
 gbt_macad8_picksplit(PG_FUNCTION_ARGS)
 {
-   PG_RETURN_POINTER(gbt_num_picksplit(
-                                       (GistEntryVector *) PG_GETARG_POINTER(0),
+   PG_RETURN_POINTER(gbt_num_picksplit((GistEntryVector *) PG_GETARG_POINTER(0),
                                        (GIST_SPLITVEC *) PG_GETARG_POINTER(1),
-                                       &tinfo, fcinfo->flinfo
-                                       ));
+                                       &tinfo, fcinfo->flinfo));
 }
 
 Datum
index d43612a87349620402784f71e57c1593ef338ee8..d66901680e3366c73d6a52ddd5eb730b3ca059fa 100644 (file)
@@ -174,23 +174,17 @@ gbt_numeric_penalty(PG_FUNCTION_ARGS)
    ok = gbt_var_key_readable(org);
    uk = gbt_var_key_readable((GBT_VARKEY *) DatumGetPointer(uni));
 
-   us = DatumGetNumeric(DirectFunctionCall2(
-                                            numeric_sub,
+   us = DatumGetNumeric(DirectFunctionCall2(numeric_sub,
                                             PointerGetDatum(uk.upper),
-                                            PointerGetDatum(uk.lower)
-                                            ));
+                                            PointerGetDatum(uk.lower)));
 
-   os = DatumGetNumeric(DirectFunctionCall2(
-                                            numeric_sub,
+   os = DatumGetNumeric(DirectFunctionCall2(numeric_sub,
                                             PointerGetDatum(ok.upper),
-                                            PointerGetDatum(ok.lower)
-                                            ));
+                                            PointerGetDatum(ok.lower)));
 
-   ds = DatumGetNumeric(DirectFunctionCall2(
-                                            numeric_sub,
+   ds = DatumGetNumeric(DirectFunctionCall2(numeric_sub,
                                             NumericGetDatum(us),
-                                            NumericGetDatum(os)
-                                            ));
+                                            NumericGetDatum(os)));
 
    if (numeric_is_nan(us))
    {
@@ -208,11 +202,9 @@ gbt_numeric_penalty(PG_FUNCTION_ARGS)
        if (DirectFunctionCall2(numeric_gt, NumericGetDatum(ds), NumericGetDatum(nul)))
        {
            *result += FLT_MIN;
-           os = DatumGetNumeric(DirectFunctionCall2(
-                                                    numeric_div,
+           os = DatumGetNumeric(DirectFunctionCall2(numeric_div,
                                                     NumericGetDatum(ds),
-                                                    NumericGetDatum(us)
-                                                    ));
+                                                    NumericGetDatum(us)));
            *result += (float4) DatumGetFloat8(DirectFunctionCall1(numeric_float8_no_overflow, NumericGetDatum(os)));
        }
    }
index 00e701903fd4a327f3f177e3f46c1a8f72c49c8a..3cc7d4245d42b410f15bb4c3ab4500132d46738b 100644 (file)
@@ -151,9 +151,8 @@ gbt_oid_consistent(PG_FUNCTION_ARGS)
    key.lower = (GBT_NUMKEY *) &kkk->lower;
    key.upper = (GBT_NUMKEY *) &kkk->upper;
 
-   PG_RETURN_BOOL(
-                  gbt_num_consistent(&key, (void *) &query, &strategy, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_BOOL(gbt_num_consistent(&key, (void *) &query, &strategy,
+                                     GIST_LEAF(entry), &tinfo, fcinfo->flinfo));
 }
 
 
@@ -170,9 +169,8 @@ gbt_oid_distance(PG_FUNCTION_ARGS)
    key.lower = (GBT_NUMKEY *) &kkk->lower;
    key.upper = (GBT_NUMKEY *) &kkk->upper;
 
-   PG_RETURN_FLOAT8(
-                    gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_FLOAT8(gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry),
+                                     &tinfo, fcinfo->flinfo));
 }
 
 
@@ -202,11 +200,9 @@ gbt_oid_penalty(PG_FUNCTION_ARGS)
 Datum
 gbt_oid_picksplit(PG_FUNCTION_ARGS)
 {
-   PG_RETURN_POINTER(gbt_num_picksplit(
-                                       (GistEntryVector *) PG_GETARG_POINTER(0),
+   PG_RETURN_POINTER(gbt_num_picksplit((GistEntryVector *) PG_GETARG_POINTER(0),
                                        (GIST_SPLITVEC *) PG_GETARG_POINTER(1),
-                                       &tinfo, fcinfo->flinfo
-                                       ));
+                                       &tinfo, fcinfo->flinfo));
 }
 
 Datum
index 90cf6554eae14d9a24506a73ba99abf6ec7fb3d6..fd8774a2f0856e0a1f2b0620213930121f540c85 100644 (file)
@@ -216,9 +216,8 @@ gbt_time_consistent(PG_FUNCTION_ARGS)
    key.lower = (GBT_NUMKEY *) &kkk->lower;
    key.upper = (GBT_NUMKEY *) &kkk->upper;
 
-   PG_RETURN_BOOL(
-                  gbt_num_consistent(&key, (void *) &query, &strategy, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_BOOL(gbt_num_consistent(&key, (void *) &query, &strategy,
+                                     GIST_LEAF(entry), &tinfo, fcinfo->flinfo));
 }
 
 Datum
@@ -234,9 +233,8 @@ gbt_time_distance(PG_FUNCTION_ARGS)
    key.lower = (GBT_NUMKEY *) &kkk->lower;
    key.upper = (GBT_NUMKEY *) &kkk->upper;
 
-   PG_RETURN_FLOAT8(
-                    gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_FLOAT8(gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry),
+                                     &tinfo, fcinfo->flinfo));
 }
 
 Datum
@@ -260,9 +258,8 @@ gbt_timetz_consistent(PG_FUNCTION_ARGS)
    key.lower = (GBT_NUMKEY *) &kkk->lower;
    key.upper = (GBT_NUMKEY *) &kkk->upper;
 
-   PG_RETURN_BOOL(
-                  gbt_num_consistent(&key, (void *) &qqq, &strategy, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_BOOL(gbt_num_consistent(&key, (void *) &qqq, &strategy,
+                                     GIST_LEAF(entry), &tinfo, fcinfo->flinfo));
 }
 
 
@@ -287,15 +284,13 @@ gbt_time_penalty(PG_FUNCTION_ARGS)
    double      res;
    double      res2;
 
-   intr = DatumGetIntervalP(DirectFunctionCall2(
-                                                time_mi_time,
+   intr = DatumGetIntervalP(DirectFunctionCall2(time_mi_time,
                                                 TimeADTGetDatumFast(newentry->upper),
                                                 TimeADTGetDatumFast(origentry->upper)));
    res = INTERVAL_TO_SEC(intr);
    res = Max(res, 0);
 
-   intr = DatumGetIntervalP(DirectFunctionCall2(
-                                                time_mi_time,
+   intr = DatumGetIntervalP(DirectFunctionCall2(time_mi_time,
                                                 TimeADTGetDatumFast(origentry->lower),
                                                 TimeADTGetDatumFast(newentry->lower)));
    res2 = INTERVAL_TO_SEC(intr);
@@ -307,8 +302,7 @@ gbt_time_penalty(PG_FUNCTION_ARGS)
 
    if (res > 0)
    {
-       intr = DatumGetIntervalP(DirectFunctionCall2(
-                                                    time_mi_time,
+       intr = DatumGetIntervalP(DirectFunctionCall2(time_mi_time,
                                                     TimeADTGetDatumFast(origentry->upper),
                                                     TimeADTGetDatumFast(origentry->lower)));
        *result += FLT_MIN;
@@ -323,11 +317,9 @@ gbt_time_penalty(PG_FUNCTION_ARGS)
 Datum
 gbt_time_picksplit(PG_FUNCTION_ARGS)
 {
-   PG_RETURN_POINTER(gbt_num_picksplit(
-                                       (GistEntryVector *) PG_GETARG_POINTER(0),
+   PG_RETURN_POINTER(gbt_num_picksplit((GistEntryVector *) PG_GETARG_POINTER(0),
                                        (GIST_SPLITVEC *) PG_GETARG_POINTER(1),
-                                       &tinfo, fcinfo->flinfo
-                                       ));
+                                       &tinfo, fcinfo->flinfo));
 }
 
 Datum
index 49d1849d88964ae8db2ed2de1c1f6042c7471296..3b07969dee86145c13a81b334268e5a80457635f 100644 (file)
@@ -265,9 +265,8 @@ gbt_ts_consistent(PG_FUNCTION_ARGS)
    key.lower = (GBT_NUMKEY *) &kkk->lower;
    key.upper = (GBT_NUMKEY *) &kkk->upper;
 
-   PG_RETURN_BOOL(
-                  gbt_num_consistent(&key, (void *) &query, &strategy, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_BOOL(gbt_num_consistent(&key, (void *) &query, &strategy,
+                                     GIST_LEAF(entry), &tinfo, fcinfo->flinfo));
 }
 
 Datum
@@ -283,9 +282,8 @@ gbt_ts_distance(PG_FUNCTION_ARGS)
    key.lower = (GBT_NUMKEY *) &kkk->lower;
    key.upper = (GBT_NUMKEY *) &kkk->upper;
 
-   PG_RETURN_FLOAT8(
-                    gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_FLOAT8(gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry),
+                                     &tinfo, fcinfo->flinfo));
 }
 
 Datum
@@ -308,9 +306,8 @@ gbt_tstz_consistent(PG_FUNCTION_ARGS)
    key.upper = (GBT_NUMKEY *) &kkk[MAXALIGN(tinfo.size)];
    qqq = tstz_to_ts_gmt(query);
 
-   PG_RETURN_BOOL(
-                  gbt_num_consistent(&key, (void *) &qqq, &strategy, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_BOOL(gbt_num_consistent(&key, (void *) &qqq, &strategy,
+                                     GIST_LEAF(entry), &tinfo, fcinfo->flinfo));
 }
 
 Datum
@@ -328,9 +325,8 @@ gbt_tstz_distance(PG_FUNCTION_ARGS)
    key.upper = (GBT_NUMKEY *) &kkk[MAXALIGN(tinfo.size)];
    qqq = tstz_to_ts_gmt(query);
 
-   PG_RETURN_FLOAT8(
-                    gbt_num_distance(&key, (void *) &qqq, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_FLOAT8(gbt_num_distance(&key, (void *) &qqq, GIST_LEAF(entry),
+                                     &tinfo, fcinfo->flinfo));
 }
 
 
@@ -387,11 +383,9 @@ gbt_ts_penalty(PG_FUNCTION_ARGS)
 Datum
 gbt_ts_picksplit(PG_FUNCTION_ARGS)
 {
-   PG_RETURN_POINTER(gbt_num_picksplit(
-                                       (GistEntryVector *) PG_GETARG_POINTER(0),
+   PG_RETURN_POINTER(gbt_num_picksplit((GistEntryVector *) PG_GETARG_POINTER(0),
                                        (GIST_SPLITVEC *) PG_GETARG_POINTER(1),
-                                       &tinfo, fcinfo->flinfo
-                                       ));
+                                       &tinfo, fcinfo->flinfo));
 }
 
 Datum
index 452241f697709546b715f1ba1cea6b30931a42e0..2886c08b85e405629524cd9a46a51bf7c42a4f57 100644 (file)
@@ -190,10 +190,9 @@ gbt_bytea_pf_match(const bytea *pf, const bytea *query, const gbtree_vinfo *tinf
 static bool
 gbt_var_node_pf_match(const GBT_VARKEY_R *node, const bytea *query, const gbtree_vinfo *tinfo)
 {
-   return (tinfo->trnc && (
-                           gbt_bytea_pf_match(node->lower, query, tinfo) ||
-                           gbt_bytea_pf_match(node->upper, query, tinfo)
-                           ));
+   return (tinfo->trnc &&
+           (gbt_bytea_pf_match(node->lower, query, tinfo) ||
+            gbt_bytea_pf_match(node->upper, query, tinfo)));
 }
 
 
index 0b3e52fbffb9a936f0b117d0d1b0bb1712f36d3d..b81875979a3b905f09857e0c5f4f4b21a4c24ea6 100644 (file)
@@ -148,10 +148,9 @@ gbt_uuid_consistent(PG_FUNCTION_ARGS)
    key.lower = (GBT_NUMKEY *) &kkk->lower;
    key.upper = (GBT_NUMKEY *) &kkk->upper;
 
-   PG_RETURN_BOOL(
-                  gbt_num_consistent(&key, (void *) query, &strategy,
-                                     GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
-       );
+   PG_RETURN_BOOL(gbt_num_consistent(&key, (void *) query, &strategy,
+                                     GIST_LEAF(entry), &tinfo,
+                                     fcinfo->flinfo));
 }
 
 Datum
@@ -219,11 +218,9 @@ gbt_uuid_penalty(PG_FUNCTION_ARGS)
 Datum
 gbt_uuid_picksplit(PG_FUNCTION_ARGS)
 {
-   PG_RETURN_POINTER(gbt_num_picksplit(
-                                       (GistEntryVector *) PG_GETARG_POINTER(0),
+   PG_RETURN_POINTER(gbt_num_picksplit((GistEntryVector *) PG_GETARG_POINTER(0),
                                        (GIST_SPLITVEC *) PG_GETARG_POINTER(1),
-                                       &tinfo, fcinfo->flinfo
-                                       ));
+                                       &tinfo, fcinfo->flinfo));
 }
 
 Datum
index b98118e367bc40f1261fe5b40d4c6128d06fc563..6f810b26c5d66bb5d8af6f0906c0c3f12e364cd8 100644 (file)
@@ -717,14 +717,10 @@ cube_union_v0(NDBOX *a, NDBOX *b)
    /* First compute the union of the dimensions present in both args */
    for (i = 0; i < DIM(b); i++)
    {
-       result->x[i] = Min(
-                          Min(LL_COORD(a, i), UR_COORD(a, i)),
-                          Min(LL_COORD(b, i), UR_COORD(b, i))
-           );
-       result->x[i + DIM(a)] = Max(
-                                   Max(LL_COORD(a, i), UR_COORD(a, i)),
-                                   Max(LL_COORD(b, i), UR_COORD(b, i))
-           );
+       result->x[i] = Min(Min(LL_COORD(a, i), UR_COORD(a, i)),
+                          Min(LL_COORD(b, i), UR_COORD(b, i)));
+       result->x[i + DIM(a)] = Max(Max(LL_COORD(a, i), UR_COORD(a, i)),
+                                   Max(LL_COORD(b, i), UR_COORD(b, i)));
    }
    /* continue on the higher dimensions only present in 'a' */
    for (; i < DIM(a); i++)
@@ -796,14 +792,10 @@ cube_inter(PG_FUNCTION_ARGS)
    /* First compute intersection of the dimensions present in both args */
    for (i = 0; i < DIM(b); i++)
    {
-       result->x[i] = Max(
-                          Min(LL_COORD(a, i), UR_COORD(a, i)),
-                          Min(LL_COORD(b, i), UR_COORD(b, i))
-           );
-       result->x[i + DIM(a)] = Min(
-                                   Max(LL_COORD(a, i), UR_COORD(a, i)),
-                                   Max(LL_COORD(b, i), UR_COORD(b, i))
-           );
+       result->x[i] = Max(Min(LL_COORD(a, i), UR_COORD(a, i)),
+                          Min(LL_COORD(b, i), UR_COORD(b, i)));
+       result->x[i + DIM(a)] = Min(Max(LL_COORD(a, i), UR_COORD(a, i)),
+                                   Max(LL_COORD(b, i), UR_COORD(b, i)));
    }
    /* continue on the higher dimensions only present in 'a' */
    for (; i < DIM(a); i++)
index 1dddf0277939a33a2a0a5afc394036d4a9b6bb10..c1155e3911f2072cdd727eca234281ff7e38b39e 100644 (file)
@@ -905,8 +905,7 @@ materializeResult(FunctionCallInfo fcinfo, PGconn *conn, PGresult *res)
            if (!is_sql_cmd)
                nestlevel = applyRemoteGucs(conn);
 
-           oldcontext = MemoryContextSwitchTo(
-                                              rsinfo->econtext->ecxt_per_query_memory);
+           oldcontext = MemoryContextSwitchTo(rsinfo->econtext->ecxt_per_query_memory);
            tupstore = tuplestore_begin_heap(true, false, work_mem);
            rsinfo->setResult = tupstore;
            rsinfo->setDesc = tupdesc;
@@ -1027,8 +1026,7 @@ materializeQueryResult(FunctionCallInfo fcinfo,
                               TEXTOID, -1, 0);
            attinmeta = TupleDescGetAttInMetadata(tupdesc);
 
-           oldcontext = MemoryContextSwitchTo(
-                                              rsinfo->econtext->ecxt_per_query_memory);
+           oldcontext = MemoryContextSwitchTo(rsinfo->econtext->ecxt_per_query_memory);
            tupstore = tuplestore_begin_heap(true, false, work_mem);
            rsinfo->setResult = tupstore;
            rsinfo->setDesc = tupdesc;
index f2f16bc883a4623a21b7c25b8377f874fc7022cc..6f4d2b730e92cbd4ad478efc6de7cfc3026b6348 100644 (file)
@@ -531,8 +531,7 @@ DoubleMetaphone(char *str, char **codes)
                    }
 
                    /* germanic, greek, or otherwise 'ch' for 'kh' sound */
-                   if (
-                       (StringAt(original, 0, 4, "VAN ", "VON ", "")
+                   if ((StringAt(original, 0, 4, "VAN ", "VON ", "")
                         || StringAt(original, 0, 3, "SCH", ""))
                    /* 'architect but not 'arch', 'orchestra', 'orchid' */
                        || StringAt(original, (current - 2), 6, "ORCHES",
@@ -606,8 +605,7 @@ DoubleMetaphone(char *str, char **codes)
                        && !StringAt(original, (current + 2), 2, "HU", ""))
                    {
                        /* 'accident', 'accede' 'succeed' */
-                       if (
-                           ((current == 1)
+                       if (((current == 1)
                             && (GetAt(original, current - 1) == 'A'))
                            || StringAt(original, (current - 1), 5, "UCCEE",
                                        "UCCES", ""))
@@ -754,8 +752,7 @@ DoubleMetaphone(char *str, char **codes)
                     * Parker's rule (with some further refinements) - e.g.,
                     * 'hugh'
                     */
-                   if (
-                       ((current > 1)
+                   if (((current > 1)
                         && StringAt(original, (current - 2), 1,
                                     "B", "H", "D", ""))
                    /* e.g., 'bough' */
@@ -848,14 +845,12 @@ DoubleMetaphone(char *str, char **codes)
                }
 
                /* -ger-,  -gy- */
-               if (
-                   (StringAt(original, (current + 1), 2, "ER", "")
+               if ((StringAt(original, (current + 1), 2, "ER", "")
                     || (GetAt(original, current + 1) == 'Y'))
                    && !StringAt(original, 0, 6,
                                 "DANGER", "RANGER", "MANGER", "")
                    && !StringAt(original, (current - 1), 1, "E", "I", "")
-                   && !StringAt(original, (current - 1), 3, "RGY", "OGY",
-                                ""))
+                   && !StringAt(original, (current - 1), 3, "RGY", "OGY", ""))
                {
                    MetaphAdd(primary, "K");
                    MetaphAdd(secondary, "J");
@@ -869,8 +864,7 @@ DoubleMetaphone(char *str, char **codes)
                                "AGGI", "OGGI", ""))
                {
                    /* obvious germanic */
-                   if (
-                       (StringAt(original, 0, 4, "VAN ", "VON ", "")
+                   if ((StringAt(original, 0, 4, "VAN ", "VON ", "")
                         || StringAt(original, 0, 3, "SCH", ""))
                        || StringAt(original, (current + 1), 2, "ET", ""))
                    {
index c54071b1a88bdf9ff661d629f23c35bf97c65d46..01e59beaa3020f744704d74493926fea22d1fc4a 100644 (file)
@@ -612,9 +612,9 @@ hstore_slice_to_array(PG_FUNCTION_ARGS)
        }
        else
        {
-           out_datums[i] = PointerGetDatum(
-                                           cstring_to_text_with_len(HSTORE_VAL(entries, ptr, idx),
-                                                                    HSTORE_VALLEN(entries, idx)));
+           out_datums[i] =
+               PointerGetDatum(cstring_to_text_with_len(HSTORE_VAL(entries, ptr, idx),
+                                                        HSTORE_VALLEN(entries, idx)));
            out_nulls[i] = false;
        }
    }
index 0e3dcb467f60bc241ef9ffd3bfdc44bfcc29ea23..5b164f6788fb43a97e5318c3d870f3082c8baf48 100644 (file)
@@ -45,13 +45,9 @@ _int_contains(PG_FUNCTION_ARGS)
 Datum
 _int_different(PG_FUNCTION_ARGS)
 {
-   PG_RETURN_BOOL(!DatumGetBool(
-                                DirectFunctionCall2(
-                                                    _int_same,
+   PG_RETURN_BOOL(!DatumGetBool(DirectFunctionCall2(_int_same,
                                                     PointerGetDatum(PG_GETARG_POINTER(0)),
-                                                    PointerGetDatum(PG_GETARG_POINTER(1))
-                                                    )
-                                ));
+                                                    PointerGetDatum(PG_GETARG_POINTER(1)))));
 }
 
 Datum
index 6b14ed5150a92122c28920045f28696e788d2333..50f54f2eeca1aa99c9e1a7b0c4b37ec85cbbaa78 100644 (file)
@@ -446,11 +446,9 @@ gist_qtxt(ltree_gist *key, ltxtquery *query)
    if (LTG_ISALLTRUE(key))
        return true;
 
-   return ltree_execute(
-                        GETQUERY(query),
+   return ltree_execute(GETQUERY(query),
                         (void *) LTG_SIGN(key), false,
-                        checkcondition_bit
-       );
+                        checkcondition_bit);
 }
 
 static bool
index fa47710439b28744ce156eaa79d46f9ecc7d4c82..bfbcee6db49773640d8786adb498a963ae985150 100644 (file)
@@ -65,11 +65,7 @@ compare_subnode(ltree_level *t, char *qn, int len, int (*cmpptr) (const char *,
        isok = false;
        while ((tn = getlexeme(tn, endt, &lent)) != NULL)
        {
-           if (
-               (
-                lent == lenq ||
-                (lent > lenq && anyend)
-                ) &&
+           if ((lent == lenq || (lent > lenq && anyend)) &&
                (*cmpptr) (qn, tn, lenq) == 0)
            {
 
@@ -118,11 +114,8 @@ checkLevel(lquery_level *curq, ltree_level *curt)
            if (compare_subnode(curt, curvar->name, curvar->len, cmpptr, (curvar->flag & LVAR_ANYEND)))
                return true;
        }
-       else if (
-                (
-                 curvar->len == curt->len ||
-                 (curt->len > curvar->len && (curvar->flag & LVAR_ANYEND))
-                 ) &&
+       else if ((curvar->len == curt->len ||
+                 (curt->len > curvar->len && (curvar->flag & LVAR_ANYEND))) &&
                 (*cmpptr) (curvar->name, curt->name, curvar->len) == 0)
        {
 
index 12aa8fff203766336ea07645a0adfa75376a35e7..6ff4c3548b2c4c87f35b11dec0e43695334dff0b 100644 (file)
@@ -258,10 +258,8 @@ typedef struct rix
 static int
 treekey_cmp(const void *a, const void *b)
 {
-   return ltree_compare(
-                        ((const RIX *) a)->r,
-                        ((const RIX *) b)->r
-       );
+   return ltree_compare(((const RIX *) a)->r,
+                        ((const RIX *) b)->r);
 }
 
 
@@ -571,11 +569,9 @@ gist_qtxt(ltree_gist *key, ltxtquery *query)
    if (LTG_ISALLTRUE(key))
        return true;
 
-   return ltree_execute(
-                        GETQUERY(query),
+   return ltree_execute(GETQUERY(query),
                         (void *) LTG_SIGN(key), false,
-                        checkcondition_bit
-       );
+                        checkcondition_bit);
 }
 
 static bool
@@ -636,11 +632,9 @@ ltree_consistent(PG_FUNCTION_ARGS)
            if (GIST_LEAF(entry))
                res = (ltree_compare((ltree *) query, LTG_NODE(key)) == 0);
            else
-               res = (
-                      ltree_compare((ltree *) query, LTG_GETLNODE(key)) >= 0
+               res = (ltree_compare((ltree *) query, LTG_GETLNODE(key)) >= 0
                       &&
-                      ltree_compare((ltree *) query, LTG_GETRNODE(key)) <= 0
-                   );
+                      ltree_compare((ltree *) query, LTG_GETRNODE(key)) <= 0);
            break;
        case BTGreaterEqualStrategyNumber:
            query = PG_GETARG_LTREE_P(1);
index dc0ee82bb6e0779b9b5b5ab7c18046d65bd7115f..002102c9c75b69466d79852448ad488a2905890a 100644 (file)
@@ -68,11 +68,8 @@ checkcondition_str(void *checkval, ITEM *val)
            if (compare_subnode(level, op, val->length, cmpptr, (val->flag & LVAR_ANYEND)))
                return true;
        }
-       else if (
-                (
-                 val->length == level->len ||
-                 (level->len > val->length && (val->flag & LVAR_ANYEND))
-                 ) &&
+       else if ((val->length == level->len ||
+                 (level->len > val->length && (val->flag & LVAR_ANYEND))) &&
                 (*cmpptr) (op, level->name, val->length) == 0)
            return true;
 
@@ -94,12 +91,10 @@ ltxtq_exec(PG_FUNCTION_ARGS)
    chkval.node = val;
    chkval.operand = GETOPERAND(query);
 
-   result = ltree_execute(
-                          GETQUERY(query),
+   result = ltree_execute(GETQUERY(query),
                           &chkval,
                           true,
-                          checkcondition_str
-       );
+                          checkcondition_str);
 
    PG_FREE_IF_COPY(val, 0);
    PG_FREE_IF_COPY(query, 1);
index 9a3eac2ae6db88533bf4a8829bb4d8e7feaa13b6..2b53dac64aede5a84a14da68d1e12ee23fa90083 100644 (file)
@@ -545,8 +545,7 @@ sql_exec_searchtables(PGconn *conn, struct options *opts)
    free(comma_filenodes);
 
    /* now build the query */
-   todo = psprintf(
-                   "SELECT pg_catalog.pg_relation_filenode(c.oid) as \"Filenode\", relname as \"Table Name\" %s\n"
+   todo = psprintf("SELECT pg_catalog.pg_relation_filenode(c.oid) as \"Filenode\", relname as \"Table Name\" %s\n"
                    "FROM pg_catalog.pg_class c\n"
                    "   LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace\n"
                    "   LEFT JOIN pg_catalog.pg_database d ON d.datname = pg_catalog.current_database(),\n"
index 61fe4359a0ccfbb7891d03f2e11b4b71a2d28dad..20b4d32429e20ca66b96316aec8dc2213b899db7 100644 (file)
@@ -250,8 +250,7 @@ heap_page_items(PG_FUNCTION_ARGS)
 
                    bits_len =
                        BITMAPLEN(HeapTupleHeaderGetNatts(tuphdr)) * BITS_PER_BYTE;
-                   values[11] = CStringGetTextDatum(
-                                                    bits_to_text(tuphdr->t_bits, bits_len));
+                   values[11] = CStringGetTextDatum(bits_to_text(tuphdr->t_bits, bits_len));
                }
                else
                    nulls[11] = true;
index e022d0b7993217e1359c11251652697bbd2f452f..35a75c606682693c41da493493bbcd50ed574535 100644 (file)
@@ -878,9 +878,9 @@ gtrgm_picksplit(PG_FUNCTION_ARGS)
            if (ISALLTRUE(datum_l) && cache[j].allistrue)
                size_alpha = 0;
            else
-               size_alpha = SIGLENBIT - sizebitvec(
-                                                   (cache[j].allistrue) ? GETSIGN(datum_l) : GETSIGN(cache[j].sign)
-                   );
+               size_alpha = SIGLENBIT -
+                   sizebitvec((cache[j].allistrue) ? GETSIGN(datum_l) :
+                              GETSIGN(cache[j].sign));
        }
        else
            size_alpha = hemdistsign(cache[j].sign, GETSIGN(datum_l));
@@ -890,9 +890,9 @@ gtrgm_picksplit(PG_FUNCTION_ARGS)
            if (ISALLTRUE(datum_r) && cache[j].allistrue)
                size_beta = 0;
            else
-               size_beta = SIGLENBIT - sizebitvec(
-                                                  (cache[j].allistrue) ? GETSIGN(datum_r) : GETSIGN(cache[j].sign)
-                   );
+               size_beta = SIGLENBIT -
+                   sizebitvec((cache[j].allistrue) ? GETSIGN(datum_r) :
+                              GETSIGN(cache[j].sign));
        }
        else
            size_beta = hemdistsign(cache[j].sign, GETSIGN(datum_r));
index c9c8cbc73423aac60d2f1747acf58a5388c3572f..0670095c20655787593c393492511d77650eb4b8 100644 (file)
@@ -975,14 +975,12 @@ show_trgm(PG_FUNCTION_ARGS)
        d[i] = PointerGetDatum(item);
    }
 
-   a = construct_array(
-                       d,
+   a = construct_array(d,
                        ARRNELEM(trg),
                        TEXTOID,
                        -1,
                        false,
-                       'i'
-       );
+                       'i');
 
    for (i = 0; i < ARRNELEM(trg); i++)
        pfree(DatumGetPointer(d[i]));
index 4ff6694193cbb70d85a7104586d58740ca993b80..4a8e2be3290b0ef9ea32a5a2002fe65073e4f212 100644 (file)
@@ -557,8 +557,9 @@ seg_contained(PG_FUNCTION_ARGS)
 Datum
 seg_same(PG_FUNCTION_ARGS)
 {
-   int         cmp = DatumGetInt32(
-                                   DirectFunctionCall2(seg_cmp, PG_GETARG_DATUM(0), PG_GETARG_DATUM(1)));
+   int         cmp = DatumGetInt32(DirectFunctionCall2(seg_cmp,
+                                                       PG_GETARG_DATUM(0),
+                                                       PG_GETARG_DATUM(1)));
 
    PG_RETURN_BOOL(cmp == 0);
 }
@@ -845,8 +846,9 @@ seg_cmp(PG_FUNCTION_ARGS)
 Datum
 seg_lt(PG_FUNCTION_ARGS)
 {
-   int         cmp = DatumGetInt32(
-                                   DirectFunctionCall2(seg_cmp, PG_GETARG_DATUM(0), PG_GETARG_DATUM(1)));
+   int         cmp = DatumGetInt32(DirectFunctionCall2(seg_cmp,
+                                                       PG_GETARG_DATUM(0),
+                                                       PG_GETARG_DATUM(1)));
 
    PG_RETURN_BOOL(cmp < 0);
 }
@@ -854,8 +856,9 @@ seg_lt(PG_FUNCTION_ARGS)
 Datum
 seg_le(PG_FUNCTION_ARGS)
 {
-   int         cmp = DatumGetInt32(
-                                   DirectFunctionCall2(seg_cmp, PG_GETARG_DATUM(0), PG_GETARG_DATUM(1)));
+   int         cmp = DatumGetInt32(DirectFunctionCall2(seg_cmp,
+                                                       PG_GETARG_DATUM(0),
+                                                       PG_GETARG_DATUM(1)));
 
    PG_RETURN_BOOL(cmp <= 0);
 }
@@ -863,8 +866,9 @@ seg_le(PG_FUNCTION_ARGS)
 Datum
 seg_gt(PG_FUNCTION_ARGS)
 {
-   int         cmp = DatumGetInt32(
-                                   DirectFunctionCall2(seg_cmp, PG_GETARG_DATUM(0), PG_GETARG_DATUM(1)));
+   int         cmp = DatumGetInt32(DirectFunctionCall2(seg_cmp,
+                                                       PG_GETARG_DATUM(0),
+                                                       PG_GETARG_DATUM(1)));
 
    PG_RETURN_BOOL(cmp > 0);
 }
@@ -872,8 +876,9 @@ seg_gt(PG_FUNCTION_ARGS)
 Datum
 seg_ge(PG_FUNCTION_ARGS)
 {
-   int         cmp = DatumGetInt32(
-                                   DirectFunctionCall2(seg_cmp, PG_GETARG_DATUM(0), PG_GETARG_DATUM(1)));
+   int         cmp = DatumGetInt32(DirectFunctionCall2(seg_cmp,
+                                                       PG_GETARG_DATUM(0),
+                                                       PG_GETARG_DATUM(1)));
 
    PG_RETURN_BOOL(cmp >= 0);
 }
@@ -882,8 +887,9 @@ seg_ge(PG_FUNCTION_ARGS)
 Datum
 seg_different(PG_FUNCTION_ARGS)
 {
-   int         cmp = DatumGetInt32(
-                                   DirectFunctionCall2(seg_cmp, PG_GETARG_DATUM(0), PG_GETARG_DATUM(1)));
+   int         cmp = DatumGetInt32(DirectFunctionCall2(seg_cmp,
+                                                       PG_GETARG_DATUM(0),
+                                                       PG_GETARG_DATUM(1)));
 
    PG_RETURN_BOOL(cmp != 0);
 }
index cd105d91e0ec8c9ac1c2434f6704852fe3cb17a9..93c948856e7b3be718d933f3451f6e20cd419a79 100644 (file)
@@ -419,9 +419,7 @@ pg_decode_change(LogicalDecodingContext *ctx, ReorderBufferTXN *txn,
 
    appendStringInfoString(ctx->out, "table ");
    appendStringInfoString(ctx->out,
-                          quote_qualified_identifier(
-                                                     get_namespace_name(
-                                                                        get_rel_namespace(RelationGetRelid(relation))),
+                          quote_qualified_identifier(get_namespace_name(get_rel_namespace(RelationGetRelid(relation))),
                                                      class_form->relrewrite ?
                                                      get_rel_name(class_form->relrewrite) :
                                                      NameStr(class_form->relname)));
index 64bc2415bbaf8cdd0526a3decf6bb96651c8e897..bcbc26efdb6744a5a291213e0e49b930292dcfb9 100644 (file)
@@ -94,8 +94,7 @@ directBoolConsistentFn(GinScanKey key)
 static GinTernaryValue
 directTriConsistentFn(GinScanKey key)
 {
-   return DatumGetGinTernaryValue(FunctionCall7Coll(
-                                                    key->triConsistentFmgrInfo,
+   return DatumGetGinTernaryValue(FunctionCall7Coll(key->triConsistentFmgrInfo,
                                                     key->collation,
                                                     PointerGetDatum(key->entryRes),
                                                     UInt16GetDatum(key->strategy),
@@ -116,8 +115,7 @@ shimBoolConsistentFn(GinScanKey key)
 {
    GinTernaryValue result;
 
-   result = DatumGetGinTernaryValue(FunctionCall7Coll(
-                                                      key->triConsistentFmgrInfo,
+   result = DatumGetGinTernaryValue(FunctionCall7Coll(key->triConsistentFmgrInfo,
                                                       key->collation,
                                                       PointerGetDatum(key->entryRes),
                                                       UInt16GetDatum(key->strategy),
index 6ba5619644f1a3f011bd469b998284a34e7d2f7e..9ace64c3c4a9fc1a96c39c9617cca9de482990f1 100644 (file)
@@ -1377,8 +1377,7 @@ gist_point_consistent(PG_FUNCTION_ARGS)
            {
                POLYGON    *query = PG_GETARG_POLYGON_P(1);
 
-               result = DatumGetBool(DirectFunctionCall5(
-                                                         gist_poly_consistent,
+               result = DatumGetBool(DirectFunctionCall5(gist_poly_consistent,
                                                          PointerGetDatum(entry),
                                                          PolygonPGetDatum(query),
                                                          Int16GetDatum(RTOverlapStrategyNumber),
@@ -1394,8 +1393,7 @@ gist_point_consistent(PG_FUNCTION_ARGS)
 
                    Assert(box->high.x == box->low.x
                           && box->high.y == box->low.y);
-                   result = DatumGetBool(DirectFunctionCall2(
-                                                             poly_contain_pt,
+                   result = DatumGetBool(DirectFunctionCall2(poly_contain_pt,
                                                              PolygonPGetDatum(query),
                                                              PointPGetDatum(&box->high)));
                    *recheck = false;
@@ -1406,8 +1404,7 @@ gist_point_consistent(PG_FUNCTION_ARGS)
            {
                CIRCLE     *query = PG_GETARG_CIRCLE_P(1);
 
-               result = DatumGetBool(DirectFunctionCall5(
-                                                         gist_circle_consistent,
+               result = DatumGetBool(DirectFunctionCall5(gist_circle_consistent,
                                                          PointerGetDatum(entry),
                                                          CirclePGetDatum(query),
                                                          Int16GetDatum(RTOverlapStrategyNumber),
@@ -1423,8 +1420,7 @@ gist_point_consistent(PG_FUNCTION_ARGS)
 
                    Assert(box->high.x == box->low.x
                           && box->high.y == box->low.y);
-                   result = DatumGetBool(DirectFunctionCall2(
-                                                             circle_contain_pt,
+                   result = DatumGetBool(DirectFunctionCall2(circle_contain_pt,
                                                              CirclePGetDatum(query),
                                                              PointPGetDatum(&box->high)));
                    *recheck = false;
index 854136e9fa35a621f320c159ac2252198ec784c0..db6fad76bc4f053f783b2ea0324d1137406262b8 100644 (file)
@@ -4282,8 +4282,7 @@ l3:
 
                /* if the xmax changed in the meantime, start over */
                if (xmax_infomask_changed(tuple->t_data->t_infomask, infomask) ||
-                   !TransactionIdEquals(
-                                        HeapTupleHeaderGetRawXmax(tuple->t_data),
+                   !TransactionIdEquals(HeapTupleHeaderGetRawXmax(tuple->t_data),
                                         xwait))
                    goto l3;
                /* otherwise, we're good */
index e388cc714afc28980dbdefbb16f244690838f259..fbc5942578ba3d41abd0b4d117fcb2a2cd3f81bd 100644 (file)
@@ -295,9 +295,9 @@ xact_desc_commit(StringInfo buf, uint8 info, xl_xact_commit *xlrec, RepOriginId
    xact_desc_relations(buf, "rels", parsed.nrels, parsed.xnodes);
    xact_desc_subxacts(buf, parsed.nsubxacts, parsed.subxacts);
 
-   standby_desc_invalidations(
-                       buf, parsed.nmsgs, parsed.msgs, parsed.dbId, parsed.tsId,
-                       XactCompletionRelcacheInitFileInval(parsed.xinfo));
+   standby_desc_invalidations(buf, parsed.nmsgs, parsed.msgs, parsed.dbId,
+                              parsed.tsId,
+                              XactCompletionRelcacheInitFileInval(parsed.xinfo));
 
    if (XactCompletionForceSyncCommit(parsed.xinfo))
        appendStringInfoString(buf, "; sync");
@@ -344,9 +344,8 @@ xact_desc_prepare(StringInfo buf, uint8 info, xl_xact_prepare *xlrec)
                        parsed.abortnodes);
    xact_desc_subxacts(buf, parsed.nsubxacts, parsed.subxacts);
 
-   standby_desc_invalidations(
-                       buf, parsed.nmsgs, parsed.msgs, parsed.dbId, parsed.tsId,
-                       xlrec->initfileinval);
+   standby_desc_invalidations(buf, parsed.nmsgs, parsed.msgs, parsed.dbId,
+                              parsed.tsId, xlrec->initfileinval);
 }
 
 static void
index c264aef7ea3188252d1af181431766ff28e158d5..4d506bfb9a9b8d3e7f9bf0acce623721c062dfb8 100644 (file)
@@ -650,8 +650,7 @@ spgInnerTest(SpGistScanOpaque so, SpGistSearchItem *item,
    {
        /* collect node pointers */
        SpGistNodeTuple node;
-       SpGistNodeTuple *nodes = (SpGistNodeTuple *) palloc(
-                                                           sizeof(SpGistNodeTuple) * nNodes);
+       SpGistNodeTuple *nodes = (SpGistNodeTuple *) palloc(sizeof(SpGistNodeTuple) * nNodes);
 
        SGITITERATE(innerTuple, i, node)
        {
index 017f03b6d8ce35d4170f38fef5cfaeb77f5b5a7f..e3c60f23cd23f0a923aa49ff05093d26baebfdcb 100644 (file)
@@ -5779,22 +5779,19 @@ xact_redo_commit(xl_xact_parsed_commit *parsed,
         * bits set on changes made by transactions that haven't yet
         * recovered. It's unlikely but it's good to be safe.
         */
-       TransactionIdAsyncCommitTree(
-                                    xid, parsed->nsubxacts, parsed->subxacts, lsn);
+       TransactionIdAsyncCommitTree(xid, parsed->nsubxacts, parsed->subxacts, lsn);
 
        /*
         * We must mark clog before we update the ProcArray.
         */
-       ExpireTreeKnownAssignedTransactionIds(
-                                             xid, parsed->nsubxacts, parsed->subxacts, max_xid);
+       ExpireTreeKnownAssignedTransactionIds(xid, parsed->nsubxacts, parsed->subxacts, max_xid);
 
        /*
         * Send any cache invalidations attached to the commit. We must
         * maintain the same order of invalidation then release locks as
         * occurs in CommitTransaction().
         */
-       ProcessCommittedInvalidationMessages(
-                                            parsed->msgs, parsed->nmsgs,
+       ProcessCommittedInvalidationMessages(parsed->msgs, parsed->nmsgs,
                                             XactCompletionRelcacheInitFileInval(parsed->xinfo),
                                             parsed->dbId, parsed->tsId);
 
@@ -5908,8 +5905,7 @@ xact_redo_abort(xl_xact_parsed_abort *parsed, TransactionId xid)
        /*
         * We must update the ProcArray after we have marked clog.
         */
-       ExpireTreeKnownAssignedTransactionIds(
-                                             xid, parsed->nsubxacts, parsed->subxacts, max_xid);
+       ExpireTreeKnownAssignedTransactionIds(xid, parsed->nsubxacts, parsed->subxacts, max_xid);
 
        /*
         * There are no invalidation messages to send or undo.
index 0fdff2918f7914bceb75301e8b6d3801c6325086..709df9035fb221ca200cda949519964b09a83880 100644 (file)
@@ -2256,8 +2256,7 @@ StoreAttrDefault(Relation rel, AttrNumber attnum,
            else
            {
                /* otherwise make a one-element array of the value */
-               missingval = PointerGetDatum(
-                                            construct_array(&missingval,
+               missingval = PointerGetDatum(construct_array(&missingval,
                                                             1,
                                                             defAttStruct->atttypid,
                                                             defAttStruct->attlen,
index 6d4154af508fb40188004e9f2c3ab55e7551e881..71911d4067bda0379249e261dce696da708e9364 100644 (file)
@@ -2163,8 +2163,7 @@ pg_event_trigger_ddl_commands(PG_FUNCTION_ARGS)
                /* command tag */
                values[i++] = CStringGetTextDatum(CreateCommandTag(cmd->parsetree));
                /* object_type */
-               values[i++] = CStringGetTextDatum(stringify_adefprivs_objtype(
-                                                                             cmd->d.defprivs.objtype));
+               values[i++] = CStringGetTextDatum(stringify_adefprivs_objtype(cmd->d.defprivs.objtype));
                /* schema */
                nulls[i++] = true;
                /* identity */
@@ -2186,8 +2185,7 @@ pg_event_trigger_ddl_commands(PG_FUNCTION_ARGS)
                values[i++] = CStringGetTextDatum(cmd->d.grant.istmt->is_grant ?
                                                  "GRANT" : "REVOKE");
                /* object_type */
-               values[i++] = CStringGetTextDatum(stringify_grant_objtype(
-                                                                         cmd->d.grant.istmt->objtype));
+               values[i++] = CStringGetTextDatum(stringify_grant_objtype(cmd->d.grant.istmt->objtype));
                /* schema */
                nulls[i++] = true;
                /* identity */
index c3cda68068397f3cd0e153d5863d2d893a0633c3..f5993934736d496379e55082c55d6684c4621c92 100644 (file)
@@ -11481,8 +11481,7 @@ ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel,
                                           attTup->attbyval,
                                           attTup->attalign,
                                           &isNull);
-           missingval = PointerGetDatum(
-                                        construct_array(&missingval,
+           missingval = PointerGetDatum(construct_array(&missingval,
                                                         1,
                                                         targettype,
                                                         tform->typlen,
index f901baf1ed3d62fa2e3081c7d718200c5a8d7ab2..061752ea9c1ca236a2c819a39c082ec2c490d784 100644 (file)
@@ -3816,8 +3816,7 @@ ExecEvalXmlExpr(ExprState *state, ExprEvalStep *op)
                    return;
                value = argvalue[0];
 
-               *op->resvalue = PointerGetDatum(
-                                               xmltotext_with_xmloption(DatumGetXmlP(value),
+               *op->resvalue = PointerGetDatum(xmltotext_with_xmloption(DatumGetXmlP(value),
                                                                         xexpr->xmloption));
                *op->resnull = false;
            }
@@ -4174,8 +4173,7 @@ ExecAggInitGroup(AggState *aggstate, AggStatePerTrans pertrans, AggStatePerGroup
     * that the agg's input type is binary-compatible with its transtype, so
     * straight copy here is OK.)
     */
-   oldContext = MemoryContextSwitchTo(
-                                      aggstate->curaggcontext->ecxt_per_tuple_memory);
+   oldContext = MemoryContextSwitchTo(aggstate->curaggcontext->ecxt_per_tuple_memory);
    pergroup->transValue = datumCopy(fcinfo->args[1].value,
                                     pertrans->transtypeByVal,
                                     pertrans->transtypeLen);
index 7b8cb91f04d91decbef0ab91a0a9ac1887a32dd9..9073395eacfd363c8a8f57c1b01baf953362a88d 100644 (file)
@@ -475,8 +475,7 @@ initialize_aggregate(AggState *aggstate, AggStatePerTrans pertrans,
    {
        MemoryContext oldContext;
 
-       oldContext = MemoryContextSwitchTo(
-                                          aggstate->curaggcontext->ecxt_per_tuple_memory);
+       oldContext = MemoryContextSwitchTo(aggstate->curaggcontext->ecxt_per_tuple_memory);
        pergroupstate->transValue = datumCopy(pertrans->initValue,
                                              pertrans->transtypeByVal,
                                              pertrans->transtypeLen);
@@ -582,8 +581,7 @@ advance_transition_function(AggState *aggstate,
             * We must copy the datum into aggcontext if it is pass-by-ref. We
             * do not need to pfree the old transValue, since it's NULL.
             */
-           oldContext = MemoryContextSwitchTo(
-                                              aggstate->curaggcontext->ecxt_per_tuple_memory);
+           oldContext = MemoryContextSwitchTo(aggstate->curaggcontext->ecxt_per_tuple_memory);
            pergroupstate->transValue = datumCopy(fcinfo->args[1].value,
                                                  pertrans->transtypeByVal,
                                                  pertrans->transtypeLen);
index bd8c7f58119452a552f66ddfb4e3838235099aa1..c4f5a553ac499101cb28f4fb9c1368123d2fbb5c 100644 (file)
@@ -188,8 +188,7 @@ static int  pg_GSS_recvauth(Port *port);
  */
 #ifdef ENABLE_SSPI
 typedef SECURITY_STATUS
-           (WINAPI * QUERY_SECURITY_CONTEXT_TOKEN_FN) (
-                                                       PCtxtHandle, void **);
+           (WINAPI * QUERY_SECURITY_CONTEXT_TOKEN_FN) (PCtxtHandle, void **);
 static int pg_SSPI_recvauth(Port *port);
 static int pg_SSPI_make_upn(char *accountname,
                             size_t accountnamesize,
@@ -1147,8 +1146,7 @@ pg_GSS_recvauth(Port *port)
        elog(DEBUG4, "processing received GSS token of length %u",
             (unsigned int) gbuf.length);
 
-       maj_stat = gss_accept_sec_context(
-                                         &min_stat,
+       maj_stat = gss_accept_sec_context(&min_stat,
                                          &port->gss->ctx,
                                          port->gss->cred,
                                          &gbuf,
index 7d2756e23471936ad9642ff1230348e537af6971..db54a6ba2ea9268b721b3a62f74c8445be1e8028 100644 (file)
@@ -1538,8 +1538,7 @@ match_unsorted_outer(PlannerInfo *root,
            if (save_jointype == JOIN_UNIQUE_INNER)
                return;
 
-           inner_cheapest_total = get_cheapest_parallel_safe_total_inner(
-                                                                         innerrel->pathlist);
+           inner_cheapest_total = get_cheapest_parallel_safe_total_inner(innerrel->pathlist);
        }
 
        if (inner_cheapest_total)
index dff826a8280767e61fc1edfd47c0a0ab9f363f56..e048d200bb4235c2e26e79b6bb4126fb8f251e5f 100644 (file)
@@ -5110,13 +5110,11 @@ static void
 bitmap_subplan_mark_shared(Plan *plan)
 {
    if (IsA(plan, BitmapAnd))
-       bitmap_subplan_mark_shared(
-                                  linitial(((BitmapAnd *) plan)->bitmapplans));
+       bitmap_subplan_mark_shared(linitial(((BitmapAnd *) plan)->bitmapplans));
    else if (IsA(plan, BitmapOr))
    {
        ((BitmapOr *) plan)->isshared = true;
-       bitmap_subplan_mark_shared(
-                                  linitial(((BitmapOr *) plan)->bitmapplans));
+       bitmap_subplan_mark_shared(linitial(((BitmapOr *) plan)->bitmapplans));
    }
    else if (IsA(plan, BitmapIndexScan))
        ((BitmapIndexScan *) plan)->isshared = true;
index 51c486bebdb92120775bdbeeccea8a622b3c1003..7169509a797d0b6814ee7336021cf7789c030b62 100644 (file)
@@ -4571,14 +4571,12 @@ PgstatCollectorMain(int argc, char *argv[])
                    break;
 
                case PGSTAT_MTYPE_RESETSHAREDCOUNTER:
-                   pgstat_recv_resetsharedcounter(
-                                                  &msg.msg_resetsharedcounter,
+                   pgstat_recv_resetsharedcounter(&msg.msg_resetsharedcounter,
                                                   len);
                    break;
 
                case PGSTAT_MTYPE_RESETSINGLECOUNTER:
-                   pgstat_recv_resetsinglecounter(
-                                                  &msg.msg_resetsinglecounter,
+                   pgstat_recv_resetsinglecounter(&msg.msg_resetsinglecounter,
                                                   len);
                    break;
 
@@ -4611,8 +4609,7 @@ PgstatCollectorMain(int argc, char *argv[])
                    break;
 
                case PGSTAT_MTYPE_RECOVERYCONFLICT:
-                   pgstat_recv_recoveryconflict(
-                                                &msg.msg_recoveryconflict,
+                   pgstat_recv_recoveryconflict(&msg.msg_recoveryconflict,
                                                 len);
                    break;
 
@@ -4625,8 +4622,7 @@ PgstatCollectorMain(int argc, char *argv[])
                    break;
 
                case PGSTAT_MTYPE_CHECKSUMFAILURE:
-                   pgstat_recv_checksum_failure(
-                                                &msg.msg_checksumfailure,
+                   pgstat_recv_checksum_failure(&msg.msg_checksumfailure,
                                                 len);
                    break;
 
index 8095ae4cb1e68f464efd3b891c0a8d5d1222324f..2bba2b4f24d6716581edb6a715f781609a5ee4f0 100644 (file)
@@ -90,8 +90,7 @@ LogicalOutputWrite(LogicalDecodingContext *ctx, XLogRecPtr lsn, TransactionId xi
                               false));
 
    /* ick, but cstring_to_text_with_len works for bytea perfectly fine */
-   values[2] = PointerGetDatum(
-                               cstring_to_text_with_len(ctx->out->data, ctx->out->len));
+   values[2] = PointerGetDatum(cstring_to_text_with_len(ctx->out->data, ctx->out->len));
 
    tuplestore_putvalues(p->tupstore, p->tupdesc, values, nulls);
    p->returned_rows++;
index 73ca4f7884a0c36fb3ac79cc76a0252663d01a9c..aeebbf243a5436d245feb28ce39cd77754055eb4 100644 (file)
@@ -3415,8 +3415,7 @@ ReorderBufferToastReplace(ReorderBuffer *rb, ReorderBufferTXN *txn,
 
            cchange = dlist_container(ReorderBufferChange, node, it.cur);
            ctup = cchange->data.tp.newtuple;
-           chunk = DatumGetPointer(
-                                   fastgetattr(&ctup->tuple, 3, toast_desc, &isnull));
+           chunk = DatumGetPointer(fastgetattr(&ctup->tuple, 3, toast_desc, &isnull));
 
            Assert(!isnull);
            Assert(!VARATT_IS_EXTERNAL(chunk));
index 51925af6a054096b56e132233ac2e003250c6962..bb85b5e52aade72fe80e9882d8b12dde955b39a6 100644 (file)
@@ -2558,8 +2558,7 @@ CreateCommandTag(Node *parsetree)
             * When the column is renamed, the command tag is created from its
             * relation type
             */
-           tag = AlterObjectTypeCommandTag(
-                                           ((RenameStmt *) parsetree)->renameType == OBJECT_COLUMN ?
+           tag = AlterObjectTypeCommandTag(((RenameStmt *) parsetree)->renameType == OBJECT_COLUMN ?
                                            ((RenameStmt *) parsetree)->relationType :
                                            ((RenameStmt *) parsetree)->renameType);
            break;
index fb91a34b02b9b9cd13411326c773d6cc04c7c911..cb0835982d85c7a8e4600abcd5fdf6772654d839 100644 (file)
@@ -533,15 +533,11 @@ compileTheSubstitute(DictThesaurus *d)
            }
            else
            {
-               lexized = (TSLexeme *) DatumGetPointer(
-                                                      FunctionCall4(
-                                                                    &(d->subdict->lexize),
+               lexized = (TSLexeme *) DatumGetPointer(FunctionCall4(&(d->subdict->lexize),
                                                                     PointerGetDatum(d->subdict->dictData),
                                                                     PointerGetDatum(inptr->lexeme),
                                                                     Int32GetDatum(strlen(inptr->lexeme)),
-                                                                    PointerGetDatum(NULL)
-                                                                    )
-                   );
+                                                                    PointerGetDatum(NULL)));
            }
 
            if (lexized && lexized->lexeme)
index 1fe67c4c9987d1e2eee148f6378aade53ad09593..e7cd6264db27533fef506100443ea9ad7252230c 100644 (file)
@@ -49,8 +49,7 @@ compareWORD(const void *a, const void *b)
 {
    int         res;
 
-   res = tsCompareString(
-                         ((const ParsedWord *) a)->word, ((const ParsedWord *) a)->len,
+   res = tsCompareString(((const ParsedWord *) a)->word, ((const ParsedWord *) a)->len,
                          ((const ParsedWord *) b)->word, ((const ParsedWord *) b)->len,
                          false);
 
index 1681621657e160b7340e4ab2441f36fe5b3daf11..1c0f94e79759d15f3c2e5b969caeb7d145251c8a 100644 (file)
@@ -204,13 +204,11 @@ LexizeExec(LexizeData *ld, ParsedLex **correspondLexem)
 
                ld->dictState.isend = ld->dictState.getnext = false;
                ld->dictState.private_state = NULL;
-               res = (TSLexeme *) DatumGetPointer(FunctionCall4(
-                                                                &(dict->lexize),
+               res = (TSLexeme *) DatumGetPointer(FunctionCall4(&(dict->lexize),
                                                                 PointerGetDatum(dict->dictData),
                                                                 PointerGetDatum(curValLemm),
                                                                 Int32GetDatum(curValLenLemm),
-                                                                PointerGetDatum(&ld->dictState)
-                                                                ));
+                                                                PointerGetDatum(&ld->dictState)));
 
                if (ld->dictState.getnext)
                {
@@ -293,13 +291,11 @@ LexizeExec(LexizeData *ld, ParsedLex **correspondLexem)
            ld->dictState.isend = (curVal->type == 0) ? true : false;
            ld->dictState.getnext = false;
 
-           res = (TSLexeme *) DatumGetPointer(FunctionCall4(
-                                                            &(dict->lexize),
+           res = (TSLexeme *) DatumGetPointer(FunctionCall4(&(dict->lexize),
                                                             PointerGetDatum(dict->dictData),
                                                             PointerGetDatum(curVal->lemm),
                                                             Int32GetDatum(curVal->lenlemm),
-                                                            PointerGetDatum(&ld->dictState)
-                                                            ));
+                                                            PointerGetDatum(&ld->dictState)));
 
            if (ld->dictState.getnext)
            {
index 792f9ca4fa233d6320774e959f9ee2f6dd70935c..f58331de75b07e17d22984a4b8ef4b4bbbd7e90d 100644 (file)
@@ -6217,8 +6217,7 @@ int8_to_char(PG_FUNCTION_ARGS)
    if (IS_ROMAN(&Num))
    {
        /* Currently don't support int8 conversion to roman... */
-       numstr = orgnum = int_to_roman(DatumGetInt32(
-                                                    DirectFunctionCall1(int84, Int64GetDatum(value))));
+       numstr = orgnum = int_to_roman(DatumGetInt32(DirectFunctionCall1(int84, Int64GetDatum(value))));
    }
    else if (IS_EEEE(&Num))
    {
index 74f899f24dfc8969231361ffe1ce83f62cd1973b..7b2da2b36f8017e32cf1e9a9b148d78b2228e07c 100644 (file)
@@ -1501,8 +1501,7 @@ pg_stat_get_db_conflict_all(PG_FUNCTION_ARGS)
    if ((dbentry = pgstat_fetch_stat_dbentry(dbid)) == NULL)
        result = 0;
    else
-       result = (int64) (
-                         dbentry->n_conflict_tablespace +
+       result = (int64) (dbentry->n_conflict_tablespace +
                          dbentry->n_conflict_lock +
                          dbentry->n_conflict_snapshot +
                          dbentry->n_conflict_bufferpin +
@@ -1973,6 +1972,5 @@ pg_stat_get_archiver(PG_FUNCTION_ARGS)
        values[6] = TimestampTzGetDatum(archiver_stats->stat_reset_timestamp);
 
    /* Returns the record as Datum */
-   PG_RETURN_DATUM(HeapTupleGetDatum(
-                                     heap_form_tuple(tupdesc, values, nulls)));
+   PG_RETURN_DATUM(HeapTupleGetDatum(heap_form_tuple(tupdesc, values, nulls)));
 }
index 6fbd523bbb5ca89c96671e5c907e83d227288f64..dd2bc742aab282d164f0b42057c6817efc4cef3a 100644 (file)
@@ -346,8 +346,7 @@ spg_range_quad_inner_consistent(PG_FUNCTION_ARGS)
             * is RANGESTRAT_CONTAINS_ELEM.
             */
            if (strategy != RANGESTRAT_CONTAINS_ELEM)
-               empty = RangeIsEmpty(
-                                    DatumGetRangeTypeP(in->scankeys[i].sk_argument));
+               empty = RangeIsEmpty(DatumGetRangeTypeP(in->scankeys[i].sk_argument));
            else
                empty = false;
 
index fe6a75a0ca809cdb9468aaa52faa1b0b8fdc3a68..57413b07201fb40166f317dffda0f16e6a182fb6 100644 (file)
@@ -165,8 +165,7 @@ compute_range_stats(VacAttrStats *stats, AnalyzeAttrFetchFunc fetchfunc,
                 * For an ordinary range, use subdiff function between upper
                 * and lower bound values.
                 */
-               length = DatumGetFloat8(FunctionCall2Coll(
-                                                         &typcache->rng_subdiff_finfo,
+               length = DatumGetFloat8(FunctionCall2Coll(&typcache->rng_subdiff_finfo,
                                                          typcache->rng_collation,
                                                          upper.val, lower.val));
            }
@@ -246,8 +245,10 @@ compute_range_stats(VacAttrStats *stats, AnalyzeAttrFetchFunc fetchfunc,
 
            for (i = 0; i < num_hist; i++)
            {
-               bound_hist_values[i] = PointerGetDatum(range_serialize(
-                                                                      typcache, &lowers[pos], &uppers[pos], false));
+               bound_hist_values[i] = PointerGetDatum(range_serialize(typcache,
+                                                                      &lowers[pos],
+                                                                      &uppers[pos],
+                                                                      false));
                pos += delta;
                posfrac += deltafrac;
                if (posfrac >= (num_hist - 1))
index 116e00bce4e0b76a3e395b15808dca19e4926200..158784474d8d1c72fcefeb259d73855f011bf7b6 100644 (file)
@@ -6453,8 +6453,7 @@ get_update_query_targetlist_def(Query *query, List *targetList,
            {
                cur_ma_sublink = (SubLink *) lfirst(next_ma_cell);
                next_ma_cell = lnext(ma_sublinks, next_ma_cell);
-               remaining_ma_columns = count_nonjunk_tlist_entries(
-                                                                  ((Query *) cur_ma_sublink->subselect)->targetList);
+               remaining_ma_columns = count_nonjunk_tlist_entries(((Query *) cur_ma_sublink->subselect)->targetList);
                Assert(((Param *) expr)->paramid ==
                       ((cur_ma_sublink->subLinkId << 16) | 1));
                appendStringInfoChar(buf, '(');
index ef99365b87e1fc724511363785153174d28493bd..0b6c9d5ea8ee7557241794ee356d404aa53be49a 100644 (file)
@@ -5459,8 +5459,7 @@ generate_series_timestamp(PG_FUNCTION_ARGS)
        timestamp_cmp_internal(result, fctx->finish) >= 0)
    {
        /* increment current in preparation for next iteration */
-       fctx->current = DatumGetTimestamp(
-                                         DirectFunctionCall2(timestamp_pl_interval,
+       fctx->current = DatumGetTimestamp(DirectFunctionCall2(timestamp_pl_interval,
                                                              TimestampGetDatum(fctx->current),
                                                              PointerGetDatum(&fctx->step)));
 
@@ -5540,8 +5539,7 @@ generate_series_timestamptz(PG_FUNCTION_ARGS)
        timestamp_cmp_internal(result, fctx->finish) >= 0)
    {
        /* increment current in preparation for next iteration */
-       fctx->current = DatumGetTimestampTz(
-                                           DirectFunctionCall2(timestamptz_pl_interval,
+       fctx->current = DatumGetTimestampTz(DirectFunctionCall2(timestamptz_pl_interval,
                                                                TimestampTzGetDatum(fctx->current),
                                                                PointerGetDatum(&fctx->step)));
 
index 7fd32bcceb539f4ecc65749d3a127b07b659c067..8320dcda80054a4ed862625bfe26e6eb19280968 100644 (file)
@@ -704,9 +704,9 @@ gtsvector_picksplit(PG_FUNCTION_ARGS)
            if (ISALLTRUE(datum_l) && cache[j].allistrue)
                size_alpha = 0;
            else
-               size_alpha = SIGLENBIT - sizebitvec(
-                                                   (cache[j].allistrue) ? GETSIGN(datum_l) : GETSIGN(cache[j].sign)
-                   );
+               size_alpha = SIGLENBIT - sizebitvec((cache[j].allistrue) ?
+                                                   GETSIGN(datum_l) :
+                                                   GETSIGN(cache[j].sign));
        }
        else
            size_alpha = hemdistsign(cache[j].sign, GETSIGN(datum_l));
@@ -716,9 +716,9 @@ gtsvector_picksplit(PG_FUNCTION_ARGS)
            if (ISALLTRUE(datum_r) && cache[j].allistrue)
                size_beta = 0;
            else
-               size_beta = SIGLENBIT - sizebitvec(
-                                                  (cache[j].allistrue) ? GETSIGN(datum_r) : GETSIGN(cache[j].sign)
-                   );
+               size_beta = SIGLENBIT - sizebitvec((cache[j].allistrue) ?
+                                                  GETSIGN(datum_r) :
+                                                  GETSIGN(cache[j].sign));
        }
        else
            size_beta = hemdistsign(cache[j].sign, GETSIGN(datum_r));
index 663b434b6abf7857a33fcbfb87b4015573df0a20..ea40804110c76e1b8d0b66d65c7d2ade0adda1a7 100644 (file)
@@ -148,8 +148,7 @@ tsquery_phrase_distance(PG_FUNCTION_ARGS)
 Datum
 tsquery_phrase(PG_FUNCTION_ARGS)
 {
-   PG_RETURN_POINTER(DirectFunctionCall3(
-                                         tsquery_phrase_distance,
+   PG_RETURN_POINTER(DirectFunctionCall3(tsquery_phrase_distance,
                                          PG_GETARG_DATUM(0),
                                          PG_GETARG_DATUM(1),
                                          Int32GetDatum(1)));
@@ -353,11 +352,7 @@ tsq_mcontains(PG_FUNCTION_ARGS)
 Datum
 tsq_mcontained(PG_FUNCTION_ARGS)
 {
-   PG_RETURN_DATUM(
-                   DirectFunctionCall2(
-                                       tsq_mcontains,
+   PG_RETURN_DATUM(DirectFunctionCall2(tsq_mcontains,
                                        PG_GETARG_DATUM(1),
-                                       PG_GETARG_DATUM(0)
-                                       )
-       );
+                                       PG_GETARG_DATUM(0)));
 }
index e33ca5abe755e3f122c539a58873479cc41360c2..cab6874e70218e9bcefe6965f75b086d4b22f9af 100644 (file)
@@ -666,9 +666,7 @@ tsvector_unnest(PG_FUNCTION_ARGS)
        bool        nulls[] = {false, false, false};
        Datum       values[3];
 
-       values[0] = PointerGetDatum(
-                                   cstring_to_text_with_len(data + arrin[i].pos, arrin[i].len)
-           );
+       values[0] = PointerGetDatum(cstring_to_text_with_len(data + arrin[i].pos, arrin[i].len));
 
        if (arrin[i].haspos)
        {
@@ -689,15 +687,14 @@ tsvector_unnest(PG_FUNCTION_ARGS)
            {
                positions[j] = Int16GetDatum(WEP_GETPOS(posv->pos[j]));
                weight = 'D' - WEP_GETWEIGHT(posv->pos[j]);
-               weights[j] = PointerGetDatum(
-                                            cstring_to_text_with_len(&weight, 1)
-                   );
+               weights[j] = PointerGetDatum(cstring_to_text_with_len(&weight,
+                                                                     1));
            }
 
-           values[1] = PointerGetDatum(
-                                       construct_array(positions, posv->npos, INT2OID, 2, true, 's'));
-           values[2] = PointerGetDatum(
-                                       construct_array(weights, posv->npos, TEXTOID, -1, false, 'i'));
+           values[1] = PointerGetDatum(construct_array(positions, posv->npos,
+                                                       INT2OID, 2, true, 's'));
+           values[2] = PointerGetDatum(construct_array(weights, posv->npos,
+                                                       TEXTOID, -1, false, 'i'));
        }
        else
        {
@@ -730,9 +727,8 @@ tsvector_to_array(PG_FUNCTION_ARGS)
 
    for (i = 0; i < tsin->size; i++)
    {
-       elements[i] = PointerGetDatum(
-                                     cstring_to_text_with_len(STRPTR(tsin) + arrin[i].pos, arrin[i].len)
-           );
+       elements[i] = PointerGetDatum(cstring_to_text_with_len(STRPTR(tsin) + arrin[i].pos,
+                                                              arrin[i].len));
    }
 
    array = construct_array(elements, tsin->size, TEXTOID, -1, false, 'i');
index f2b499739244c65de886bd7a07c6cb6244daad5f..419b58330fea03e9979e5d7356a5011b2f3f027b 100644 (file)
@@ -199,8 +199,7 @@ pg_control_checkpoint(PG_FUNCTION_ARGS)
    values[16] = TransactionIdGetDatum(ControlFile->checkPointCopy.newestCommitTsXid);
    nulls[16] = false;
 
-   values[17] = TimestampTzGetDatum(
-                                    time_t_to_timestamptz(ControlFile->checkPointCopy.time));
+   values[17] = TimestampTzGetDatum(time_t_to_timestamptz(ControlFile->checkPointCopy.time));
    nulls[17] = false;
 
    htup = heap_form_tuple(tupdesc, values, nulls);
index eba4d835d3fca9cd5f3c4b8c5bc7c7755c2b0d15..11a242973818c1afc1be95beb2fdc3815041a5ab 100644 (file)
@@ -57,8 +57,8 @@ get_tablespace_paths(void)
    res = executeQueryOrDie(conn, "%s", query);
 
    if ((os_info.num_old_tablespaces = PQntuples(res)) != 0)
-       os_info.old_tablespaces = (char **) pg_malloc(
-                                                     os_info.num_old_tablespaces * sizeof(char *));
+       os_info.old_tablespaces =
+           (char **) pg_malloc(os_info.num_old_tablespaces * sizeof(char *));
    else
        os_info.old_tablespaces = NULL;
 
@@ -68,8 +68,7 @@ get_tablespace_paths(void)
    {
        struct stat statBuf;
 
-       os_info.old_tablespaces[tblnum] = pg_strdup(
-                                                   PQgetvalue(res, tblnum, i_spclocation));
+       os_info.old_tablespaces[tblnum] = pg_strdup(PQgetvalue(res, tblnum, i_spclocation));
 
        /*
         * Check that the tablespace path exists and is a directory.
index f2cbbf20230bd131713adf4a38b564f4cc331d90..66b47d98cbe8eb29bc9d4ef16075358ba8f6f01f 100644 (file)
@@ -663,8 +663,7 @@ helpSQL(const char *topic, unsigned short int pager)
 void
 print_copyright(void)
 {
-   puts(
-        "PostgreSQL Database Management System\n"
+   puts("PostgreSQL Database Management System\n"
         "(formerly known as Postgres, then as Postgres95)\n\n"
         "Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group\n\n"
         "Portions Copyright (c) 1994, The Regents of the University of California\n\n"
@@ -681,6 +680,5 @@ print_copyright(void)
         "INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY\n"
         "AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS\n"
         "ON AN \"AS IS\" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO\n"
-        "PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.\n"
-       );
+        "PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.\n");
 }
index c57dee4e27abdf87193af8e820f3c3f38aa29995..2e2d217352dbcbc927d3752a8d9d735fb5c7e68f 100644 (file)
@@ -2301,10 +2301,7 @@ PQconnectPoll(PGconn *conn)
 
        default:
            appendPQExpBufferStr(&conn->errorMessage,
-                                libpq_gettext(
-                                              "invalid connection state, "
-                                              "probably indicative of memory corruption\n"
-                                              ));
+                                libpq_gettext("invalid connection state, probably indicative of memory corruption\n"));
            goto error_return;
    }
 
@@ -3217,9 +3214,7 @@ keep_going:                       /* We will come back to here until there is
                if (!(beresp == 'R' || beresp == 'E'))
                {
                    appendPQExpBuffer(&conn->errorMessage,
-                                     libpq_gettext(
-                                                   "expected authentication request from "
-                                                   "server, but received %c\n"),
+                                     libpq_gettext("expected authentication request from server, but received %c\n"),
                                      beresp);
                    goto error_return;
                }
@@ -3250,9 +3245,7 @@ keep_going:                       /* We will come back to here until there is
                if (beresp == 'R' && (msgLength < 8 || msgLength > 2000))
                {
                    appendPQExpBuffer(&conn->errorMessage,
-                                     libpq_gettext(
-                                                   "expected authentication request from "
-                                                   "server, but received %c\n"),
+                                     libpq_gettext("expected authentication request from server, but received %c\n"),
                                      beresp);
                    goto error_return;
                }
@@ -4637,8 +4630,9 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
    p = strchr(url + strlen(LDAP_URL), '/');
    if (p == NULL || *(p + 1) == '\0' || *(p + 1) == '?')
    {
-       printfPQExpBuffer(errorMessage, libpq_gettext(
-                                                     "invalid LDAP URL \"%s\": missing distinguished name\n"), purl);
+       printfPQExpBuffer(errorMessage,
+                         libpq_gettext("invalid LDAP URL \"%s\": missing distinguished name\n"),
+                         purl);
        free(url);
        return 3;
    }
@@ -4648,8 +4642,9 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
    /* attribute */
    if ((p = strchr(dn, '?')) == NULL || *(p + 1) == '\0' || *(p + 1) == '?')
    {
-       printfPQExpBuffer(errorMessage, libpq_gettext(
-                                                     "invalid LDAP URL \"%s\": must have exactly one attribute\n"), purl);
+       printfPQExpBuffer(errorMessage,
+                         libpq_gettext("invalid LDAP URL \"%s\": must have exactly one attribute\n"),
+                         purl);
        free(url);
        return 3;
    }
@@ -4690,8 +4685,9 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
        lport = strtol(portstr, &endptr, 10);
        if (*portstr == '\0' || *endptr != '\0' || errno || lport < 0 || lport > 65535)
        {
-           printfPQExpBuffer(errorMessage, libpq_gettext(
-                                                         "invalid LDAP URL \"%s\": invalid port number\n"), purl);
+           printfPQExpBuffer(errorMessage,
+                             libpq_gettext("invalid LDAP URL \"%s\": invalid port number\n"),
+                             purl);
            free(url);
            return 3;
        }
@@ -4701,8 +4697,9 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
    /* Allow only one attribute */
    if (strchr(attrs[0], ',') != NULL)
    {
-       printfPQExpBuffer(errorMessage, libpq_gettext(
-                                                     "invalid LDAP URL \"%s\": must have exactly one attribute\n"), purl);
+       printfPQExpBuffer(errorMessage,
+                         libpq_gettext("invalid LDAP URL \"%s\": must have exactly one attribute\n"),
+                         purl);
        free(url);
        return 3;
    }
@@ -4900,8 +4897,8 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
                }
                else if (ld_is_nl_cr(*p))
                {
-                   printfPQExpBuffer(errorMessage, libpq_gettext(
-                                                                 "missing \"=\" after \"%s\" in connection info string\n"),
+                   printfPQExpBuffer(errorMessage,
+                                     libpq_gettext("missing \"=\" after \"%s\" in connection info string\n"),
                                      optname);
                    free(result);
                    return 3;
@@ -4919,8 +4916,8 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
                }
                else if (!ld_is_sp_tab(*p))
                {
-                   printfPQExpBuffer(errorMessage, libpq_gettext(
-                                                                 "missing \"=\" after \"%s\" in connection info string\n"),
+                   printfPQExpBuffer(errorMessage,
+                                     libpq_gettext("missing \"=\" after \"%s\" in connection info string\n"),
                                      optname);
                    free(result);
                    return 3;
@@ -5008,8 +5005,8 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
 
    if (state == 5 || state == 6)
    {
-       printfPQExpBuffer(errorMessage, libpq_gettext(
-                                                     "unterminated quoted string in connection info string\n"));
+       printfPQExpBuffer(errorMessage,
+                         libpq_gettext("unterminated quoted string in connection info string\n"));
        return 3;
    }
 
index a9074d2f29cca793d629a8618f21176c63fe1ce7..19729f9631152911321b99558988945997ee2f06 100644 (file)
@@ -802,8 +802,7 @@ retry4:
     */
 definitelyEOF:
    printfPQExpBuffer(&conn->errorMessage,
-                     libpq_gettext(
-                                   "server closed the connection unexpectedly\n"
+                     libpq_gettext("server closed the connection unexpectedly\n"
                                    "\tThis probably means the server terminated abnormally\n"
                                    "\tbefore or while processing the request.\n"));
 
index 275ecc5a0ac0becabb6dba6cd42e283e3b5f186e..9360c541bec03c2a2fd781ac00a1262abed057d4 100644 (file)
@@ -84,10 +84,7 @@ pqSetenvPoll(PGconn *conn)
 
        default:
            printfPQExpBuffer(&conn->errorMessage,
-                             libpq_gettext(
-                                           "invalid setenv state %c, "
-                                           "probably indicative of memory corruption\n"
-                                           ),
+                             libpq_gettext("invalid setenv state %c, probably indicative of memory corruption\n"),
                              conn->setenv_state);
            goto error_return;
    }
@@ -626,8 +623,7 @@ pqParseInput2(PGconn *conn)
                     */
                default:
                    printfPQExpBuffer(&conn->errorMessage,
-                                     libpq_gettext(
-                                                   "unexpected response from server; first received character was \"%c\"\n"),
+                                     libpq_gettext("unexpected response from server; first received character was \"%c\"\n"),
                                      id);
                    /* build an error result holding the error message */
                    pqSaveErrorResult(conn);
index 850bf84c96ab588ad6121641499ed301a19d6a65..16965254757cebb367d42d27eff79185ae7969f9 100644 (file)
@@ -405,8 +405,7 @@ pqParseInput3(PGconn *conn)
                    break;
                default:
                    printfPQExpBuffer(&conn->errorMessage,
-                                     libpq_gettext(
-                                                   "unexpected response from server; first received character was \"%c\"\n"),
+                                     libpq_gettext("unexpected response from server; first received character was \"%c\"\n"),
                                      id);
                    /* build an error result holding the error message */
                    pqSaveErrorResult(conn);
@@ -447,8 +446,7 @@ static void
 handleSyncLoss(PGconn *conn, char id, int msgLength)
 {
    printfPQExpBuffer(&conn->errorMessage,
-                     libpq_gettext(
-                                   "lost synchronization with server: got message type \"%c\", length %d\n"),
+                     libpq_gettext("lost synchronization with server: got message type \"%c\", length %d\n"),
                      id, msgLength);
    /* build an error result holding the error message */
    pqSaveErrorResult(conn);
index 026b14fa7240f63c9b06572dc46e919a37109232..cf142fbaa48162fa835eefbcf869ffcd3ca23bdd 100644 (file)
@@ -206,8 +206,7 @@ rloop:
                if (result_errno == EPIPE ||
                    result_errno == ECONNRESET)
                    printfPQExpBuffer(&conn->errorMessage,
-                                     libpq_gettext(
-                                                   "server closed the connection unexpectedly\n"
+                                     libpq_gettext("server closed the connection unexpectedly\n"
                                                    "\tThis probably means the server terminated abnormally\n"
                                                    "\tbefore or while processing the request.\n"));
                else
@@ -314,8 +313,7 @@ pgtls_write(PGconn *conn, const void *ptr, size_t len)
                result_errno = SOCK_ERRNO;
                if (result_errno == EPIPE || result_errno == ECONNRESET)
                    printfPQExpBuffer(&conn->errorMessage,
-                                     libpq_gettext(
-                                                   "server closed the connection unexpectedly\n"
+                                     libpq_gettext("server closed the connection unexpectedly\n"
                                                    "\tThis probably means the server terminated abnormally\n"
                                                    "\tbefore or while processing the request.\n"));
                else
@@ -578,10 +576,8 @@ pgtls_verify_peer_name_matches_certificate_guts(PGconn *conn,
            if (cn_index >= 0)
            {
                (*names_examined)++;
-               rc = openssl_verify_peer_name_matches_certificate_name(
-                                                                      conn,
-                                                                      X509_NAME_ENTRY_get_data(
-                                                                                               X509_NAME_get_entry(subject_name, cn_index)),
+               rc = openssl_verify_peer_name_matches_certificate_name(conn,
+                                                                      X509_NAME_ENTRY_get_data(X509_NAME_get_entry(subject_name, cn_index)),
                                                                       first_name);
            }
        }
index 52f6e8790ede6f43a89ec2298a4121cfdab6778a..b455b45e96440b8eaec4c818790566b01fb0955d 100644 (file)
@@ -264,8 +264,7 @@ pqsecure_raw_read(PGconn *conn, void *ptr, size_t len)
 #ifdef ECONNRESET
            case ECONNRESET:
                printfPQExpBuffer(&conn->errorMessage,
-                                 libpq_gettext(
-                                               "server closed the connection unexpectedly\n"
+                                 libpq_gettext("server closed the connection unexpectedly\n"
                                                "\tThis probably means the server terminated abnormally\n"
                                                "\tbefore or while processing the request.\n"));
                break;
@@ -381,8 +380,7 @@ retry_masked:
            case ECONNRESET:
 #endif
                printfPQExpBuffer(&conn->errorMessage,
-                                 libpq_gettext(
-                                               "server closed the connection unexpectedly\n"
+                                 libpq_gettext("server closed the connection unexpectedly\n"
                                                "\tThis probably means the server terminated abnormally\n"
                                                "\tbefore or while processing the request.\n"));
                break;
index 25ca38754ff320c0d0b0a40720d638a8298023ff..cd19ec925281a653e570462bedd36faa4fc7584a 100644 (file)
@@ -291,8 +291,7 @@ winsock_strerror(int err, char *strerrbuf, size_t buflen)
        if (!dlls[i].loaded)
        {
            dlls[i].loaded = 1; /* Only load once */
-           dlls[i].handle = (void *) LoadLibraryEx(
-                                                   dlls[i].dll_name,
+           dlls[i].handle = (void *) LoadLibraryEx(dlls[i].dll_name,
                                                    0,
                                                    LOAD_LIBRARY_AS_DATAFILE);
        }
@@ -304,13 +303,11 @@ winsock_strerror(int err, char *strerrbuf, size_t buflen)
            | FORMAT_MESSAGE_IGNORE_INSERTS
            | (dlls[i].handle ? FORMAT_MESSAGE_FROM_HMODULE : 0);
 
-       success = 0 != FormatMessage(
-                                    flags,
+       success = 0 != FormatMessage(flags,
                                     dlls[i].handle, err,
                                     MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT),
                                     strerrbuf, buflen - 64,
-                                    0
-           );
+                                    0);
    }
 
    if (!success)
index c78891868a5c07a50ca10f73f14d4c15004642f9..f5de2332d5599f5528de8c60a4e57b2ed36fbfe2 100644 (file)
@@ -1631,11 +1631,8 @@ plperl_trigger_build_args(FunctionCallInfo fcinfo)
    tdata = (TriggerData *) fcinfo->context;
    tupdesc = tdata->tg_relation->rd_att;
 
-   relid = DatumGetCString(
-                           DirectFunctionCall1(oidout,
-                                               ObjectIdGetDatum(tdata->tg_relation->rd_id)
-                                               )
-       );
+   relid = DatumGetCString(DirectFunctionCall1(oidout,
+                                               ObjectIdGetDatum(tdata->tg_relation->rd_id)));
 
    hv_store_string(hv, "name", cstr2sv(tdata->tg_trigger->tgname));
    hv_store_string(hv, "relid", cstr2sv(relid));
index 71b433ef2672a4401fd8177a834271cdc6eaedad..ae0b97c85d3f2e7f70c566edd64151d44bf3f047 100644 (file)
@@ -297,12 +297,10 @@ PLy_traceback(PyObject *e, PyObject *v, PyObject *tb,
            plain_lineno = PyInt_AsLong(lineno);
 
            if (proname == NULL)
-               appendStringInfo(
-                                &tbstr, "\n  PL/Python anonymous code block, line %ld, in %s",
+               appendStringInfo(&tbstr, "\n  PL/Python anonymous code block, line %ld, in %s",
                                 plain_lineno - 1, fname);
            else
-               appendStringInfo(
-                                &tbstr, "\n  PL/Python function \"%s\", line %ld, in %s",
+               appendStringInfo(&tbstr, "\n  PL/Python function \"%s\", line %ld, in %s",
                                 proname, plain_lineno - 1, fname);
 
            /*
index e7640008fdc22428d16d24c5cf106597e0114212..f0d170bec7b0e4be03a6cb84b3c93ced922650a3 100644 (file)
@@ -2746,8 +2746,7 @@ pltcl_SPI_execute_plan(ClientData cdata, Tcl_Interp *interp,
        if (strlen(nulls) != qdesc->nargs)
        {
            Tcl_SetObjResult(interp,
-                            Tcl_NewStringObj(
-                                             "length of nulls string doesn't match number of arguments",
+                            Tcl_NewStringObj("length of nulls string doesn't match number of arguments",
                                              -1));
            return TCL_ERROR;
        }
@@ -2762,9 +2761,8 @@ pltcl_SPI_execute_plan(ClientData cdata, Tcl_Interp *interp,
        if (i >= objc)
        {
            Tcl_SetObjResult(interp,
-                            Tcl_NewStringObj(
-                                             "argument list length doesn't match number of arguments for query"
-                                             ,-1));
+                            Tcl_NewStringObj("argument list length doesn't match number of arguments for query",
+                                             -1));
            return TCL_ERROR;
        }
 
index e11f06805263d19db313374507d5ec5e2db2245a..ee8fe8233784632e93ef56f72c7078a5b11fe588 100644 (file)
@@ -74,8 +74,7 @@ init_gettimeofday(LPFILETIME lpSystemTimeAsFileTime)
     * and determining the windows version is its self somewhat Windows
     * version and development SDK specific...
     */
-   pg_get_system_time = (PgGetSystemTimeFn) GetProcAddress(
-                                                           GetModuleHandle(TEXT("kernel32.dll")),
+   pg_get_system_time = (PgGetSystemTimeFn) GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")),
                                                            "GetSystemTimePreciseAsFileTime");
    if (pg_get_system_time == NULL)
    {