MonetDB: Nov2019 - Avoid some unnecessary copying.

[Sjoerd Mullender]

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

Avoid some unnecessary copying.


diffs (35 lines):

diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -1292,12 +1292,10 @@ rel_parse_value(backend *be, char *query
        o.query = m->query;
        if (m->session->status || m->errstr[0]) {
                int status = m->session->status;
-               char errstr[ERRSIZE];
-
-               strcpy(errstr, m->errstr);
+
+               memcpy(o.errstr, m->errstr, sizeof(o.errstr));
                *m = o;
                m->session->status = status;
-               strcpy(m->errstr, errstr);
        } else {
                *m = o;
        }
diff --git a/sql/server/rel_semantic.c b/sql/server/rel_semantic.c
--- a/sql/server/rel_semantic.c
+++ b/sql/server/rel_semantic.c
@@ -93,12 +93,10 @@ rel_parse(mvc *m, sql_schema *s, char *q
        o.query = m->query;
        if (m->session->status || m->errstr[0]) {
                int status = m->session->status;
-               char errstr[ERRSIZE];
 
-               strcpy(errstr, m->errstr);
+               memcpy(o.errstr, m->errstr, sizeof(o.errstr));
                *m = o;
                m->session->status = status;
-               strcpy(m->errstr, errstr);
        } else {
                int label = m->label;
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list