More work toward 2.2.5, integrated a number of patches
- configure.in Makefile.am win32config.h.in: trying to cleanup
make distcheck .... huh ...
- include/Makefile.am include/win32config.h: new directory
for includes
- win32/Makefile.mingw win32/README.MSDev win32/libxml2/libxml2.dsp
updated teh makefiles and instructions for WIN32
- xpath.c: small fixes
- test/XPath/ results/XPath: updated the testcases and results
- HTMLparser.c nanohttp.c testXPath.c: incorporated provided or
suggested patches
- valid.c: fixed an ID bug
Daniel
diff --git a/testXPath.c b/testXPath.c
index 65fc545..1133d4c 100644
--- a/testXPath.c
+++ b/testXPath.c
@@ -150,7 +150,7 @@
for (i = 0;i < cur->locNr;i++) {
fprintf(output, shift);
- fprintf(output, "%d :\n", i + 1);
+ fprintf(output, "%d : ", i + 1);
xmlXPAthDebugDumpObject(output, cur->locTab[i], depth + 1);
}
}
@@ -197,16 +197,18 @@
fprintf(output, "\n");
break;
case XPATH_RANGE:
- fprintf(output, "Object is a range : from ");
+ fprintf(output, "Object is a range :\n");
+ fprintf(output, shift);
+ fprintf(output, "From ");
if (cur->index >= 0)
fprintf(output, "index %d in ", cur->index);
- fprintf(output, "node");
+ fprintf(output, "node\n");
xmlXPAthDebugDumpNode(output, (xmlNodePtr) cur->user, depth + 1);
fprintf(output, shift);
- fprintf(output, " to ");
+ fprintf(output, "To ");
if (cur->index2 >= 0)
fprintf(output, "index %d in ", cur->index2);
- fprintf(output, "node");
+ fprintf(output, "node\n");
xmlXPAthDebugDumpNode(output, (xmlNodePtr) cur->user2, depth + 1);
fprintf(output, "\n");
break;