Commit b7b54de6 authored by William M. Brack's avatar William M. Brack
Browse files

added code to handle <group>, including dumping to output (bug 151924).

* catalog.c: added code to handle <group>, including dumping
  to output (bug 151924).
* xmlcatalog.c, xmlstring.c, parser.c: minor compiler warning
  cleanup (no change to logic)
parent 22cdb842
Wed Oct 6 09:33:51 PDT 2004 William Brack <wbrack@mmm.com.hk>
* catalog.c: added code to handle <group>, including dumping
to output (bug 151924).
* xmlcatalog.c, xmlstring.c, parser.c: minor compiler warning
cleanup (no change to logic)
Mon Oct 4 16:09:07 CEST 2004 Daniel Veillard <daniel@veillard.com>
 
* configure.in debugXML.c include/libxml/xmlversion.h.in
......
This diff is collapsed.
......@@ -11078,9 +11078,8 @@ xmlParseInNodeContext(xmlNodePtr node, const char *data, int datalen,
*lst = NULL;
}
if ((doc->dict == NULL) && (ctxt->dict != NULL))
xmlDictFree(ctxt->dict);
ctxt->dict = NULL;
if (doc->dict != NULL)
ctxt->dict = NULL;
xmlFreeParserCtxt(ctxt);
return(ret);
......
......@@ -307,6 +307,7 @@ static void usershell(void) {
* *
************************************************************************/
static void usage(const char *name) {
/* split into 2 printf's to avoid overly long string (gcc warning) */
printf("\
Usage : %s [options] catalogfile entities...\n\
\tParse the catalog file and query it for the entities\n\
......@@ -314,13 +315,14 @@ Usage : %s [options] catalogfile entities...\n\
\t--shell : run a shell allowing interactive queries\n\
\t--create : create a new catalog\n\
\t--add 'type' 'orig' 'replace' : add an XML entry\n\
\t--add 'entry' : add an SGML entry\n\
\t--add 'entry' : add an SGML entry\n", name);
printf("\
\t--del 'values' : remove values\n\
\t--noout: avoid dumping the result on stdout\n\
\t used with --add or --del, it saves the catalog changes\n\
\t and with --sgml it automatically updates the super catalog\n\
\t--no-super-update: do not update the SGML super catalog\n\
\t-v --verbose : provide debug informations\n", name);
\t-v --verbose : provide debug informations\n");
}
int main(int argc, char **argv) {
int i;
......
......@@ -209,7 +209,7 @@ xmlStrncmp(const xmlChar *str1, const xmlChar *str2, int len) {
if (str1 == NULL) return(-1);
if (str2 == NULL) return(1);
#ifdef __GNUC__
tmp = strncmp(str1, str2, len);
tmp = strncmp((const char *)str1, (const char *)str2, len);
return tmp;
#else
do {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment