summaryrefslogtreecommitdiff
path: root/src/backend/utils/adt
diff options
context:
space:
mode:
authorNeil Conway <neilc@samurai.com>2006-01-11 08:43:13 +0000
committerNeil Conway <neilc@samurai.com>2006-01-11 08:43:13 +0000
commitfb627b76ccc4c7074e37b6b94155864f6cbd1b23 (patch)
treea8e7b008b4f6c2a2188641937e5b984f40b60104 /src/backend/utils/adt
parent762bcbdba2a2519b01b17b2c2b28f36e5ee9ea25 (diff)
downloadpostgresql-fb627b76ccc4c7074e37b6b94155864f6cbd1b23.tar.gz
Cosmetic code cleanup: fix a bunch of places that used "return (expr);"
rather than "return expr;" -- the latter style is used in most of the tree. I kept the parentheses when they were necessary or useful because the return expression was complex.
Diffstat (limited to 'src/backend/utils/adt')
-rw-r--r--src/backend/utils/adt/like.c12
-rw-r--r--src/backend/utils/adt/mac.c4
-rw-r--r--src/backend/utils/adt/network.c4
3 files changed, 10 insertions, 10 deletions
diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c
index 4bf2cd3387..7b26495224 100644
--- a/src/backend/utils/adt/like.c
+++ b/src/backend/utils/adt/like.c
@@ -11,7 +11,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/adt/like.c,v 1.62 2005/10/15 02:49:28 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/like.c,v 1.63 2006/01/11 08:43:12 neilc Exp $
*
*-------------------------------------------------------------------------
*/
@@ -49,19 +49,19 @@ wchareq(char *p1, char *p2)
/* Optimization: quickly compare the first byte. */
if (*p1 != *p2)
- return (0);
+ return 0;
p1_len = pg_mblen(p1);
if (pg_mblen(p2) != p1_len)
- return (0);
+ return 0;
/* They are the same length */
while (p1_len--)
{
if (*p1++ != *p2++)
- return (0);
+ return 0;
}
- return (1);
+ return 1;
}
/*--------------------
@@ -91,7 +91,7 @@ iwchareq(char *p1, char *p2)
* different characters
*/
else if ((unsigned char) *p1 < CHARMAX || (unsigned char) *p2 < CHARMAX)
- return (0);
+ return 0;
/*
* ok, p1 and p2 are both > CHARMAX, then they must be multibyte
diff --git a/src/backend/utils/adt/mac.c b/src/backend/utils/adt/mac.c
index c974b633ca..0c9bff2b8f 100644
--- a/src/backend/utils/adt/mac.c
+++ b/src/backend/utils/adt/mac.c
@@ -1,7 +1,7 @@
/*
* PostgreSQL type definitions for MAC addresses.
*
- * $PostgreSQL: pgsql/src/backend/utils/adt/mac.c,v 1.35 2005/10/15 02:49:28 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/mac.c,v 1.36 2006/01/11 08:43:12 neilc Exp $
*/
#include "postgres.h"
@@ -194,7 +194,7 @@ text_macaddr(PG_FUNCTION_ARGS)
result = DirectFunctionCall1(macaddr_in, CStringGetDatum(str));
- return (result);
+ return result;
}
/*
diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c
index e391796077..fa57567c63 100644
--- a/src/backend/utils/adt/network.c
+++ b/src/backend/utils/adt/network.c
@@ -1,7 +1,7 @@
/*
* PostgreSQL type definitions for the INET and CIDR types.
*
- * $PostgreSQL: pgsql/src/backend/utils/adt/network.c,v 1.57 2005/12/25 02:14:17 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/network.c,v 1.58 2006/01/11 08:43:12 neilc Exp $
*
* Jon Postel RIP 16 Oct 1998
*/
@@ -898,7 +898,7 @@ bitncmp(void *l, void *r, int n)
b = n / 8;
x = memcmp(l, r, b);
if (x)
- return (x);
+ return x;
lb = ((const u_char *) l)[b];
rb = ((const u_char *) r)[b];