Changeset: e2ea168176f5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e2ea168176f5
Removed Files:
monetdb5/modules/atoms/url.h
Modified Files:
clients/Tests/exports.stable.out
monetdb5/modules/atoms/CMakeLists.txt
monetdb5/modules/atoms/streams.c
monetdb5/modules/atoms/streams.h
monetdb5/modules/atoms/url.c
monetdb5/modules/atoms/uuid.c
monetdb5/modules/atoms/xml.h
monetdb5/modules/mal/tablet.c
sql/backends/monet5/mal_backend.h
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/backends/monet5/wlr.h
Branch: default
Log Message:
Cleanup: fewer exports, fewer include files.
diffs (truncated from 793 to 300 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
@@ -1735,34 +1735,6 @@ str TRNtrans_commit(Client cntxt, MalBlk
int TYPE_blob;
int TYPE_uuid;
int TYPE_xml;
-str URLgetAnchor(str *retval, url *val);
-str URLgetBasename(str *retval, url *t);
-str URLgetContext(str *retval, url *val);
-str URLgetDomain(str *retval, url *tv);
-str URLgetExtension(str *retval, url *tv);
-str URLgetFile(str *retval, url *tv);
-str URLgetHost(str *retval, url *tv);
-str URLgetPort(str *retval, url *tv);
-str URLgetProtocol(str *retval, url *tv);
-str URLgetQuery(str *retval, url *tv);
-str URLgetRobotURL(str *retval, url *tv);
-str URLgetUser(str *retval, url *tv);
-str URLisaURL(bit *retval, str *tv);
-str URLnew(url *u, str *val);
-str URLnew3(url *u, str *protocol, str *server, str *file);
-str URLnew4(url *u, str *protocol, str *server, int *port, str *file);
-str URLnoop(url *u, url *val);
-str UUIDgenerateUuid(uuid **retval);
-str UUIDgenerateUuid(uuid *retval);
-str UUIDgenerateUuidInt(uuid **retval, int *d);
-str UUIDgenerateUuidInt(uuid *retval, int *d);
-str UUIDisaUUID(bit *retval, str *u);
-str UUIDprelude(void *ret);
-str UUIDstr2uuid(uuid **retval, str *s);
-str UUIDstr2uuid(uuid *retval, str *s);
-str UUIDuuid2str(str *retval, const uuid *u);
-str UUIDuuid2str(str *retval, uuid **u);
-str UUIDuuid2uuid(uuid *retval, uuid *s);
str WLCaction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str WLCappend(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str WLCcatalog(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -1790,26 +1762,6 @@ str WLCstop(Client cntxt, MalBlkPtr mb,
str WLCtransaction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str WLCupdate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
int WLCused(void);
-str XMLattribute(xml *ret, str *name, str *val);
-str XMLcomment(xml *x, str *s);
-str XMLconcat(xml *ret, xml *left, xml *right);
-str XMLcontent(xml *x, str *s);
-str XMLdocument(xml *x, str *s);
-str XMLelement(xml *ret, str *name, xml *nspace, xml *attr, xml *val);
-str XMLelementSmall(xml *ret, str *name, xml *val);
-str XMLepilogue(void *ret);
-str XMLforest(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str XMLisdocument(bit *x, str *s);
-str XMLparse(xml *x, str *doccont, str *s, str *option);
-str XMLpi(xml *x, str *target, str *s);
-str XMLprelude(void *ret);
-size_t XMLquotestring(const char *s, char *buf, size_t len);
-str XMLroot(xml *x, xml *v, str *version, str *standalone);
-str XMLstr2xml(xml *x, const char **s);
-size_t XMLunquotestring(const char **p, char q, char *buf);
-str XMLxml2str(str *s, xml *x);
-str XMLxml2xml(xml *x, xml *s);
-str XMLxmltext(str *s, xml *x);
str abortRef;
str actionRef;
InstrPtr addArgument(MalBlkPtr mb, InstrPtr p, int varid);
@@ -1869,12 +1821,6 @@ var_t blobsize(size_t nitems);
str blockRef;
str bpmRef;
str bstreamRef;
-int bstream_create_wrap(Bstream *BS, Stream *S, int *bufsize);
-str bstream_create_wrapwrap(Bstream *Bs, Stream *S, int *bufsize);
-int bstream_destroy_wrap(Bstream *BS);
-str bstream_destroy_wrapwrap(void *ret, Bstream *BS);
-int bstream_read_wrap(int *res, Bstream *BS, int *size);
-str bstream_read_wrapwrap(int *res, Bstream *BS, int *size);
str bulk_rotate_xor_hashRef;
str calcRef;
str callMAL(Client cntxt, MalBlkPtr mb, MalStkPtr *glb, ValPtr argv[], char
debug);
@@ -1964,7 +1910,6 @@ void dumpModules(stream *out);
str emptybindRef;
str emptybindidxRef;
str eqRef;
-str escape_str(str *retval, str s);
str evalFile(str fname, int listing);
str evalRef;
str execRef;
@@ -2186,22 +2131,6 @@ str mirrorRef;
str mitosisRef;
str mkeyRef;
str mmathRef;
-int mnstr_close_stream(Stream *S);
-str mnstr_close_streamwrap(void *ret, Stream *s);
-int mnstr_flush_stream(Stream *S);
-str mnstr_flush_streamwrap(void *ret, Stream *s);
-str mnstr_open_rastreamwrap(Stream *S, str *filename);
-str mnstr_open_rstreamwrap(Stream *S, str *filename);
-str mnstr_open_wastreamwrap(Stream *S, str *filename);
-str mnstr_open_wstreamwrap(Stream *S, str *filename);
-int mnstr_readInt_wrap(int *data, Stream *S);
-str mnstr_readIntwrap(int *ret, Stream *S);
-int mnstr_read_string(str *res, Stream *S);
-str mnstr_read_stringwrap(str *res, Stream *s);
-int mnstr_writeInt_wrap(Stream *S, int *data);
-str mnstr_writeIntwrap(void *ret, Stream *S, int *data);
-int mnstr_write_string(Stream *S, str data);
-str mnstr_write_stringwrap(void *ret, Stream *S, str *data);
str modRef;
char monet_characteristics[4096];
char monet_cwd[FILENAME_MAX];
@@ -2263,8 +2192,6 @@ void oldmoveInstruction(InstrPtr dst, In
str oltpRef;
str openProfilerStream(Client cntxt);
str openRef;
-int open_block_stream(Stream *S, Stream *is);
-str open_block_streamwrap(Stream *S, Stream *is);
str operatorName(int i);
void opt_pipes_reset(void);
str optimizeMALBlock(Client cntxt, MalBlkPtr mb);
@@ -2464,7 +2391,6 @@ str transaction_rollbackRef;
void trimMalVariables(MalBlkPtr mb, MalStkPtr stk);
void trimMalVariables_(MalBlkPtr mb, MalStkPtr glb);
void typeChecker(Module scope, MalBlkPtr mb, InstrPtr p, int p_idx, int
silent);
-str unescape_str(str *retval, str s);
str uniqueRef;
str unlockRef;
str unpackRef;
diff --git a/monetdb5/modules/atoms/CMakeLists.txt
b/monetdb5/modules/atoms/CMakeLists.txt
--- a/monetdb5/modules/atoms/CMakeLists.txt
+++ b/monetdb5/modules/atoms/CMakeLists.txt
@@ -15,7 +15,7 @@ target_sources(atoms
color.c color.h
str.c str.h
strptime.c
- url.c url.h
+ url.c
uuid.c uuid.h
json.c
mtime.c
diff --git a/monetdb5/modules/atoms/streams.c b/monetdb5/modules/atoms/streams.c
--- a/monetdb5/modules/atoms/streams.c
+++ b/monetdb5/modules/atoms/streams.c
@@ -19,7 +19,7 @@
#include "streams.h"
#include "mal_exception.h"
-str mnstr_open_rstreamwrap(Stream *S, str *filename)
+static str mnstr_open_rstreamwrap(Stream *S, str *filename)
{
stream *s;
@@ -35,7 +35,7 @@ str mnstr_open_rstreamwrap(Stream *S, st
return MAL_SUCCEED;
}
-str mnstr_open_wstreamwrap(Stream *S, str *filename)
+static str mnstr_open_wstreamwrap(Stream *S, str *filename)
{
stream *s;
@@ -52,7 +52,7 @@ str mnstr_open_wstreamwrap(Stream *S, st
return MAL_SUCCEED;
}
-str mnstr_open_rastreamwrap(Stream *S, str *filename)
+static str mnstr_open_rastreamwrap(Stream *S, str *filename)
{
stream *s;
@@ -69,7 +69,7 @@ str mnstr_open_rastreamwrap(Stream *S, s
return MAL_SUCCEED;
}
-str mnstr_open_wastreamwrap(Stream *S, str *filename)
+static str mnstr_open_wastreamwrap(Stream *S, str *filename)
{
stream *s;
@@ -86,7 +86,7 @@ str mnstr_open_wastreamwrap(Stream *S, s
return MAL_SUCCEED;
}
-str
+static str
mnstr_write_stringwrap(void *ret, Stream *S, str *data)
{
stream *s = *(stream **)S;
@@ -98,7 +98,7 @@ mnstr_write_stringwrap(void *ret, Stream
return MAL_SUCCEED;
}
-str
+static str
mnstr_writeIntwrap(void *ret, Stream *S, int *data)
{
stream *s = *(stream **)S;
@@ -110,7 +110,7 @@ mnstr_writeIntwrap(void *ret, Stream *S,
return MAL_SUCCEED;
}
-str
+static str
mnstr_readIntwrap(int *ret, Stream *S)
{
stream *s = *(stream **)S;
@@ -122,7 +122,7 @@ mnstr_readIntwrap(int *ret, Stream *S)
}
#define CHUNK (64 * 1024)
-str
+static str
mnstr_read_stringwrap(str *res, Stream *S)
{
stream *s = *(stream **)S;
@@ -153,7 +153,7 @@ mnstr_read_stringwrap(str *res, Stream *
return MAL_SUCCEED;
}
-str
+static str
mnstr_flush_streamwrap(void *ret, Stream *S)
{
stream *s = *(stream **)S;
@@ -165,7 +165,7 @@ mnstr_flush_streamwrap(void *ret, Stream
return MAL_SUCCEED;
}
-str
+static str
mnstr_close_streamwrap(void *ret, Stream *S)
{
(void)ret;
@@ -175,7 +175,7 @@ mnstr_close_streamwrap(void *ret, Stream
return MAL_SUCCEED;
}
-str
+static str
open_block_streamwrap(Stream *S, Stream *is)
{
if ((*(stream **)S = block_stream(*(stream **)is)) == NULL)
@@ -184,7 +184,7 @@ open_block_streamwrap(Stream *S, Stream
return MAL_SUCCEED;
}
-str
+static str
bstream_create_wrapwrap(Bstream *Bs, Stream *S, int *bufsize)
{
if ((*(bstream **)Bs = bstream_create(*(stream **)S, (size_t)*bufsize))
== NULL)
@@ -193,7 +193,7 @@ bstream_create_wrapwrap(Bstream *Bs, Str
return MAL_SUCCEED;
}
-str
+static str
bstream_destroy_wrapwrap(void *ret, Bstream *BS)
{
(void)ret;
@@ -203,7 +203,7 @@ bstream_destroy_wrapwrap(void *ret, Bstr
return MAL_SUCCEED;
}
-str
+static str
bstream_read_wrapwrap(int *res, Bstream *BS, int *size)
{
*res = (int)bstream_read(*(bstream **)BS, (size_t)*size);
diff --git a/monetdb5/modules/atoms/streams.h b/monetdb5/modules/atoms/streams.h
--- a/monetdb5/modules/atoms/streams.h
+++ b/monetdb5/modules/atoms/streams.h
@@ -15,29 +15,4 @@
typedef ptr Stream;
typedef ptr Bstream;
-mal_export int mnstr_write_string(Stream *S, str data);
-mal_export int mnstr_writeInt_wrap(Stream *S, int *data);
-mal_export int mnstr_readInt_wrap(int *data, Stream *S);
-mal_export int mnstr_read_string(str *res, Stream *S);
-mal_export int mnstr_flush_stream(Stream *S);
-mal_export int mnstr_close_stream(Stream *S);
-mal_export int open_block_stream(Stream *S, Stream *is);
-mal_export int bstream_create_wrap(Bstream *BS, Stream *S, int *bufsize);
-mal_export int bstream_destroy_wrap(Bstream *BS);
-mal_export int bstream_read_wrap(int *res, Bstream *BS, int *size);
-mal_export str mnstr_write_stringwrap(void *ret, Stream *S, str *data);
-mal_export str mnstr_writeIntwrap(void *ret, Stream *S, int *data);
-mal_export str mnstr_readIntwrap(int *ret, Stream *S);
-mal_export str mnstr_read_stringwrap(str *res, Stream *s);
-mal_export str mnstr_flush_streamwrap(void *ret, Stream *s);
-mal_export str mnstr_close_streamwrap(void *ret, Stream *s);
-mal_export str open_block_streamwrap(Stream *S, Stream *is);
-mal_export str bstream_create_wrapwrap(Bstream *Bs, Stream *S, int *bufsize);
-mal_export str bstream_destroy_wrapwrap(void *ret, Bstream *BS);
-mal_export str bstream_read_wrapwrap(int *res, Bstream *BS, int *size);
-
-mal_export str mnstr_open_rstreamwrap(Stream *S, str *filename);
-mal_export str mnstr_open_wstreamwrap(Stream *S, str *filename);
-mal_export str mnstr_open_rastreamwrap(Stream *S, str *filename);
-mal_export str mnstr_open_wastreamwrap(Stream *S, str *filename);
#endif /*_STREAMS_H_*/
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
