pgindent run before 6.3 release, with Thomas' requested changes.

1 files changed, 192 insertions, 169 deletions

diff --git a/contrib/array/array_iterator.c b/contrib/array/array_iterator.c
index 53130bf7a96..7c301c8e236 100644
--- a/contrib/array/array_iterator.c
+++ b/contrib/array/array_iterator.c
@@ -29,90 +29,113 @@
 static int32
 array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value)
 {
-    HeapTuple typ_tuple;
-    TypeTupleForm typ_struct;
-    bool typbyval;
-    int typlen;
-    func_ptr proc_fn;
-    int pronargs;
-    int nitems, i, result;
-    int ndim, *dim;
-    char *p;
-
-    /* Sanity checks */
-    if ((array == (ArrayType *) NULL)
-	|| (ARR_IS_LO(array) == true)) {
-	/* elog(NOTICE, "array_iterator: array is null"); */
-        return (0);
-    }
-    ndim = ARR_NDIM(array);
-    dim = ARR_DIMS(array);
-    nitems = getNitems(ndim, dim);
-    if (nitems == 0) {
-	/* elog(NOTICE, "array_iterator: nitems = 0"); */
-        return (0);
-    }
-
-    /* Lookup element type information */
-    typ_tuple = SearchSysCacheTuple(TYPOID, ObjectIdGetDatum(elemtype),0,0,0);
-    if (!HeapTupleIsValid(typ_tuple)) {
-        elog(ERROR,"array_iterator: cache lookup failed for type %d", elemtype);
-        return 0;
-    }
-    typ_struct = (TypeTupleForm) GETSTRUCT(typ_tuple);
-    typlen   = typ_struct->typlen;
-    typbyval = typ_struct->typbyval;
-
-    /* Lookup the function entry point */
-    proc_fn = (func_ptr) NULL;
-    fmgr_info(proc, &proc_fn, &pronargs);
-    if ((proc_fn == NULL) || (pronargs != 2)) {
-	elog(ERROR, "array_iterator: fmgr_info lookup failed for oid %d", proc);
-        return (0);
-    }
-
-    /* Scan the array and apply the operator to each element */
-    result = 0;
-    p = ARR_DATA_PTR(array);
-    for (i = 0; i < nitems; i++) {
-        if (typbyval) {
-            switch(typlen) {
-	      case 1:
-		result = (int) (*proc_fn)(*p, value);
-		break;
-	    case 2:
-		result = (int) (*proc_fn)(* (int16 *) p, value);
-		break;
-	    case 3:
-	    case 4:
-		result = (int) (*proc_fn)(* (int32 *) p, value);
-		break;
-            }
-            p += typlen;
-        } else {
-	    result = (int) (*proc_fn)(p, value);
-            if (typlen > 0) {
-		p += typlen;
-	    } else {
-                p += INTALIGN(* (int32 *) p);
-	    }
-        }
-	if (result) {
-	    if (!and) {
-		return (1);
-	    }
-	} else {
-	    if (and) {
+	HeapTuple	typ_tuple;
+	TypeTupleForm typ_struct;
+	bool		typbyval;
+	int			typlen;
+	func_ptr	proc_fn;
+	int			pronargs;
+	int			nitems,
+				i,
+				result;
+	int			ndim,
+			   *dim;
+	char	   *p;
+
+	/* Sanity checks */
+	if ((array == (ArrayType *) NULL)
+		|| (ARR_IS_LO(array) == true))
+	{
+		/* elog(NOTICE, "array_iterator: array is null"); */
+		return (0);
+	}
+	ndim = ARR_NDIM(array);
+	dim = ARR_DIMS(array);
+	nitems = getNitems(ndim, dim);
+	if (nitems == 0)
+	{
+		/* elog(NOTICE, "array_iterator: nitems = 0"); */
+		return (0);
+	}
+
+	/* Lookup element type information */
+	typ_tuple = SearchSysCacheTuple(TYPOID, ObjectIdGetDatum(elemtype), 0, 0, 0);
+	if (!HeapTupleIsValid(typ_tuple))
+	{
+		elog(ERROR, "array_iterator: cache lookup failed for type %d", elemtype);
+		return 0;
+	}
+	typ_struct = (TypeTupleForm) GETSTRUCT(typ_tuple);
+	typlen = typ_struct->typlen;
+	typbyval = typ_struct->typbyval;
+
+	/* Lookup the function entry point */
+	proc_fn = (func_ptr) NULL;
+	fmgr_info(proc, &proc_fn, &pronargs);
+	if ((proc_fn == NULL) || (pronargs != 2))
+	{
+		elog(ERROR, "array_iterator: fmgr_info lookup failed for oid %d", proc);
 		return (0);
-	    }
 	}
-    }
 
-    if (and && result) {
-	return (1);
-    } else {
-	return (0);
-    }
+	/* Scan the array and apply the operator to each element */
+	result = 0;
+	p = ARR_DATA_PTR(array);
+	for (i = 0; i < nitems; i++)
+	{
+		if (typbyval)
+		{
+			switch (typlen)
+			{
+				case 1:
+					result = (int) (*proc_fn) (*p, value);
+					break;
+				case 2:
+					result = (int) (*proc_fn) (*(int16 *) p, value);
+					break;
+				case 3:
+				case 4:
+					result = (int) (*proc_fn) (*(int32 *) p, value);
+					break;
+			}
+			p += typlen;
+		}
+		else
+		{
+			result = (int) (*proc_fn) (p, value);
+			if (typlen > 0)
+			{
+				p += typlen;
+			}
+			else
+			{
+				p += INTALIGN(*(int32 *) p);
+			}
+		}
+		if (result)
+		{
+			if (!and)
+			{
+				return (1);
+			}
+		}
+		else
+		{
+			if (and)
+			{
+				return (0);
+			}
+		}
+	}
+
+	if (and && result)
+	{
+		return (1);
+	}
+	else
+	{
+		return (0);
+	}
 }
 
 /*
@@ -120,39 +143,39 @@ array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value)
  */
 
 int32
-array_texteq(ArrayType *array, char* value)
+array_texteq(ArrayType *array, char *value)
 {
-    return array_iterator((Oid) 25,	/* text */
-			  (Oid) 67,	/* texteq */
-			  0,		/* logical or */
-			  array, (Datum)value);
+	return array_iterator((Oid) 25,		/* text */
+						  (Oid) 67,		/* texteq */
+						  0,	/* logical or */
+						  array, (Datum) value);
 }
 
 int32
-array_all_texteq(ArrayType *array, char* value)
+array_all_texteq(ArrayType *array, char *value)
 {
-    return array_iterator((Oid) 25,	/* text */
-			  (Oid) 67,	/* texteq */
-			  1,		/* logical and */
-			  array, (Datum)value);
+	return array_iterator((Oid) 25,		/* text */
+						  (Oid) 67,		/* texteq */
+						  1,	/* logical and */
+						  array, (Datum) value);
 }
 
 int32
-array_textregexeq(ArrayType *array, char* value)
+array_textregexeq(ArrayType *array, char *value)
 {
-    return array_iterator((Oid) 25,	/* text */
-			  (Oid) 1254,	/* textregexeq */
-			  0,		/* logical or */
-			  array, (Datum)value);
+	return array_iterator((Oid) 25,		/* text */
+						  (Oid) 1254,	/* textregexeq */
+						  0,	/* logical or */
+						  array, (Datum) value);
 }
 
 int32
-array_all_textregexeq(ArrayType *array, char* value)
+array_all_textregexeq(ArrayType *array, char *value)
 {
-    return array_iterator((Oid) 25,	/* text */
-			  (Oid) 1254,	/* textregexeq */
-			  1,		/* logical and */
-			  array, (Datum)value);
+	return array_iterator((Oid) 25,		/* text */
+						  (Oid) 1254,	/* textregexeq */
+						  1,	/* logical and */
+						  array, (Datum) value);
 }
 
 /*
@@ -161,39 +184,39 @@ array_all_textregexeq(ArrayType *array, char* value)
  */
 
 int32
-array_char16eq(ArrayType *array, char* value)
+array_char16eq(ArrayType *array, char *value)
 {
-    return array_iterator((Oid) 20,	/* char16 */
-			  (Oid) 1275,	/* char16eq */
-			  0,		/* logical or */
-			  array, (Datum)value);
+	return array_iterator((Oid) 20,		/* char16 */
+						  (Oid) 1275,	/* char16eq */
+						  0,	/* logical or */
+						  array, (Datum) value);
 }
 
 int32
-array_all_char16eq(ArrayType *array, char* value)
+array_all_char16eq(ArrayType *array, char *value)
 {
-    return array_iterator((Oid) 20,	/* char16 */
-			  (Oid) 1275,	/* char16eq */
-			  1,		/* logical and */
-			  array, (Datum)value);
+	return array_iterator((Oid) 20,		/* char16 */
+						  (Oid) 1275,	/* char16eq */
+						  1,	/* logical and */
+						  array, (Datum) value);
 }
 
 int32
-array_char16regexeq(ArrayType *array, char* value)
+array_char16regexeq(ArrayType *array, char *value)
 {
-    return array_iterator((Oid) 20,	/* char16 */
-			  (Oid) 1288,	/* char16regexeq */
-			  0,		/* logical or */
-			  array, (Datum)value);
+	return array_iterator((Oid) 20,		/* char16 */
+						  (Oid) 1288,	/* char16regexeq */
+						  0,	/* logical or */
+						  array, (Datum) value);
 }
 
 int32
-array_all_char16regexeq(ArrayType *array, char* value)
+array_all_char16regexeq(ArrayType *array, char *value)
 {
-    return array_iterator((Oid) 20,	/* char16 */
-			  (Oid) 1288,	/* char16regexeq */
-			  1,		/* logical and */
-			  array, (Datum)value);
+	return array_iterator((Oid) 20,		/* char16 */
+						  (Oid) 1288,	/* char16regexeq */
+						  1,	/* logical and */
+						  array, (Datum) value);
 }
 
 /*
@@ -203,109 +226,109 @@ array_all_char16regexeq(ArrayType *array, char* value)
 int32
 array_int4eq(ArrayType *array, int4 value)
 {
-    return array_iterator((Oid) 23,	/* int4 */
-			  (Oid) 65,	/* int4eq */
-			  0,		/* logical or */
-			  array, (Datum)value);
+	return array_iterator((Oid) 23,		/* int4 */
+						  (Oid) 65,		/* int4eq */
+						  0,	/* logical or */
+						  array, (Datum) value);
 }
 
 int32
 array_all_int4eq(ArrayType *array, int4 value)
 {
-    return array_iterator((Oid) 23,	/* int4 */
-			  (Oid) 65,	/* int4eq */
-			  1,		/* logical and */
-			  array, (Datum)value);
+	return array_iterator((Oid) 23,		/* int4 */
+						  (Oid) 65,		/* int4eq */
+						  1,	/* logical and */
+						  array, (Datum) value);
 }
 
 int32
 array_int4ne(ArrayType *array, int4 value)
 {
-    return array_iterator((Oid) 23,	/* int4 */
-			  (Oid) 144,	/* int4ne */
-			  0,		/* logical or */
-			  array, (Datum)value);
+	return array_iterator((Oid) 23,		/* int4 */
+						  (Oid) 144,	/* int4ne */
+						  0,	/* logical or */
+						  array, (Datum) value);
 }
 
 int32
 array_all_int4ne(ArrayType *array, int4 value)
 {
-    return array_iterator((Oid) 23,	/* int4 */
-			  (Oid) 144,	/* int4ne */
-			  1,		/* logical and */
-			  array, (Datum)value);
+	return array_iterator((Oid) 23,		/* int4 */
+						  (Oid) 144,	/* int4ne */
+						  1,	/* logical and */
+						  array, (Datum) value);
 }
 
 int32
 array_int4gt(ArrayType *array, int4 value)
 {
-    return array_iterator((Oid) 23,	/* int4 */
-			  (Oid) 147,	/* int4gt */
-			  0,		/* logical or */
-			  array, (Datum)value);
+	return array_iterator((Oid) 23,		/* int4 */
+						  (Oid) 147,	/* int4gt */
+						  0,	/* logical or */
+						  array, (Datum) value);
 }
 
 int32
 array_all_int4gt(ArrayType *array, int4 value)
 {
-    return array_iterator((Oid) 23,	/* int4 */
-			  (Oid) 147,	/* int4gt */
-			  1,		/* logical and */
-			  array, (Datum)value);
+	return array_iterator((Oid) 23,		/* int4 */
+						  (Oid) 147,	/* int4gt */
+						  1,	/* logical and */
+						  array, (Datum) value);
 }
 
 int32
 array_int4ge(ArrayType *array, int4 value)
 {
-    return array_iterator((Oid) 23,	/* int4 */
-			  (Oid) 150,	/* int4ge */
-			  0,		/* logical or */
-			  array, (Datum)value);
+	return array_iterator((Oid) 23,		/* int4 */
+						  (Oid) 150,	/* int4ge */
+						  0,	/* logical or */
+						  array, (Datum) value);
 }
 
 int32
 array_all_int4ge(ArrayType *array, int4 value)
 {
-    return array_iterator((Oid) 23,	/* int4 */
-			  (Oid) 150,	/* int4ge */
-			  1,		/* logical and */
-			  array, (Datum)value);
+	return array_iterator((Oid) 23,		/* int4 */
+						  (Oid) 150,	/* int4ge */
+						  1,	/* logical and */
+						  array, (Datum) value);
 }
 
 int32
 array_int4lt(ArrayType *array, int4 value)
 {
-    return array_iterator((Oid) 23,	/* int4 */
-			  (Oid) 66,	/* int4lt */
-			  0,		/* logical or */
-			  array, (Datum)value);
+	return array_iterator((Oid) 23,		/* int4 */
+						  (Oid) 66,		/* int4lt */
+						  0,	/* logical or */
+						  array, (Datum) value);
 }
 
 int32
 array_all_int4lt(ArrayType *array, int4 value)
 {
-    return array_iterator((Oid) 23,	/* int4 */
-			  (Oid) 66,	/* int4lt */
-			  1,		/* logical and */
-			  array, (Datum)value);
+	return array_iterator((Oid) 23,		/* int4 */
+						  (Oid) 66,		/* int4lt */
+						  1,	/* logical and */
+						  array, (Datum) value);
 }
 
 int32
 array_int4le(ArrayType *array, int4 value)
 {
-    return array_iterator((Oid) 23,	/* int4 */
-			  (Oid) 149,	/* int4le */
-			  0,		/* logical or */
-			  array, (Datum)value);
+	return array_iterator((Oid) 23,		/* int4 */
+						  (Oid) 149,	/* int4le */
+						  0,	/* logical or */
+						  array, (Datum) value);
 }
 
 int32
 array_all_int4le(ArrayType *array, int4 value)
 {
-    return array_iterator((Oid) 23,	/* int4 */
-			  (Oid) 149,	/* int4le */
-			  1,		/* logical and */
-			  array, (Datum)value);
+	return array_iterator((Oid) 23,		/* int4 */
+						  (Oid) 149,	/* int4le */
+						  1,	/* logical and */
+						  array, (Datum) value);
 }
 
 /* end of file */