Changeset: da2458b7d25e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=da2458b7d25e Modified Files: clients/Tests/exports.stable.out monetdb5/mal/mal_client.h monetdb5/mal/mal_private.h Branch: default Log Message:
Cleanup: move declarations to mal_private.h. diffs (72 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 @@ -1497,11 +1497,8 @@ str MCawakeClient(int id); void MCcloseClient(Client c); Client MCforkClient(Client father); Client MCgetClient(int id); -bool MCinit(void); Client MCinitClient(oid user, bstream *fin, stream *fout); -int MCinitClientThread(Client c); int MCpushClientInput(Client c, bstream *new_input, int listing, char *prompt); -int MCshutdowninprogress(void); void MCstopClients(Client c); str MCsuspendClient(int id); int MCvalid(Client c); @@ -1715,8 +1712,6 @@ str PCREreplace_wrap(str *res, const str str PCREreplacefirst_bat_wrap(bat *res, const bat *or, const str *pat, const str *repl, const str *flags); str PCREreplacefirst_wrap(str *res, const str *or, const str *pat, const str *repl, const str *flags); str PCREsql2pcre(str *ret, const str *pat, const str *esc); -str PROFexitClient(Client c); -str PROFinitClient(Client c); str QLOGappend(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str QLOGcall(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str QLOGcalls(BAT **r); diff --git a/monetdb5/mal/mal_client.h b/monetdb5/mal/mal_client.h --- a/monetdb5/mal/mal_client.h +++ b/monetdb5/mal/mal_client.h @@ -182,17 +182,13 @@ typedef struct CLIENT { const char *(*getquery)(struct CLIENT *); } *Client, ClientRec; -mal_export bool MCinit(void); - mal_export int MAL_MAXCLIENTS; mal_export ClientRec *mal_clients; mal_export Client MCgetClient(int id); mal_export Client MCinitClient(oid user, bstream *fin, stream *fout); -mal_export int MCinitClientThread(Client c); mal_export Client MCforkClient(Client father); mal_export void MCstopClients(Client c); -mal_export int MCshutdowninprogress(void); mal_export int MCactiveClients(void); mal_export void MCcloseClient(Client c); mal_export str MCsuspendClient(int id); @@ -200,6 +196,4 @@ mal_export str MCawakeClient(int id) mal_export int MCpushClientInput(Client c, bstream *new_input, int listing, char *prompt); mal_export int MCvalid(Client c); -mal_export str PROFinitClient(Client c); -mal_export str PROFexitClient(Client c); #endif /* _MAL_CLIENT_H_ */ 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 @@ -18,9 +18,15 @@ void MCexitClient(Client c) __attribute__((__visibility__("hidden"))); void MCfreeClient(Client c) __attribute__((__visibility__("hidden"))); +bool MCinit(void) + __attribute__((__visibility__("hidden"))); +int MCinitClientThread(Client c) + __attribute__((__visibility__("hidden"))); +void MCpopClientInput(Client c) + __attribute__((__visibility__("hidden"))); int MCreadClient(Client c) __attribute__((__visibility__("hidden"))); -void MCpopClientInput(Client c) +int MCshutdowninprogress(void) __attribute__((__visibility__("hidden"))); str defaultScenario(Client c) /* used in src/mal/mal_session.c */ __attribute__((__visibility__("hidden"))); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list