database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-28 11:44:57 +03:00
Code Activity

Remove unnecessary parentheses in return statements

Browse Source 
The parenthesized style has only been used in a few modules.  Change
that to use the style that is predominant across the whole tree.

Reviewed-by: Michael Paquier <michael.paquier@gmail.com>
Reviewed-by: Ryan Murphy <ryanfmurphy@gmail.com>
This commit is contained in:
Peter Eisentraut
2017-08-17 12:39:20 -04:00
parent ba26f5cf76
commit 17273d059c
99 changed files with 469 additions and 469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/backend/bootstrap/bootscanner.l
View File

@@ -72,25 +72,25 @@ arrayid [A-Za-z0-9_]+\[{D}*\]
%%
open { return(OPEN); }
open { return OPEN; }
close { return(XCLOSE); }
close { return XCLOSE; }
create { return(XCREATE); }
create { return XCREATE; }
OID { return(OBJ_ID); }
bootstrap { return(XBOOTSTRAP); }
"shared_relation" { return(XSHARED_RELATION); }
"without_oids" { return(XWITHOUT_OIDS); }
"rowtype_oid" { return(XROWTYPE_OID); }
_null_ { return(NULLVAL); }
OID { return OBJ_ID; }
bootstrap { return XBOOTSTRAP; }
"shared_relation" { return XSHARED_RELATION; }
"without_oids" { return XWITHOUT_OIDS; }
"rowtype_oid" { return XROWTYPE_OID; }
_null_ { return NULLVAL; }
insert { return(INSERT_TUPLE); }
insert { return INSERT_TUPLE; }
"," { return(COMMA); }
"=" { return(EQUALS); }
"(" { return(LPAREN); }
")" { return(RPAREN); }
"," { return COMMA; }
"=" { return EQUALS; }
"(" { return LPAREN; }
")" { return RPAREN; }
[\n] { yyline++; }
[\t] ;
@@ -99,31 +99,31 @@ insert { return(INSERT_TUPLE); }
^\#[^\n]* ; /* drop everything after "#" for comments */
"declare" { return(XDECLARE); }
"build" { return(XBUILD); }
"indices" { return(INDICES); }
"unique" { return(UNIQUE); }
"index" { return(INDEX); }
"on" { return(ON); }
"using" { return(USING); }
"toast" { return(XTOAST); }
"FORCE" { return(XFORCE); }
"NOT" { return(XNOT); }
"NULL" { return(XNULL); }
"declare" { return XDECLARE; }
"build" { return XBUILD; }
"indices" { return INDICES; }
"unique" { return UNIQUE; }
"index" { return INDEX; }
"on" { return ON; }
"using" { return USING; }
"toast" { return XTOAST; }
"FORCE" { return XFORCE; }
"NOT" { return XNOT; }
"NULL" { return XNULL; }
{arrayid} {
yylval.str = MapArrayTypeName(yytext);
return(ID);
return ID;
}
{id} {
yylval.str = scanstr(yytext);
return(ID);
return ID;
}
{sid} {
yytext[strlen(yytext)-1] = '\0'; /* strip off quotes */
yylval.str = scanstr(yytext+1);
yytext[strlen(yytext)] = '"'; /* restore quotes */
return(ID);
return ID;
}
. {

10
src/backend/tsearch/spell.c
View File

@@ -195,14 +195,14 @@ static char *VoidString = "";
static int
cmpspell(const void *s1, const void *s2)
{
return (strcmp((*(SPELL *const *) s1)->word, (*(SPELL *const *) s2)->word));
return strcmp((*(SPELL *const *) s1)->word, (*(SPELL *const *) s2)->word);
}
static int
cmpspellaffix(const void *s1, const void *s2)
{
return (strcmp((*(SPELL *const *) s1)->p.flag,
(*(SPELL *const *) s2)->p.flag));
return strcmp((*(SPELL *const *) s1)->p.flag,
(*(SPELL *const *) s2)->p.flag);
}
static int
@@ -2240,9 +2240,9 @@ NormalizeSubWord(IspellDict *Conf, char *word, int flag)
if (cur == forms)
{
pfree(forms);
return (NULL);
return NULL;
}
return (forms);
return forms;
}
typedef struct SplitVar

18
src/backend/utils/adt/inet_cidr_ntop.c
View File

@@ -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;
}

44
src/backend/utils/adt/inet_net_pton.c
View File

@@ -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;
}

4
src/backend/utils/adt/tsgistidx.c
View File

@@ -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

2
src/backend/utils/mb/Unicode/convutils.pm
View File

@@ -812,7 +812,7 @@ sub ucs2utf
(((($ucs & 0x3ffff) >> 12) | 0x80) << 16) |
(((($ucs & 0x0fc0) >> 6) | 0x80) << 8) | (($ucs & 0x003f) | 0x80);
}
return ($utf);
return $utf;
}
1;

4
src/backend/utils/mb/conversion_procs/euc_tw_and_big5/big5.c
View File

@@ -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;