Clean up newlines following left parentheses

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.GA6303@alvherre.pgsql

4 files changed, 15 insertions, 35 deletions

diff --git a/contrib/ltree/_ltree_gist.c b/contrib/ltree/_ltree_gist.c
index 6b14ed5150..50f54f2eec 100644
--- a/contrib/ltree/_ltree_gist.c
+++ b/contrib/ltree/_ltree_gist.c
@@ -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
diff --git a/contrib/ltree/lquery_op.c b/contrib/ltree/lquery_op.c
index fa47710439..bfbcee6db4 100644
--- a/contrib/ltree/lquery_op.c
+++ b/contrib/ltree/lquery_op.c
@@ -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)
 		{
 
diff --git a/contrib/ltree/ltree_gist.c b/contrib/ltree/ltree_gist.c
index 12aa8fff20..6ff4c3548b 100644
--- a/contrib/ltree/ltree_gist.c
+++ b/contrib/ltree/ltree_gist.c
@@ -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);
diff --git a/contrib/ltree/ltxtquery_op.c b/contrib/ltree/ltxtquery_op.c
index dc0ee82bb6..002102c9c7 100644
--- a/contrib/ltree/ltxtquery_op.c
+++ b/contrib/ltree/ltxtquery_op.c
@@ -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);