MonetDB: Jul2017 - Loose a const.

[Sjoerd Mullender]

Changeset: 3dba62ad18b6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3dba62ad18b6
Modified Files:
        sql/common/sql_string.c
        sql/common/sql_string.h
        sql/server/sql_atom.c
Branch: Jul2017
Log Message:

Loose a const.


diffs (36 lines):

diff --git a/sql/common/sql_string.c b/sql/common/sql_string.c
--- a/sql/common/sql_string.c
+++ b/sql/common/sql_string.c
@@ -93,7 +93,7 @@ strip_extra_zeros(char *s)
        return res;
 }
 
-const char *
+char *
 sql2str(char *s)
 {
        int escaped = 0;
diff --git a/sql/common/sql_string.h b/sql/common/sql_string.h
--- a/sql/common/sql_string.h
+++ b/sql/common/sql_string.h
@@ -19,7 +19,7 @@ extern char *toLower(const char *v);
 extern char *toUpper(const char *v);
 extern char *strconcat(const char *s1, const char *s2);
 extern char *strip_extra_zeros(char *v);
-extern const char *sql2str(char *s);
+extern char *sql2str(char *s);
 extern char *sql_strdup(char *s);
 extern char *sql_escape_str(char *s);
 extern const char *sql_escape_ident(const char *s);
diff --git a/sql/server/sql_atom.c b/sql/server/sql_atom.c
--- a/sql/server/sql_atom.c
+++ b/sql/server/sql_atom.c
@@ -263,7 +263,7 @@ atom_general(sql_allocator *sa, sql_subt
                a->isnull = 0;
                if (ATOMstorage(type) == TYPE_str) {
                        a->isnull = 0;
-                       a->data.val.sval = (char*)sql2str(sa_strdup(sa, val));
+                       a->data.val.sval = sql2str(sa_strdup(sa, val));
                        a->data.len = (int)strlen(a->data.val.sval);
                } else { 
                        int res = ATOMfromstr(type, &p, &a->data.len, val);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list