MonetDB: Nov2019 - Simplify

[Pedro Ferreira]

Changeset: 7cfcf6592f17 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7cfcf6592f17
Modified Files:
        sql/backends/monet5/sql.c
Branch: Nov2019
Log Message:

Simplify


diffs (52 lines):

diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -222,7 +222,6 @@ SQLmvc(Client cntxt, MalBlkPtr mb, MalSt
        return MAL_SUCCEED;
 }
 
-
 str
 SQLcommit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
 {
@@ -620,7 +619,6 @@ setVariable(Client cntxt, MalBlkPtr mb, 
        const char *varname = *getArgReference_str(stk, pci, 2);
        int mtype = getArgType(mb, pci, 3);
        ValRecord *src;
-       char buf[BUFSIZ];
 
        if ((msg = getSQLContext(cntxt, mb, &m, NULL)) != NULL)
                return msg;
@@ -633,6 +631,7 @@ setVariable(Client cntxt, MalBlkPtr mb, 
        if (strcmp("optimizer", varname) == 0) {
                const char *newopt = *getArgReference_str(stk, pci, 3);
                if (newopt) {
+                       char buf[BUFSIZ];
                        if (!isOptimizerPipe(newopt) && strchr(newopt, (int) 
';') == 0) {
                                throw(SQL, "sql.setVariable", SQLSTATE(42100) 
"optimizer '%s' unknown", newopt);
                        }
@@ -664,8 +663,7 @@ setVariable(Client cntxt, MalBlkPtr mb, 
                if(!stack_set_var(m, varname, src))
                        throw(SQL, "sql.setVariable", SQLSTATE(HY001) 
MAL_MALLOC_FAIL);
        } else {
-               snprintf(buf, BUFSIZ, "variable '%s' unknown", varname);
-               throw(SQL, "sql.setVariable", SQLSTATE(42100) "%s", buf);
+               throw(SQL, "sql.setVariable", SQLSTATE(42100) "variable '%s' 
unknown", varname);
        }
        return MAL_SUCCEED;
 }
@@ -687,12 +685,8 @@ getVariable(Client cntxt, MalBlkPtr mb, 
                return msg;
        if (mtype < 0 || mtype >= 255)
                throw(SQL, "sql.getVariable", SQLSTATE(42100) "Variable type 
error");
-       a = stack_get_var(m, varname);
-       if (!a) {
-               char buf[BUFSIZ];
-               snprintf(buf, BUFSIZ, "variable '%s' unknown", varname);
-               throw(SQL, "sql.getVariable", SQLSTATE(42100) "%s", buf);
-       }
+       if (!(a = stack_get_var(m, varname)))
+               throw(SQL, "sql.getVariable", SQLSTATE(42100) "variable '%s' 
unknown", varname);
        src = &a->data;
        dst = &stk->stk[getArg(pci, 0)];
        if (VALcopy(dst, src) == NULL)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list