MonetDB: Oct2020 - Change a couple of str args to const char *.

[Sjoerd Mullender]

Changeset: 5f766e9abc50 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5f766e9abc50
Modified Files:
        clients/Tests/exports.stable.out
        monetdb5/mal/mal_session.c
        monetdb5/mal/mal_session.h
        sql/backends/monet5/sql_execute.c
        sql/backends/monet5/sql_execute.h
Branch: Oct2020
Log Message:

Change a couple of str args to const char *.


diffs (65 lines):

diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -876,7 +876,7 @@ str MCsuspendClient(int id);
 int MCvalid(Client c);
 void MPresetProfiler(stream *fdout);
 char *MSP_locate_sqlscript(const char *mod_name, bit recurse);
-str MSinitClientPrg(Client cntxt, str mod, str nme);
+str MSinitClientPrg(Client cntxt, const char *mod, const char *nme);
 void MSresetInstructions(MalBlkPtr mb, int start);
 void MSresetVariables(Client cntxt, MalBlkPtr mb, MalStkPtr glb, int start);
 void MSscheduleClient(str command, str challenge, bstream *fin, stream *fout, 
protocol_version protocol, size_t blocksize);
diff --git a/monetdb5/mal/mal_session.c b/monetdb5/mal/mal_session.c
--- a/monetdb5/mal/mal_session.c
+++ b/monetdb5/mal/mal_session.c
@@ -119,7 +119,7 @@ MSresetClientPrg(Client cntxt, str mod, 
  */
 
 str
-MSinitClientPrg(Client cntxt, str mod, str nme)
+MSinitClientPrg(Client cntxt, const char *mod, const char *nme)
 {
        int idx;
 
diff --git a/monetdb5/mal/mal_session.h b/monetdb5/mal/mal_session.h
--- a/monetdb5/mal/mal_session.h
+++ b/monetdb5/mal/mal_session.h
@@ -13,7 +13,7 @@
 
 mal_export str malBootstrap(char *modules[], int embedded);
 mal_export str MSserveClient(Client cntxt);
-mal_export str MSinitClientPrg(Client cntxt, str mod, str nme);
+mal_export str MSinitClientPrg(Client cntxt, const char *mod, const char *nme);
 mal_export void MSscheduleClient(str command, str challenge, bstream *fin, 
stream *fout, protocol_version protocol, size_t blocksize);
 
 mal_export str MALreader(Client c);
@@ -27,4 +27,3 @@ mal_export void MSresetVariables(Client 
 mal_export int MALcommentsOnly(MalBlkPtr mb);
 
 #endif /*  _MAL_SESSION_H */
-
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
@@ -311,7 +311,7 @@ SQLescapeString(str s)
 }
 
 str
-SQLstatementIntern(Client c, const char *expr, str nme, bit execute, bit 
output, res_table **result)
+SQLstatementIntern(Client c, const char *expr, const char *nme, bit execute, 
bit output, res_table **result)
 {
        int status = 0, err = 0, oldvtop, oldstop = 1, inited = 0, ac, 
sizeframes, topframes;
        unsigned int label;
diff --git a/sql/backends/monet5/sql_execute.h 
b/sql/backends/monet5/sql_execute.h
--- a/sql/backends/monet5/sql_execute.h
+++ b/sql/backends/monet5/sql_execute.h
@@ -10,7 +10,7 @@
 #define _SQL_EXECUTE_H_
 #include "sql.h"
 
-sql5_export str SQLstatementIntern(Client c, const char *expr, str nme, bit 
execute, bit output, res_table **result);
+sql5_export str SQLstatementIntern(Client c, const char *expr, const char 
*nme, bit execute, bit output, res_table **result);
 sql5_export str SQLengineIntern(Client c, backend *be);
 sql5_export str RAstatement(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 sql5_export str RAstatement2(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list