diff options
Diffstat (limited to 'xmllint.c')
| -rw-r--r-- | xmllint.c | 45 |
1 files changed, 10 insertions, 35 deletions
@@ -1837,12 +1837,8 @@ static void streamFile(char *filename) { if ((fd = open(filename, O_RDONLY)) < 0) return; base = mmap(NULL, info.st_size, PROT_READ, MAP_SHARED, fd, 0) ; - if (base == (void *) MAP_FAILED) { - close(fd); - fprintf(stderr, "mmap failure for file %s\n", filename); - progresult = XMLLINT_ERR_RDFILE; + if (base == (void *) MAP_FAILED) return; - } reader = xmlReaderForMemory(base, info.st_size, filename, NULL, options); @@ -2194,8 +2190,6 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) { #if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) f = fopen(filename, "rb"); -#elif defined(__OS400__) - f = fopen(filename, "rb"); #else f = fopen(filename, "r"); #endif @@ -2208,7 +2202,6 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) { if (res > 0) { ctxt = htmlCreatePushParserCtxt(NULL, NULL, chars, res, filename, XML_CHAR_ENCODING_NONE); - xmlCtxtUseOptions(ctxt, options); while ((res = fread(chars, 1, pushsize, f)) > 0) { htmlParseChunk(ctxt, chars, res, 0); } @@ -2230,12 +2223,8 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) { if ((fd = open(filename, O_RDONLY)) < 0) return; base = mmap(NULL, info.st_size, PROT_READ, MAP_SHARED, fd, 0) ; - if (base == (void *) MAP_FAILED) { - close(fd); - fprintf(stderr, "mmap failure for file %s\n", filename); - progresult = XMLLINT_ERR_RDFILE; + if (base == (void *) MAP_FAILED) return; - } doc = htmlReadMemory((char *) base, info.st_size, filename, NULL, options); @@ -2262,8 +2251,6 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) { } else { #if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) f = fopen(filename, "rb"); -#elif defined(__OS400__) - f = fopen(filename, "rb"); #else f = fopen(filename, "r"); #endif @@ -2305,8 +2292,6 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) { #if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) f = fopen(filename, "rb"); -#elif defined(__OS400__) - f = fopen(filename, "rb"); #else f = fopen(filename, "r"); #endif @@ -2353,12 +2338,8 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) { if ((fd = open(filename, O_RDONLY)) < 0) return; base = mmap(NULL, info.st_size, PROT_READ, MAP_SHARED, fd, 0) ; - if (base == (void *) MAP_FAILED) { - close(fd); - fprintf(stderr, "mmap failure for file %s\n", filename); - progresult = XMLLINT_ERR_RDFILE; + if (base == (void *) MAP_FAILED) return; - } if (rectxt == NULL) doc = xmlReadMemory((char *) base, info.st_size, @@ -2580,7 +2561,7 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) { fprintf(stderr, "Failed to canonicalize\n"); progresult = XMLLINT_ERR_OUT; } - } else if (canonical_11) { + } else if (canonical) { xmlChar *result = NULL; int size; @@ -3009,7 +2990,7 @@ static void usage(const char *name) { printf("\t--noenc : ignore any encoding specified inside the document\n"); printf("\t--noout : don't output the result tree\n"); printf("\t--path 'paths': provide a set of paths for resources\n"); - printf("\t--load-trace : print trace of all external entities loaded\n"); + printf("\t--load-trace : print trace of all external entites loaded\n"); printf("\t--nonet : refuse to fetch DTDs or entities over network\n"); printf("\t--nocompact : do not generate compact text nodes\n"); printf("\t--htmlout : output results as HTML\n"); @@ -3106,10 +3087,6 @@ static void usage(const char *name) { static void registerNode(xmlNodePtr node) { node->_private = malloc(sizeof(long)); - if (node->_private == NULL) { - fprintf(stderr, "Out of memory in xmllint:registerNode()\n"); - exit(XMLLINT_ERR_MEM); - } *(long*)node->_private = (long) 0x81726354; nbregister++; } @@ -3395,13 +3372,11 @@ main(int argc, char **argv) { (!strcmp(argv[i], "--pretty"))) { i++; #ifdef LIBXML_OUTPUT_ENABLED - if (argv[i] != NULL) { - format = atoi(argv[i]); - if (format == 1) { - noblanks++; - xmlKeepBlanksDefault(0); - } - } + format = atoi(argv[i]); + if (format == 1) { + noblanks++; + xmlKeepBlanksDefault(0); + } #endif /* LIBXML_OUTPUT_ENABLED */ } #ifdef LIBXML_READER_ENABLED |