From 0bfc64b3875268c054b064d06165044caecfabf6 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Sat, 4 Aug 2001 19:36:45 +0000 Subject: [PATCH] Looks okay in a quick glance, except error message spelling is poor: ! #define ARRISNULL(x) ( (x) ? ( ( ARR_NDIM(x) == NDIM ) ? ( ( ARRNELEMS( x ) ) ? 0 : 1 ) : ( ( ARR_NDIM(x) ) ? (elog(ERROR,"Array is not one-dimentional: %d di mentions", ARR_NDIM(x)),1) : 1 ) ) : 1 ) Should be "one-dimensional" and "dimensions". Bruce, would you fix that when you apply it? Tom --- contrib/intarray/_int.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/intarray/_int.c b/contrib/intarray/_int.c index 8a90a77641..fa3ed8e9ad 100644 --- a/contrib/intarray/_int.c +++ b/contrib/intarray/_int.c @@ -36,7 +36,7 @@ #define ARRPTR(x) ( (int4 *) ARR_DATA_PTR(x) ) #define ARRNELEMS(x) ArrayGetNItems( ARR_NDIM(x), ARR_DIMS(x)) -#define ARRISNULL(x) ( (x) ? ( ( ARR_NDIM(x) == NDIM ) ? ( ( ARRNELEMS( x ) ) ? 0 : 1 ) : ( ( ARR_NDIM(x) ) ? (elog(ERROR,"Array is not one-dimentional: %d dimentions", ARR_NDIM(x)),1) : 1 ) ) : 1 ) +#define ARRISNULL(x) ( (x) ? ( ( ARR_NDIM(x) == NDIM ) ? ( ( ARRNELEMS( x ) ) ? 0 : 1 ) : ( ( ARR_NDIM(x) ) ? (elog(ERROR,"Array is not one-dimensional: %d dimensions", ARR_NDIM(x)),1) : 1 ) ) : 1 ) #define ARRISVOID(x) ( (x) ? ( ( ARR_NDIM(x) == NDIM ) ? ( ( ARRNELEMS( x ) ) ? 0 : 1 ) : 1 ) : 0 ) #define SORT(x) \