Changeset: 38e1f9b32048 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=38e1f9b32048
Modified Files:
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/xml.c
sql/backends/monet5/sql.c
tools/embedded/embedded.c
Branch: embedded
Log Message:
Getting embedded working again
diffs (truncated from 334 to 300 lines):
diff --git a/monetdb5/modules/atoms/batxml.c b/monetdb5/modules/atoms/batxml.c
--- a/monetdb5/modules/atoms/batxml.c
+++ b/monetdb5/modules/atoms/batxml.c
@@ -1455,87 +1455,87 @@ BATXMLxquery(bat *ret, const bat *bid, c
#else
-#define NO_LIBXML_FATAL "MonetDB was built without libxml, but what you are
trying to do requires it."
+#define NO_LIBXML_FATAL "batxml: MonetDB was built without libxml, but what
you are trying to do requires it."
str BATXMLxml2str(bat *ret, const bat *bid) {
(void) ret;
(void) bid;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str BATXMLxmltext(bat *ret, const bat *bid) {
(void) ret;
(void) bid;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str BATXMLstr2xml(bat *ret, const bat *bid) {
(void) ret;
(void) bid;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str BATXMLdocument(bat *ret, const bat *bid) {
(void) ret;
(void) bid;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str BATXMLcontent(bat *ret, const bat *bid) {
(void) ret;
(void) bid;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str BATXMLisdocument(bat *ret, const bat *bid) {
(void) ret;
(void) bid;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str BATXMLelementSmall(bat *ret, const char * const *name, const bat *bid) {
(void) ret;
(void) name;
(void) bid;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str BATXMLoptions(bat *ret, const char * const *name, const char * const
*options, const bat *bid) {
(void) ret;
(void) name;
(void) options;
(void) bid;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str BATXMLcomment(bat *ret, const bat *bid) {
(void) ret;
(void) bid;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str BATXMLparse(bat *ret, const char * const *doccont, const bat *bid, const
char * const *option) {
(void) ret;
(void) doccont;
(void) bid;
(void) option;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str BATXMLxquery(bat *ret, const bat *bid, const char * const *expr) {
(void) ret;
(void) bid;
(void) expr;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str BATXMLpi(bat *ret, const char * const *tgt, const bat *bid) {
(void) ret;
(void) tgt;
(void) bid;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str BATXMLroot(bat *ret, const bat *bid, const char * const *version, const
char * const *standalone) {
(void) ret;
(void) bid;
(void) version;
(void) standalone;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str BATXMLattribute(bat *ret, const char * const *name, const bat *bid) {
(void) ret;
(void) name;
(void) bid;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str BATXMLelement(bat *ret, const char * const *name, xml *ns, xml *attr,
const bat *bid) {
(void) ret;
@@ -1543,38 +1543,25 @@ str BATXMLelement(bat *ret, const char *
(void) ns;
(void) attr;
(void) bid;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str BATXMLconcat(bat *ret, const bat *bid, const bat *rid) {
(void) ret;
(void) bid;
(void) rid;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str BATXMLforest(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p) {
(void) cntxt;
(void) mb;
(void) stk;
(void) p;
- return NO_LIBXML_FATAL;
-}
-str BATXMLagg(bat *ret, const bat *bid, const bat *grp) {
- (void) ret;
- (void) bid;
- (void) grp;
- return NO_LIBXML_FATAL;
-}
-str BATXMLagg3(bat *ret, const bat *bid, const bat *grp, const bat *e) {
- (void) ret;
- (void) bid;
- (void) grp;
- (void) e;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str BATXMLgroup(xml *ret, const bat *bid) {
(void) ret;
(void) bid;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str AGGRsubxmlcand(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bat *sid, const bit *skip_nils) {
(void) retval;
@@ -1583,7 +1570,7 @@ str AGGRsubxmlcand(bat *retval, const ba
(void) eid;
(void) sid;
(void) skip_nils;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str AGGRsubxml(bat *retval, const bat *bid, const bat *gid, const bat *eid,
const bit *skip_nils) {
(void) retval;
@@ -1591,7 +1578,7 @@ str AGGRsubxml(bat *retval, const bat *b
(void) gid;
(void) eid;
(void) skip_nils;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
#endif
diff --git a/monetdb5/modules/atoms/xml.c b/monetdb5/modules/atoms/xml.c
--- a/monetdb5/modules/atoms/xml.c
+++ b/monetdb5/modules/atoms/xml.c
@@ -678,7 +678,7 @@ XMLtoString(str *s, int *len, xml src)
#else
-#define NO_LIBXML_FATAL "MonetDB was built without libxml, but what you are
trying to do requires it."
+#define NO_LIBXML_FATAL "xml: MonetDB was built without libxml, but what you
are trying to do requires it."
int XMLfromString(str src, int *len, xml *x) {
(void) src;
@@ -695,69 +695,68 @@ int XMLtoString(str *s, int *len, xml sr
str XMLxml2str(str *s, xml *x) {
(void) s;
(void) x;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str XMLstr2xml(xml *x, str *s) {
(void) s;
(void) x;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str XMLxmltext(str *s, xml *x) {
(void) s;
(void) x;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str XMLxml2xml(xml *x, xml *s) {
(void) s;
(void) x;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str XMLdocument(xml *x, str *s) {
(void) s;
(void) x;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str XMLcontent(xml *x, str *s) {
(void) s;
(void) x;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str XMLisdocument(bit *x, str *s) {
(void) s;
(void) x;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str XMLcomment(xml *x, str *s) {
(void) s;
(void) x;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str XMLpi(xml *x, str *target, str *s) {
(void) s;
(void) target;
(void) x;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str XMLroot(xml *x, xml *v, str *version, str *standalone) {
(void) x;
(void) v;
(void) version;
(void) standalone;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str XMLparse(xml *x, str *doccont, str *s, str *option) {
(void) x;
(void) doccont;
(void) s;
(void) option;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str XMLattribute(xml *ret, str *name, str *val) {
(void) ret;
(void) name;
(void) val;
- return NO_LIBXML_FATAL;
-
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str XMLelement(xml *ret, str *name, xml *nspace, xml *attr, xml *val) {
(void) ret;
@@ -765,27 +764,26 @@ str XMLelement(xml *ret, str *name, xml
(void) nspace;
(void) attr;
(void) val;
- return NO_LIBXML_FATAL;
-
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str XMLelementSmall(xml *ret, str *name, xml *val) {
(void) ret;
(void) name;
(void) val;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str XMLconcat(xml *ret, xml *left, xml *right) {
(void) ret;
(void) left;
(void) right;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
str XMLforest(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p) {
(void) cntxt;
(void) mb;
(void) stk;
(void) p;
- return NO_LIBXML_FATAL;
+ return GDKstrdup(NO_LIBXML_FATAL);
}
size_t XMLquotestring(const char *s, char *buf, size_t len) {
(void) s;
@@ -801,7 +799,7 @@ size_t XMLunquotestring(const char **p,
}
str XMLprelude(void *ret) {
(void) ret;
- return NO_LIBXML_FATAL;
+ return MAL_SUCCEED; /* to not break init */
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
