MonetDB: Apr2019 - Not really a const pointer.

[Sjoerd Mullender]

Changeset: 36d64f2d0cf2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=36d64f2d0cf2
Modified Files:
        monetdb5/mal/mal_client.h
        sql/backends/monet5/sql_execute.c
        sql/backends/monet5/sql_scenario.c
Branch: Apr2019
Log Message:

Not really a const pointer.


diffs (65 lines):

diff --git a/monetdb5/mal/mal_client.h b/monetdb5/mal/mal_client.h
--- a/monetdb5/mal/mal_client.h
+++ b/monetdb5/mal/mal_client.h
@@ -191,8 +191,8 @@ typedef struct CLIENT {
 
        size_t blocksize;
        protocol_version protocol;
-       bool filetrans;                         /* whether the client can read 
files for us */
-       const char *query;                      /* string, identify whatever 
we're working on */
+       bool filetrans;                 /* whether the client can read files 
for us */
+       char *query;                    /* string, identify whatever we're 
working on */
 } *Client, ClientRec;
 
 mal_export void    MCinit(void);
diff --git a/sql/backends/monet5/sql_execute.c 
b/sql/backends/monet5/sql_execute.c
--- a/sql/backends/monet5/sql_execute.c
+++ b/sql/backends/monet5/sql_execute.c
@@ -760,7 +760,7 @@ SQLengineIntern(Client c, backend *be)
 
        if (oldlang == 'X') {   /* return directly from X-commands */
                sqlcleanup(be->mvc, 0);
-               q = (char *) c->query;
+               q = c->query;
                c->query = NULL;
                GDKfree(q);
                return MAL_SUCCEED;
@@ -782,7 +782,7 @@ SQLengineIntern(Client c, backend *be)
                        goto cleanup_engine;
                }
                sqlcleanup(be->mvc, 0);
-               q = (char *) c->query;
+               q = c->query;
                c->query = NULL;
                GDKfree(q);
                return MAL_SUCCEED;
@@ -830,7 +830,7 @@ cleanup_engine:
        MSresetInstructions(c->curprg->def, 1);
        freeVariables(c, c->curprg->def, NULL, be->vtop);
        be->language = oldlang;
-       q = (char *) c->query;
+       q = c->query;
        c->query = NULL;
        GDKfree(q);
        /*
diff --git a/sql/backends/monet5/sql_scenario.c 
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -1036,7 +1036,7 @@ SQLparser(Client c)
        char *q = NULL;
 
        /* clean up old stuff */
-       q = (char *) c->query;
+       q = c->query;
        c->query = NULL;
        GDKfree(q);             /* may be NULL */
 
@@ -1336,7 +1336,7 @@ SQLparser(Client c)
 finalize:
        if (msg) {
                sqlcleanup(m, 0);
-               q = (char *) c->query;
+               q = c->query;
                c->query = NULL;
                GDKfree(q);
        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list