MonetDB: default - Use const for a couple of externally visible ...

[Sjoerd Mullender via checkin-list]

Changeset: 5f7607485394 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5f7607485394
Modified Files:
        clients/Tests/exports.stable.out
        monetdb5/modules/mal/querylog.c
        monetdb5/modules/mal/querylog.h
        monetdb5/modules/mal/remote.c
        monetdb5/modules/mal/remote.h
        tools/monetdbe/monetdbe.c
Branch: default
Log Message:

Use const for a couple of externally visible MAL implementation functions.


diffs (74 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
@@ -800,9 +800,9 @@ str QLOGcatalog(BAT **r);
 str QLOGdisable(void *ret);
 str QLOGempty(void *ret);
 str QLOGenable(void *ret);
-str QLOGenableThreshold(void *ret, int *threshold);
+str QLOGenableThreshold(void *ret, const int *threshold);
 int QLOGisset(void);
-str RMTdisconnect(void *ret, str *conn);
+str RMTdisconnect(void *ret, const char *const *conn);
 BUN SQLload_file(Client cntxt, Tablet *as, bstream *b, stream *out, const char 
*csep, const char *rsep, char quote, lng skip, lng maxrow, int best, bool 
from_stdin, const char *tabnam, bool escape);
 str TABLETcollect(BAT **bats, Tablet *as);
 str TABLETcreate_bats(Tablet *as, BUN est);
diff --git a/monetdb5/modules/mal/querylog.c b/monetdb5/modules/mal/querylog.c
--- a/monetdb5/modules/mal/querylog.c
+++ b/monetdb5/modules/mal/querylog.c
@@ -293,7 +293,7 @@ QLOGenable(void *ret)
 }
 
 str
-QLOGenableThreshold(void *ret, int *threshold)
+QLOGenableThreshold(void *ret, const int *threshold)
 {
        (void) ret;
        QLOGtrace = true;
diff --git a/monetdb5/modules/mal/querylog.h b/monetdb5/modules/mal/querylog.h
--- a/monetdb5/modules/mal/querylog.h
+++ b/monetdb5/modules/mal/querylog.h
@@ -18,7 +18,7 @@
 mal_export str QLOGcatalog(BAT **r);
 mal_export str QLOGcalls(BAT **r);
 mal_export str QLOGenable(void *ret);
-mal_export str QLOGenableThreshold(void *ret, int *threshold);
+mal_export str QLOGenableThreshold(void *ret, const int *threshold);
 mal_export str QLOGdisable(void *ret);
 mal_export int QLOGisset(void);
 mal_export str QLOGempty(void *ret);
diff --git a/monetdb5/modules/mal/remote.c b/monetdb5/modules/mal/remote.c
--- a/monetdb5/modules/mal/remote.c
+++ b/monetdb5/modules/mal/remote.c
@@ -345,7 +345,7 @@ RMTconnect(Client cntxt, MalBlkPtr mb, M
  * created).
  */
 str
-RMTdisconnect(void *ret, str *conn)
+RMTdisconnect(void *ret, const char *const *conn)
 {
        connection c, t;
 
diff --git a/monetdb5/modules/mal/remote.h b/monetdb5/modules/mal/remote.h
--- a/monetdb5/modules/mal/remote.h
+++ b/monetdb5/modules/mal/remote.h
@@ -29,6 +29,6 @@ typedef struct {
                                size_t nrcolumns);
 } columnar_result_callback;
 
-mal_export str RMTdisconnect(void *ret, str *conn);
+mal_export str RMTdisconnect(void *ret, const char *const *conn);
 
 #endif /* _REMOTE_DEF */
diff --git a/tools/monetdbe/monetdbe.c b/tools/monetdbe/monetdbe.c
--- a/tools/monetdbe/monetdbe.c
+++ b/tools/monetdbe/monetdbe.c
@@ -461,7 +461,7 @@ monetdbe_close_remote(monetdbe_database_
                clear_error(mdbe);
        }
 
-       if ( (mdbe->msg = RMTdisconnect(NULL, &(mdbe->mid))) != MAL_SUCCEED) {
+       if ( (mdbe->msg = RMTdisconnect(NULL, &(const char *){mdbe->mid})) != 
MAL_SUCCEED) {
                err = 1;
                clear_error(mdbe);
        }
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org