aboutsummaryrefslogtreecommitdiff
path: root/src/backend/tcop
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>1998-06-15 19:30:31 +0000
committerBruce Momjian <bruce@momjian.us>1998-06-15 19:30:31 +0000
commit6bd323c6b3f65b26273d5efb7ddd0ac04d039546 (patch)
tree6106db4e7512e765ca8c48963fb750cb63fec96f /src/backend/tcop
parent27db9ecd0b15abca733a99dab3bf9771ad70507d (diff)
downloadpostgresql-6bd323c6b3f65b26273d5efb7ddd0ac04d039546.tar.gz
postgresql-6bd323c6b3f65b26273d5efb7ddd0ac04d039546.zip
Remove un-needed braces around single statements.
Diffstat (limited to 'src/backend/tcop')
-rw-r--r--src/backend/tcop/fastpath.c10
-rw-r--r--src/backend/tcop/postgres.c10
-rw-r--r--src/backend/tcop/utility.c8
3 files changed, 4 insertions, 24 deletions
diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c
index 7ec50debf8a..3110c9afdd4 100644
--- a/src/backend/tcop/fastpath.c
+++ b/src/backend/tcop/fastpath.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.17 1998/05/06 23:50:10 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.18 1998/06/15 19:29:26 momjian Exp $
*
* NOTES
* This cruft is the server side of PQfn.
@@ -290,9 +290,7 @@ HandleFunctionRequest()
*/
fip = &last_fp;
if (!valid_fp_info(fid, fip))
- {
update_fp_info(fid, fip);
- }
if (fip->nargs != nargs)
{
@@ -308,9 +306,7 @@ HandleFunctionRequest()
for (i = 0; i < 8; ++i)
{
if (i >= nargs)
- {
arg[i] = (char *) NULL;
- }
else
{
argsize = pq_getint(4);
@@ -328,9 +324,7 @@ HandleFunctionRequest()
if (!(p = palloc(argsize + VARHDRSZ + 1))) /* Added +1 to solve
* memory leak - Peter
* 98 Jan 6 */
- {
elog(ERROR, "HandleFunctionRequest: palloc failed");
- }
VARSIZE(p) = argsize + VARHDRSZ;
pq_getnchar(VARDATA(p), 0, argsize);
}
@@ -338,9 +332,7 @@ HandleFunctionRequest()
{ /* ... fixed */
/* XXX cross our fingers and trust "argsize" */
if (!(p = palloc(argsize + 1)))
- {
elog(ERROR, "HandleFunctionRequest: palloc failed");
- }
pq_getnchar(p, 0, argsize);
}
palloced |= (1 << i);
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index e0d8599465b..9670f326404 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.75 1998/06/09 17:13:04 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.76 1998/06/15 19:29:27 momjian Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@@ -565,9 +565,7 @@ pg_parse_and_plan(char *query_string, /* string to execute */
* function executor will crash. DZ - 30-8-1996
*/
else
- {
plan_list = lappend(plan_list, NULL);
- }
#endif
}
@@ -1177,9 +1175,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
exitpg(1);
}
else if (argc - optind == 1)
- {
DBName = argv[optind];
- }
else if ((DBName = userName) == NULL)
{
fprintf(stderr, "%s: USER undefined and no database specified\n",
@@ -1270,9 +1266,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
/* initialize */
if (!Quiet)
- {
puts("\tInitPostgres()..");
- }
InitPostgres(DBName);
@@ -1314,7 +1308,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
if (!IsUnderPostmaster)
{
puts("\nPOSTGRES backend interactive interface");
- puts("$Revision: 1.75 $ $Date: 1998/06/09 17:13:04 $");
+ puts("$Revision: 1.76 $ $Date: 1998/06/15 19:29:27 $");
}
/* ----------------
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index 83ec8c9fd1f..f34c56f4130 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.40 1998/06/15 18:39:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.41 1998/06/15 19:29:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -367,9 +367,7 @@ ProcessUtility(Node *parsetree,
stmt->definition); /* rest */
break;
case TYPE_P:
- {
DefineType(stmt->defname, stmt->definition);
- }
break;
case AGGREGATE:
DefineAggregate(stmt->defname, /* aggregate name */
@@ -479,9 +477,7 @@ ProcessUtility(Node *parsetree,
relationName = RewriteGetRuleEventRel(rulename);
aclcheck_result = pg_aclcheck(relationName, userName, ACL_RU);
if (aclcheck_result != ACLCHECK_OK)
- {
elog(ERROR, "%s: %s", relationName, aclcheck_error_strings[aclcheck_result]);
- }
#endif
RemoveRewriteRule(rulename);
}
@@ -553,9 +549,7 @@ ProcessUtility(Node *parsetree,
break;
case T_VersionStmt:
- {
elog(ERROR, "CREATE VERSION is not currently implemented");
- }
break;
case T_CreatedbStmt: