aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/utils')
-rw-r--r--src/backend/utils/adt/inet_cidr_ntop.c18
-rw-r--r--src/backend/utils/adt/inet_net_pton.c44
-rw-r--r--src/backend/utils/adt/tsgistidx.c4
-rw-r--r--src/backend/utils/mb/Unicode/convutils.pm2
-rw-r--r--src/backend/utils/mb/conversion_procs/euc_tw_and_big5/big5.c4
5 files changed, 36 insertions, 36 deletions
diff --git a/src/backend/utils/adt/inet_cidr_ntop.c b/src/backend/utils/adt/inet_cidr_ntop.c
index 2973d566587..30b3673789f 100644
--- a/src/backend/utils/adt/inet_cidr_ntop.c
+++ b/src/backend/utils/adt/inet_cidr_ntop.c
@@ -58,12 +58,12 @@ inet_cidr_ntop(int af, const void *src, int bits, char *dst, size_t size)
switch (af)
{
case PGSQL_AF_INET:
- return (inet_cidr_ntop_ipv4(src, bits, dst, size));
+ return inet_cidr_ntop_ipv4(src, bits, dst, size);
case PGSQL_AF_INET6:
- return (inet_cidr_ntop_ipv6(src, bits, dst, size));
+ return inet_cidr_ntop_ipv6(src, bits, dst, size);
default:
errno = EAFNOSUPPORT;
- return (NULL);
+ return NULL;
}
}
@@ -92,7 +92,7 @@ inet_cidr_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size)
if (bits < 0 || bits > 32)
{
errno = EINVAL;
- return (NULL);
+ return NULL;
}
if (bits == 0)
@@ -137,11 +137,11 @@ inet_cidr_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size)
if (size <= sizeof "/32")
goto emsgsize;
dst += SPRINTF((dst, "/%u", bits));
- return (odst);
+ return odst;
emsgsize:
errno = EMSGSIZE;
- return (NULL);
+ return NULL;
}
/*
@@ -182,7 +182,7 @@ inet_cidr_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size)
if (bits < 0 || bits > 128)
{
errno = EINVAL;
- return (NULL);
+ return NULL;
}
cp = outbuf;
@@ -286,9 +286,9 @@ inet_cidr_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size)
goto emsgsize;
strcpy(dst, outbuf);
- return (dst);
+ return dst;
emsgsize:
errno = EMSGSIZE;
- return (NULL);
+ return NULL;
}
diff --git a/src/backend/utils/adt/inet_net_pton.c b/src/backend/utils/adt/inet_net_pton.c
index be788d37cd0..6f3ece1209c 100644
--- a/src/backend/utils/adt/inet_net_pton.c
+++ b/src/backend/utils/adt/inet_net_pton.c
@@ -73,7 +73,7 @@ inet_net_pton(int af, const char *src, void *dst, size_t size)
inet_cidr_pton_ipv6(src, dst, size);
default:
errno = EAFNOSUPPORT;
- return (-1);
+ return -1;
}
}
@@ -228,15 +228,15 @@ inet_cidr_pton_ipv4(const char *src, u_char *dst, size_t size)
goto emsgsize;
*dst++ = '\0';
}
- return (bits);
+ return bits;
enoent:
errno = ENOENT;
- return (-1);
+ return -1;
emsgsize:
errno = EMSGSIZE;
- return (-1);
+ return -1;
}
/*
@@ -338,11 +338,11 @@ inet_net_pton_ipv4(const char *src, u_char *dst)
enoent:
errno = ENOENT;
- return (-1);
+ return -1;
emsgsize:
errno = EMSGSIZE;
- return (-1);
+ return -1;
}
static int
@@ -363,19 +363,19 @@ getbits(const char *src, int *bitsp)
if (pch != NULL)
{
if (n++ != 0 && val == 0) /* no leading zeros */
- return (0);
+ return 0;
val *= 10;
val += (pch - digits);
if (val > 128) /* range */
- return (0);
+ return 0;
continue;
}
- return (0);
+ return 0;
}
if (n == 0)
- return (0);
+ return 0;
*bitsp = val;
- return (1);
+ return 1;
}
static int
@@ -397,32 +397,32 @@ getv4(const char *src, u_char *dst, int *bitsp)
if (pch != NULL)
{
if (n++ != 0 && val == 0) /* no leading zeros */
- return (0);
+ return 0;
val *= 10;
val += (pch - digits);
if (val > 255) /* range */
- return (0);
+ return 0;
continue;
}
if (ch == '.' || ch == '/')
{
if (dst - odst > 3) /* too many octets? */
- return (0);
+ return 0;
*dst++ = val;
if (ch == '/')
- return (getbits(src, bitsp));
+ return getbits(src, bitsp);
val = 0;
n = 0;
continue;
}
- return (0);
+ return 0;
}
if (n == 0)
- return (0);
+ return 0;
if (dst - odst > 3) /* too many octets? */
- return (0);
+ return 0;
*dst++ = val;
- return (1);
+ return 1;
}
static int
@@ -552,13 +552,13 @@ inet_cidr_pton_ipv6(const char *src, u_char *dst, size_t size)
*/
memcpy(dst, tmp, NS_IN6ADDRSZ);
- return (bits);
+ return bits;
enoent:
errno = ENOENT;
- return (-1);
+ return -1;
emsgsize:
errno = EMSGSIZE;
- return (-1);
+ return -1;
}
diff --git a/src/backend/utils/adt/tsgistidx.c b/src/backend/utils/adt/tsgistidx.c
index 7ce2699b5c2..d8b86f63931 100644
--- a/src/backend/utils/adt/tsgistidx.c
+++ b/src/backend/utils/adt/tsgistidx.c
@@ -317,14 +317,14 @@ checkcondition_arr(void *checkval, QueryOperand *val, ExecPhraseData *data)
{
StopMiddle = StopLow + (StopHigh - StopLow) / 2;
if (*StopMiddle == val->valcrc)
- return (true);
+ return true;
else if (*StopMiddle < val->valcrc)
StopLow = StopMiddle + 1;
else
StopHigh = StopMiddle;
}
- return (false);
+ return false;
}
static bool
diff --git a/src/backend/utils/mb/Unicode/convutils.pm b/src/backend/utils/mb/Unicode/convutils.pm
index 43cadf5303b..22d02ca485f 100644
--- a/src/backend/utils/mb/Unicode/convutils.pm
+++ b/src/backend/utils/mb/Unicode/convutils.pm
@@ -812,7 +812,7 @@ sub ucs2utf
(((($ucs & 0x3ffff) >> 12) | 0x80) << 16) |
(((($ucs & 0x0fc0) >> 6) | 0x80) << 8) | (($ucs & 0x003f) | 0x80);
}
- return ($utf);
+ return $utf;
}
1;
diff --git a/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/big5.c b/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/big5.c
index 1d9b10f8a7a..68f76aa8cb8 100644
--- a/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/big5.c
+++ b/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/big5.c
@@ -361,14 +361,14 @@ CNStoBIG5(unsigned short cns, unsigned char lc)
for (i = 0; i < sizeof(b2c3) / (sizeof(unsigned short) * 2); i++)
{
if (b2c3[i][1] == cns)
- return (b2c3[i][0]);
+ return b2c3[i][0];
}
break;
case LC_CNS11643_4:
for (i = 0; i < sizeof(b1c4) / (sizeof(unsigned short) * 2); i++)
{
if (b1c4[i][1] == cns)
- return (b1c4[i][0]);
+ return b1c4[i][0];
}
default:
break;
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-16 08:05:59 +0000