#include "sherlock/xml/xml.h"
#include "sherlock/xml/dtd.h"
#include "sherlock/xml/internals.h"
-#include "lib/fastbuf.h"
-#include "lib/ff-unicode.h"
-#include "lib/unicode.h"
-#include "lib/chartype.h"
-#include "lib/hashfunc.h"
+#include "ucw/fastbuf.h"
+#include "ucw/ff-unicode.h"
+#include "ucw/unicode.h"
+#include "ucw/chartype.h"
+#include "ucw/hashfunc.h"
#include <setjmp.h>
#define HASH_WANT_FIND
#define HASH_GIVE_ALLOC
XML_HASH_GIVE_ALLOC
-#include "lib/hashtable.h"
+#include "ucw/hashtable.h"
static void
xml_parse_attr(struct xml_context *ctx)
{
p = mp_spread(pool, p, son->len + 1);
memcpy(p, son->text, son->len);
+ p += son->len;
}
*p++ = 0;
return mp_end(pool, p);
{
p = mp_spread(pool, p, son->len + 1);
memcpy(p, son->text, son->len);
+ p += son->len;
}
else if (son->type == XML_NODE_ELEM)
p = xml_append_dom_chars(p, pool, son);