summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Veillard <veillard@src.gnome.org>2005-07-29 22:02:24 +0000
committerDaniel Veillard <veillard@src.gnome.org>2005-07-29 22:02:24 +0000
commit75e389d4e0ccd998d288387051e66a8f0b2af1b0 (patch)
tree529f174a221a689e2b712a7be2450fe9c4b4a72e
parent4ea89f04ccd58de6cc4b83195252d0becba1fe69 (diff)
downloadlibxml2-75e389d4e0ccd998d288387051e66a8f0b2af1b0.tar.gz
more cleanups based on sparse reports, added "make sparse" Daniel
* Makefile.am globals.c parserInternals.c xmlreader.c xmlunicode.c xmlwriter.c: more cleanups based on sparse reports, added "make sparse" Daniel
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.am3
-rw-r--r--globals.c4
-rw-r--r--parserInternals.c2
-rw-r--r--xmlreader.c6
-rw-r--r--xmlunicode.c4
-rw-r--r--xmlwriter.c12
7 files changed, 23 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 6ce741d5..1b058de7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jul 30 00:00:46 CEST 2005 Daniel Veillard <daniel@veillard.com>
+
+ * Makefile.am globals.c parserInternals.c xmlreader.c xmlunicode.c
+ xmlwriter.c: more cleanups based on sparse reports, added
+ "make sparse"
+
Fri Jul 29 12:11:25 CEST 2005 Daniel Veillard <daniel@veillard.com>
* python/libxml.c: don't output any message on failed resolver lookups,
diff --git a/Makefile.am b/Makefile.am
index 1485e51a..ef043cbb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1135,3 +1135,6 @@ install-data-local:
tst: tst.c
$(CC) $(CFLAGS) -Iinclude -o tst tst.c .libs/libxml2.a -lpthread -lm -lz
+
+sparse: clean
+ $(MAKE) CC=cgcc
diff --git a/globals.c b/globals.c
index fcace756..38bf0f0e 100644
--- a/globals.c
+++ b/globals.c
@@ -44,7 +44,7 @@ static xmlMutexPtr xmlThrDefMutex = NULL;
*
* Additional initialisation for multi-threading
*/
-void xmlInitGlobals()
+void xmlInitGlobals(void)
{
xmlThrDefMutex = xmlNewMutex();
}
@@ -54,7 +54,7 @@ void xmlInitGlobals()
*
* Additional cleanup for multi-threading
*/
-void xmlCleanupGlobals()
+void xmlCleanupGlobals(void)
{
if (xmlThrDefMutex != NULL) {
xmlFreeMutex(xmlThrDefMutex);
diff --git a/parserInternals.c b/parserInternals.c
index b5e302e1..6ec8d4bc 100644
--- a/parserInternals.c
+++ b/parserInternals.c
@@ -1794,7 +1794,7 @@ xmlFreeParserCtxt(xmlParserCtxtPtr ctxt)
*/
xmlParserCtxtPtr
-xmlNewParserCtxt()
+xmlNewParserCtxt(void)
{
xmlParserCtxtPtr ctxt;
diff --git a/xmlreader.c b/xmlreader.c
index fecc547d..f3b5520f 100644
--- a/xmlreader.c
+++ b/xmlreader.c
@@ -598,14 +598,14 @@ xmlTextReaderEntPop(xmlTextReaderPtr reader)
xmlNodePtr ret;
if (reader->entNr <= 0)
- return (0);
+ return (NULL);
reader->entNr--;
if (reader->entNr > 0)
reader->ent = reader->entTab[reader->entNr - 1];
else
reader->ent = NULL;
ret = reader->entTab[reader->entNr];
- reader->entTab[reader->entNr] = 0;
+ reader->entTab[reader->entNr] = NULL;
return (ret);
}
@@ -2172,7 +2172,7 @@ xmlFreeTextReader(xmlTextReaderPtr reader) {
if ((reader->ctxt->vctxt.vstateTab != NULL) &&
(reader->ctxt->vctxt.vstateMax > 0)){
xmlFree(reader->ctxt->vctxt.vstateTab);
- reader->ctxt->vctxt.vstateTab = 0;
+ reader->ctxt->vctxt.vstateTab = NULL;
reader->ctxt->vctxt.vstateMax = 0;
}
if (reader->allocs & XML_TEXTREADER_CTXT)
diff --git a/xmlunicode.c b/xmlunicode.c
index af91f479..454963f4 100644
--- a/xmlunicode.c
+++ b/xmlunicode.c
@@ -926,8 +926,8 @@ static xmlChSRange xmlZS[] = {{0x20, 0x20}, {0xa0, 0xa0}, {0x1680, 0x1680},
{0x205f, 0x205f}, {0x3000, 0x3000} };
static xmlChRangeGroup xmlZG = {9,0,xmlZS,NULL};
-xmlUnicodeNameTable xmlUnicodeBlockTbl = {xmlUnicodeBlocks, 128};
-xmlUnicodeNameTable xmlUnicodeCatTbl = {xmlUnicodeCats, 36};
+static xmlUnicodeNameTable xmlUnicodeBlockTbl = {xmlUnicodeBlocks, 128};
+static xmlUnicodeNameTable xmlUnicodeCatTbl = {xmlUnicodeCats, 36};
/**
* xmlUnicodeLookup:
diff --git a/xmlwriter.c b/xmlwriter.c
index 6224222d..62273989 100644
--- a/xmlwriter.c
+++ b/xmlwriter.c
@@ -739,7 +739,7 @@ xmlTextWriterStartComment(xmlTextWriterPtr writer)
return -1;
}
- p->name = 0;
+ p->name = NULL;
p->state = XML_TEXTWRITER_COMMENT;
xmlListPushFront(writer->nodes, p);
@@ -1018,7 +1018,7 @@ xmlTextWriterStartElementNS(xmlTextWriterPtr writer,
if ((writer == NULL) || (name == NULL) || (*name == '\0'))
return -1;
- buf = 0;
+ buf = NULL;
if (prefix != 0) {
buf = xmlStrdup(prefix);
buf = xmlStrcat(buf, BAD_CAST ":");
@@ -1745,7 +1745,7 @@ xmlTextWriterStartAttributeNS(xmlTextWriterPtr writer,
if ((writer == NULL) || (name == NULL) || (*name == '\0'))
return -1;
- buf = 0;
+ buf = NULL;
if (prefix != 0) {
buf = xmlStrdup(prefix);
buf = xmlStrcat(buf, BAD_CAST ":");
@@ -2063,7 +2063,7 @@ xmlTextWriterWriteAttributeNS(xmlTextWriterPtr writer,
if ((writer == NULL) || (name == NULL) || (*name == '\0'))
return -1;
- buf = 0;
+ buf = NULL;
if (prefix != NULL) {
buf = xmlStrdup(prefix);
buf = xmlStrcat(buf, BAD_CAST ":");
@@ -2078,7 +2078,7 @@ xmlTextWriterWriteAttributeNS(xmlTextWriterPtr writer,
sum += count;
if (namespaceURI != NULL) {
- buf = 0;
+ buf = NULL;
buf = xmlStrdup(BAD_CAST "xmlns");
if (prefix != NULL) {
buf = xmlStrcat(buf, BAD_CAST ":");
@@ -2587,7 +2587,7 @@ xmlTextWriterStartCDATA(xmlTextWriterPtr writer)
return -1;
}
- p->name = 0;
+ p->name = NULL;
p->state = XML_TEXTWRITER_CDATA;
xmlListPushFront(writer->nodes, p);