Changeset: d33607067a2c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d33607067a2c
Modified Files:
clients/Tests/exports.stable.out
ctest/monetdb5/mal/test_malEmbeddedBoot.c
ctest/monetdb5/mal/test_malInclude.c
monetdb5/mal/mal.c
monetdb5/mal/mal.h
monetdb5/mal/mal_embedded.c
monetdb5/mal/mal_embedded.h
monetdb5/mal/mal_prelude.c
monetdb5/mal/mal_prelude.h
monetdb5/mal/mal_session.c
monetdb5/mal/mal_session.h
tools/mserver/mserver5.c
tools/mserver/shutdowntest.c
Branch: default
Log Message:
Use bool.
diffs (172 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
@@ -1088,14 +1088,14 @@ const char *lockRef;
const char *lookupRef;
str mal2str(MalBlkPtr mb, int first, int last);
int malAtomSize(int size, const char *name);
-str malBootstrap(char *modules[], int embedded);
+str malBootstrap(char *modules[], bool embedded);
str malCommandCall(MalStkPtr stk, InstrPtr pci);
-str malEmbeddedBoot(int workerlimit, int memorylimit, int querytimeout, int
sessionlimit, int with_mapi_server);
+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, char *modules[], int listing, int embedded);
+str malIncludeModules(Client c, char *modules[], int listing, bool embedded);
str malIncludeString(Client c, const char *name, str mal, int listing, MALfcn
address);
int malLibraryEnabled(const char *name);
char *malLibraryHowToEnable(const char *name);
@@ -1107,7 +1107,7 @@ MT_Lock mal_contextLock;
MT_Lock mal_copyLock;
MT_Lock mal_delayLock;
_Noreturn void mal_exit(int status);
-int mal_init(char *modules[], int embedded);
+int mal_init(char *modules[], bool embedded);
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/ctest/monetdb5/mal/test_malEmbeddedBoot.c
b/ctest/monetdb5/mal/test_malEmbeddedBoot.c
--- a/ctest/monetdb5/mal/test_malEmbeddedBoot.c
+++ b/ctest/monetdb5/mal/test_malEmbeddedBoot.c
@@ -21,7 +21,7 @@ main(void)
msg = createException(MAL, "embedded.monetdb_startup",
"GDKinit() failed");
return 1;
}
- if ((msg = malEmbeddedBoot(0, 0, 0, 0, 0)) != MAL_SUCCEED)
+ if ((msg = malEmbeddedBoot(0, 0, 0, 0, false)) != MAL_SUCCEED)
return 1;
return 0;
}
diff --git a/ctest/monetdb5/mal/test_malInclude.c
b/ctest/monetdb5/mal/test_malInclude.c
--- a/ctest/monetdb5/mal/test_malInclude.c
+++ b/ctest/monetdb5/mal/test_malInclude.c
@@ -25,6 +25,6 @@ main(void)
char *modules[2];
modules[0] = "sql";
modules[1] = 0;
- mal_init(modules, 1);
+ mal_init(modules, true);
return 0;
}
diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c
--- a/monetdb5/mal/mal.c
+++ b/monetdb5/mal/mal.c
@@ -51,7 +51,7 @@ mal_version(void)
*/
int
-mal_init(char *modules[], int embedded)
+mal_init(char *modules[], bool embedded)
{
/* Any error encountered here terminates the process
* with a message sent to stderr
diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -72,7 +72,7 @@ mal_export MT_Lock mal_profileLock ;
mal_export MT_Lock mal_copyLock ;
mal_export MT_Lock mal_delayLock ;
-mal_export int mal_init(char *modules[], int embedded);
+mal_export int mal_init(char *modules[], bool embedded);
mal_export _Noreturn void mal_exit(int status);
mal_export void mal_reset(void);
mal_export const char *mal_version(void);
diff --git a/monetdb5/mal/mal_embedded.c b/monetdb5/mal/mal_embedded.c
--- a/monetdb5/mal/mal_embedded.c
+++ b/monetdb5/mal/mal_embedded.c
@@ -41,7 +41,7 @@
static bool embeddedinitialized = false;
str
-malEmbeddedBoot(int workerlimit, int memorylimit, int querytimeout, int
sessiontimeout, int with_mapi_server)
+malEmbeddedBoot(int workerlimit, int memorylimit, int querytimeout, int
sessiontimeout, bool with_mapi_server)
{
Client c;
str msg = MAL_SUCCEED;
diff --git a/monetdb5/mal/mal_embedded.h b/monetdb5/mal/mal_embedded.h
--- a/monetdb5/mal/mal_embedded.h
+++ b/monetdb5/mal/mal_embedded.h
@@ -16,7 +16,7 @@
#define MAXMODULES 128
-mal_export str malEmbeddedBoot(int workerlimit, int memorylimit, int
querytimeout, int sessionlimit, int with_mapi_server);
+mal_export str malEmbeddedBoot(int workerlimit, int memorylimit, int
querytimeout, int sessionlimit, bool with_mapi_server);
mal_export str malExtraModulesBoot(Client c, str extraMalModules[], char*
mal_scripts);
mal_export void malEmbeddedReset(void);
mal_export _Noreturn void malEmbeddedStop(int status);
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
@@ -472,7 +472,7 @@ malPrelude(Client c, int listing, int *s
}
str
-malIncludeModules(Client c, char *modules[], int listing, int no_mapi_server)
+malIncludeModules(Client c, char *modules[], int listing, bool no_mapi_server)
{
str msg;
int sql = -1, mapi = -1;
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
@@ -19,6 +19,6 @@ mal_export int mal_startup(void);
mal_export void mal_module(const char *name, mel_atom *atoms, mel_func *funcs);
mal_export void mal_module2(const char *name, mel_atom *atoms, mel_func
*funcs, mel_init initfunc, const char *code);
-mal_export str malIncludeModules(Client c, char *modules[], int listing, int
embedded);
+mal_export str malIncludeModules(Client c, char *modules[], int listing, bool
embedded);
#endif /* _MAL_PRELUDE_H */
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
@@ -27,7 +27,7 @@
* The startup script is run as user Admin.
*/
str
-malBootstrap(char *modules[], int embedded)
+malBootstrap(char *modules[], bool embedded)
{
Client c;
str msg = MAL_SUCCEED;
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
@@ -12,7 +12,7 @@
#include "mal_scenario.h"
#include "mal_resolve.h"
-mal_export str malBootstrap(char *modules[], int embedded);
+mal_export str malBootstrap(char *modules[], bool embedded);
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);
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -804,7 +804,7 @@ main(int argc, char **av)
}
modules[mods++] = 0;
- if (mal_init(modules, 0)) {
+ if (mal_init(modules, false)) {
/* don't show this as a crash */
if (!GDKinmemory(0))
msab_registerStop();
diff --git a/tools/mserver/shutdowntest.c b/tools/mserver/shutdowntest.c
--- a/tools/mserver/shutdowntest.c
+++ b/tools/mserver/shutdowntest.c
@@ -257,7 +257,7 @@ static str monetdb_initialize(void) {
char *modules[2];
modules[0] = "sql";
modules[1] = 0;
- if (mal_init(modules, 1) != 0) { // mal_init() does not return
meaningful codes on failure
+ if (mal_init(modules, true) != 0) { // mal_init() does not return
meaningful codes on failure
retval = GDKstrdup("mal_init() failed");
goto cleanup;
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
