Changeset: 7779e7df7786 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7779e7df7786
Modified Files:
monetdb5/mal/mal_client.c
monetdb5/mal/mal_private.h
monetdb5/mal/mal_session.c
Branch: default
Log Message:
Cleanup MCfreeClient was a superfluous alias for MCcloseClient.
diffs (91 lines):
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -431,7 +431,7 @@ MCshutdowninprogress(void){
* child can not close a parent.
*/
void
-MCfreeClient(Client c)
+MCcloseClient(Client c)
{
MT_lock_set(&mal_contextLock);
if( c->mode == FREECLIENT) {
@@ -577,12 +577,6 @@ MCmemoryClaim(void)
return claim * LL_CONSTANT(1048576);
}
-void
-MCcloseClient(Client c)
-{
- MCfreeClient(c);
-}
-
str
MCsuspendClient(int id)
{
diff --git a/monetdb5/mal/mal_private.h b/monetdb5/mal/mal_private.h
--- a/monetdb5/mal/mal_private.h
+++ b/monetdb5/mal/mal_private.h
@@ -16,8 +16,6 @@
/* _MAL_CLIENT_H_ is defined in the same file as Client */
void MCexitClient(Client c)
__attribute__((__visibility__("hidden")));
-void MCfreeClient(Client c)
- __attribute__((__visibility__("hidden")));
bool MCinit(void)
__attribute__((__visibility__("hidden")));
int MCinitClientThread(Client c)
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
@@ -39,34 +39,34 @@ malBootstrap(char *modules[], bool embed
assert(c != NULL);
c->curmodule = c->usermodule = userModule();
if(c->usermodule == NULL) {
- MCfreeClient(c);
+ MCcloseClient(c);
throw(MAL, "malBootstrap", "Failed to initialize client MAL
module");
}
if ( (msg = defaultScenario(c)) ) {
- MCfreeClient(c);
+ MCcloseClient(c);
return msg;
}
if((msg = MSinitClientPrg(c, "user", "main")) != MAL_SUCCEED) {
- MCfreeClient(c);
+ MCcloseClient(c);
return msg;
}
if( MCinitClientThread(c) < 0){
- MCfreeClient(c);
+ MCcloseClient(c);
throw(MAL, "malBootstrap", "Failed to create client thread");
}
if ((msg = malIncludeModules(c, modules, 0, embedded, initpasswd)) !=
MAL_SUCCEED) {
- MCfreeClient(c);
+ MCcloseClient(c);
return msg;
}
pushEndInstruction(c->curprg->def);
msg = chkProgram(c->usermodule, c->curprg->def);
if ( msg != MAL_SUCCEED || (msg= c->curprg->def->errors) != MAL_SUCCEED
) {
- MCfreeClient(c);
+ MCcloseClient(c);
return msg;
}
msg = MALengine(c);
- MCfreeClient(c);
+ MCcloseClient(c);
return msg;
}
@@ -184,7 +184,7 @@ cleanUpScheduleClient(Client c, Scenario
freeException(msg);
}
}
- MCfreeClient(c);
+ MCcloseClient(c);
}
exit_streams(fin, fout);
if (command) {
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
