mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace now unnecessary goto statements by using return directly.

Browse Source
This commit is contained in:
Magnus Hagander 2008-10-24 12:48:31 +00:00
parent bb8c822dbf
commit 3ca5aa6cbc
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/backend/libpq/hba.c
View File

@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.169 2008/10/23 13:31:10 mha Exp $ * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.170 2008/10/24 12:48:31 mha Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -581,7 +581,7 @@ check_db(const char *dbname, const char *role, char *param_str)
optname, validmethods), \ optname, validmethods), \
errcontext("line %d of configuration file \"%s\"", \ errcontext("line %d of configuration file \"%s\"", \
line_num, HbaFileName))); \ line_num, HbaFileName))); \
goto hba_other_error; \ return false; \
} while (0); } while (0);
#define REQUIRE_AUTH_OPTION(methodval, optname, validmethods) do {\ #define REQUIRE_AUTH_OPTION(methodval, optname, validmethods) do {\
@ -597,7 +597,7 @@ check_db(const char *dbname, const char *role, char *param_str)
authname, argname), \ authname, argname), \
errcontext("line %d of configuration file \"%s\"", \ errcontext("line %d of configuration file \"%s\"", \
line_num, HbaFileName))); \ line_num, HbaFileName))); \
goto hba_other_error; \ return false; \
} \ } \
} while (0); } while (0);
@ -704,7 +704,7 @@ parse_hba_line(List *line, int line_num, HbaLine *parsedline)
*cidr_slash = '/'; *cidr_slash = '/';
if (gai_result) if (gai_result)
pg_freeaddrinfo_all(hints.ai_family, gai_result); pg_freeaddrinfo_all(hints.ai_family, gai_result);
goto hba_other_error; return false;
} }
if (cidr_slash) if (cidr_slash)
@ -739,7 +739,7 @@ parse_hba_line(List *line, int line_num, HbaLine *parsedline)
line_num, HbaFileName))); line_num, HbaFileName)));
if (gai_result) if (gai_result)
pg_freeaddrinfo_all(hints.ai_family, gai_result); pg_freeaddrinfo_all(hints.ai_family, gai_result);
goto hba_other_error; return false;
} }
memcpy(&parsedline->mask, gai_result->ai_addr, gai_result->ai_addrlen); memcpy(&parsedline->mask, gai_result->ai_addr, gai_result->ai_addrlen);
@ -751,7 +751,7 @@ parse_hba_line(List *line, int line_num, HbaLine *parsedline)
(errcode(ERRCODE_CONFIG_FILE_ERROR), (errcode(ERRCODE_CONFIG_FILE_ERROR),
errmsg("IP address and mask do not match in file \"%s\" line %d", errmsg("IP address and mask do not match in file \"%s\" line %d",
HbaFileName, line_num))); HbaFileName, line_num)));
goto hba_other_error; return false;
} }
} }
} /* != ctLocal */ } /* != ctLocal */
@ -813,7 +813,7 @@ parse_hba_line(List *line, int line_num, HbaLine *parsedline)
token), token),
errcontext("line %d of configuration file \"%s\"", errcontext("line %d of configuration file \"%s\"",
line_num, HbaFileName))); line_num, HbaFileName)));
goto hba_other_error; return false;
} }
if (unsupauth) if (unsupauth)
@ -824,7 +824,7 @@ parse_hba_line(List *line, int line_num, HbaLine *parsedline)
token), token),
errcontext("line %d of configuration file \"%s\"", errcontext("line %d of configuration file \"%s\"",
line_num, HbaFileName))); line_num, HbaFileName)));
goto hba_other_error; return false;
} }
/* Invalid authentication combinations */ /* Invalid authentication combinations */
@ -836,7 +836,7 @@ parse_hba_line(List *line, int line_num, HbaLine *parsedline)
errmsg("krb5 authentication is not supported on local sockets"), errmsg("krb5 authentication is not supported on local sockets"),
errcontext("line %d of configuration file \"%s\"", errcontext("line %d of configuration file \"%s\"",
line_num, HbaFileName))); line_num, HbaFileName)));
goto hba_other_error; return false;
} }
/* Parse remaining arguments */ /* Parse remaining arguments */
@ -859,7 +859,7 @@ parse_hba_line(List *line, int line_num, HbaLine *parsedline)
errmsg("authentication option not in name=value format: %s", token), errmsg("authentication option not in name=value format: %s", token),
errcontext("line %d of configuration file \"%s\"", errcontext("line %d of configuration file \"%s\"",
line_num, HbaFileName))); line_num, HbaFileName)));
goto hba_other_error; return false;
} }
else else
{ {
@ -902,7 +902,7 @@ parse_hba_line(List *line, int line_num, HbaLine *parsedline)
errmsg("invalid ldap port '%s'", c), errmsg("invalid ldap port '%s'", c),
errcontext("line %d of configuration file \"%s\"", errcontext("line %d of configuration file \"%s\"",
line_num, HbaFileName))); line_num, HbaFileName)));
goto hba_other_error; return false;
} }
} }
else if (strcmp(token, "ldapprefix") == 0) else if (strcmp(token, "ldapprefix") == 0)
@ -922,7 +922,7 @@ parse_hba_line(List *line, int line_num, HbaLine *parsedline)
errmsg("unknown authentication option name '%s'", token), errmsg("unknown authentication option name '%s'", token),
errcontext("line %d of configuration file \"%s\"", errcontext("line %d of configuration file \"%s\"",
line_num, HbaFileName))); line_num, HbaFileName)));
goto hba_other_error; return false;
} }
} }
} }
@ -953,8 +953,6 @@ hba_syntax:
errcontext("line %d of configuration file \"%s\"", errcontext("line %d of configuration file \"%s\"",
line_num, HbaFileName))); line_num, HbaFileName)));
/* Come here if suitable message already logged */
hba_other_error:
return false; return false;
} }