c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

- tree.c: xmlNewDoc was missing the charset initialization

Browse Source 
- xmllint.c: added --auto to autogenerate a doc, allow to
  reproduce the problem fixed on xmlNewDoc
Daniel
This commit is contained in:
Daniel Veillard 2001-04-11 07:50:02 +00:00
parent 1731d6ae0a
commit d2f3ec780d
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Wed Apr 11 09:47:55 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
* tree.c: xmlNewDoc was missing the charset initialization
* xmllint.c: added --auto to autogenerate a doc, allow to
reproduce the problem fixed on xmlNewDoc
Tue Apr 10 18:13:10 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr> Tue Apr 10 18:13:10 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
* xpath.c: trying to get 52979 solved * xpath.c: trying to get 52979 solved

1
tree.c
View File

@ -477,6 +477,7 @@ xmlNewDoc(const xmlChar *version) {
cur->standalone = -1; cur->standalone = -1;
cur->compression = -1; /* not initialized */ cur->compression = -1; /* not initialized */
cur->doc = cur; cur->doc = cur;
cur->charset = XML_CHAR_ENCODING_UTF8;
return(cur); return(cur);
} }

26
xmllint.c
View File

@ -91,6 +91,7 @@ static int xinclude = 0;
#endif #endif
static int progresult = 0; static int progresult = 0;
static int timing = 0; static int timing = 0;
static int generate = 0;
static struct timeval begin, end; static struct timeval begin, end;
@ -394,11 +395,22 @@ static void parseAndPrintFile(char *filename) {
gettimeofday(&begin, NULL); gettimeofday(&begin, NULL);
if (filename == NULL) {
if (generate) {
xmlNodePtr n;
doc = xmlNewDoc(BAD_CAST "1.0");
n = xmlNewNode(NULL, BAD_CAST "info");
xmlNodeSetContent(n, BAD_CAST "abc");
xmlDocSetRootElement(doc, n);
}
}
#ifdef LIBXML_HTML_ENABLED #ifdef LIBXML_HTML_ENABLED
if (html) { else if (html) {
doc = htmlParseFile(filename, NULL); doc = htmlParseFile(filename, NULL);
} else { }
#endif /* LIBXML_HTML_ENABLED */ #endif /* LIBXML_HTML_ENABLED */
else {
/* /*
* build an XML tree from a string; * build an XML tree from a string;
*/ */
@ -523,9 +535,7 @@ static void parseAndPrintFile(char *filename) {
#endif #endif
} else } else
doc = xmlParseFile(filename); doc = xmlParseFile(filename);
#ifdef LIBXML_HTML_ENABLED
} }
#endif
/* /*
* If we don't have a document we might as well give up. Do we * If we don't have a document we might as well give up. Do we
@ -793,6 +803,9 @@ main(int argc, char **argv) {
else if ((!strcmp(argv[i], "-timing")) || else if ((!strcmp(argv[i], "-timing")) ||
(!strcmp(argv[i], "--timing"))) (!strcmp(argv[i], "--timing")))
timing++; timing++;
else if ((!strcmp(argv[i], "-auto")) ||
(!strcmp(argv[i], "--auto")))
generate++;
else if ((!strcmp(argv[i], "-repeat")) || else if ((!strcmp(argv[i], "-repeat")) ||
(!strcmp(argv[i], "--repeat"))) (!strcmp(argv[i], "--repeat")))
repeat++; repeat++;
@ -894,10 +907,12 @@ main(int argc, char **argv) {
fprintf(stderr, "100 iteration took %ld ms\n", msec); fprintf(stderr, "100 iteration took %ld ms\n", msec);
} }
} }
if (generate)
parseAndPrintFile(NULL);
if ((htmlout) && (!nowrap)) { if ((htmlout) && (!nowrap)) {
xmlGenericError(xmlGenericErrorContext, "</body></html>\n"); xmlGenericError(xmlGenericErrorContext, "</body></html>\n");
} }
if (files == 0) { if ((files == 0) && (!generate)) {
printf("Usage : %s [options] XMLfiles ...\n", printf("Usage : %s [options] XMLfiles ...\n",
argv[0]); argv[0]);
printf("\tParse the XML files and output the result of the parsing\n"); printf("\tParse the XML files and output the result of the parsing\n");
@ -930,6 +945,7 @@ main(int argc, char **argv) {
printf("\t--noblanks : drop (ignorable?) blanks spaces\n"); printf("\t--noblanks : drop (ignorable?) blanks spaces\n");
printf("\t--testIO : test user I/O support\n"); printf("\t--testIO : test user I/O support\n");
printf("\t--encode encoding : output in the given encoding\n"); printf("\t--encode encoding : output in the given encoding\n");
printf("\t--auto : generate a small doc on the fly\n");
#ifdef LIBXML_XINCLUDE_ENABLED #ifdef LIBXML_XINCLUDE_ENABLED
printf("\t--xinclude : do XInclude processing\n"); printf("\t--xinclude : do XInclude processing\n");
#endif #endif