Changeset: 4247cd4bc7b8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/4247cd4bc7b8
Modified Files:
clients/Tests/exports.stable.out
monetdb5/mal/mal.c
monetdb5/mal/mal.h
monetdb5/mal/mal_prelude.c
monetdb5/mal/mal_prelude.h
monetdb5/mal/mal_session.c
monetdb5/mal/mal_session.h
Branch: default
Log Message:
VS doesn't do const char *modules[const], but it does do const char *const
*modules.
The two are equivalent when used as function arguments.
diffs (99 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
@@ -1052,20 +1052,20 @@ const char lookupRef[];
const char mainRef[];
str mal2str(MalBlkPtr mb, int first, int last);
int malAtomSize(int size, const char *name);
-str malBootstrap(const char *modules[const], bool embedded, const char
*initpasswd);
+str malBootstrap(const char *const *modules, bool embedded, const char
*initpasswd);
str malEmbeddedBoot(int workerlimit, int memorylimit, int querytimeout, int
sessionlimit, bool with_mapi_server);
void malEmbeddedReset(void);
_Noreturn void malEmbeddedStop(int status);
str malExtraModulesBoot(Client c, str extraMalModules[], char *mal_scripts);
str malInclude(Client c, const char *name, int listing);
-str malIncludeModules(Client c, const char *modules[const], int listing, bool
embedded, const char *initpasswd);
+str malIncludeModules(Client c, const char *const *modules, int listing, bool
embedded, const char *initpasswd);
str malIncludeString(Client c, const char *name, str mal, int listing, MALfcn
address);
const char malRef[];
void mal_atom_reset(void);
ClientRec *mal_clients;
MT_Lock mal_contextLock;
_Noreturn void mal_exit(int status);
-int mal_init(const char *modules[const], bool embedded, const char
*initpasswd, const char *caller_revision);
+int mal_init(const char *const *modules, bool embedded, const char
*initpasswd, const char *caller_revision);
void mal_instruction_reset(void);
void mal_module(const char *name, mel_atom *atoms, mel_func *funcs);
void mal_module2(const char *name, mel_atom *atoms, mel_func *funcs, mel_init
initfunc, const char *code);
diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c
--- a/monetdb5/mal/mal.c
+++ b/monetdb5/mal/mal.c
@@ -53,7 +53,7 @@ mal_version(void)
*/
int
-mal_init(const char *modules[const], bool embedded, const char *initpasswd,
+mal_init(const char *const *modules, bool embedded, const char *initpasswd,
const char *caller_revision)
{
/* Any error encountered here terminates the process
diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -68,7 +68,7 @@ mal_export char monet_cwd[FILENAME_MAX];
mal_export MT_Lock mal_contextLock;
-mal_export int mal_init(const char *modules[const], bool embedded,
+mal_export int mal_init(const char *const *modules, bool embedded,
const char *initpasswd, const
char *caller_revision);
mal_export _Noreturn void mal_exit(int status);
mal_export void mal_reset(void);
diff --git a/monetdb5/mal/mal_prelude.c b/monetdb5/mal/mal_prelude.c
--- a/monetdb5/mal/mal_prelude.c
+++ b/monetdb5/mal/mal_prelude.c
@@ -434,7 +434,7 @@ malPrelude(Client c, int listing, int *s
}
str
-malIncludeModules(Client c, const char *modules[const], int listing,
+malIncludeModules(Client c, const char *const *modules, int listing,
bool no_mapi_server, const char *initpasswd)
{
str msg;
diff --git a/monetdb5/mal/mal_prelude.h b/monetdb5/mal/mal_prelude.h
--- a/monetdb5/mal/mal_prelude.h
+++ b/monetdb5/mal/mal_prelude.h
@@ -24,7 +24,7 @@ mal_export void mal_module2(const char *
mel_func * funcs,
mel_init initfunc,
const char *code);
-mal_export str malIncludeModules(Client c, const char *modules[const],
+mal_export str malIncludeModules(Client c, const char *const *modules,
int listing,
bool embedded,
const char
*initpasswd);
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
@@ -31,7 +31,7 @@
* The startup script is run as user Admin.
*/
str
-malBootstrap(const char *modules[const], bool embedded, const char *initpasswd)
+malBootstrap(const char *const *modules, bool embedded, const char *initpasswd)
{
Client c;
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
@@ -14,7 +14,7 @@
#include "mal_client.h"
#include "mal_resolve.h"
-mal_export str malBootstrap(const char *modules[const], bool embedded,
+mal_export str malBootstrap(const char *const *modules, bool embedded,
const char *initpasswd);
mal_export str MSinitClientPrg(Client cntxt, const char *mod, const char *nme);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
