[Zope-Checkins] SVN: Zope/trunk/ - Collector: #1651: removed compiler warning

[Andreas Jung]

Log message for revision 28839:
        - Collector: #1651: removed compiler warning 
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/Shared/DC/xml/pyexpat/dcpyexpat.c
  U   Zope/trunk/lib/python/Shared/DC/xml/pyexpat/expat/xmltok/xmltok.h
  U   Zope/trunk/lib/python/Shared/DC/xml/pyexpat/expat/xmltok/xmltok_impl.c

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===================================================================
--- Zope/trunk/doc/CHANGES.txt	2005-01-14 22:31:22 UTC (rev 28838)
+++ Zope/trunk/doc/CHANGES.txt	2005-01-15 11:14:22 UTC (rev 28839)
@@ -51,6 +51,8 @@
 
     Bugs fixed
 
+      - Collector: #1651: removed compiler warning 
+
       - Collector #1661: make 'python-check-interval' setting in zope.conf
         actually work as documented.  This setting allows for important
         tuning opportunities for production Zope servers.

Modified: Zope/trunk/lib/python/Shared/DC/xml/pyexpat/dcpyexpat.c
===================================================================
--- Zope/trunk/lib/python/Shared/DC/xml/pyexpat/dcpyexpat.c	2005-01-14 22:31:22 UTC (rev 28838)
+++ Zope/trunk/lib/python/Shared/DC/xml/pyexpat/dcpyexpat.c	2005-01-15 11:14:22 UTC (rev 28839)
@@ -70,9 +70,9 @@
 	PyObject *rv;
 	PyObject *attrs_obj;
 	int attrs_len;
-	const char **attrs_p, **attrs_k;
+	const char **attrs_p;
+	const char **attrs_k = atts;
 
-
 	if (self->StartElementHandler != Py_None) {
 	        if (self->attrdict) {
 		        if( (attrs_obj = PyDict_New()) == NULL ) 
@@ -715,7 +715,7 @@
 void
 initdcpyexpat(void) {
 	PyObject *m, *d;
-	char *rev="$Revision: 1.4 $";
+	static const char *rev="$Revision: 1.4 $";
 
 	Xmlparsetype.ob_type = &PyType_Type;
 
@@ -726,7 +726,7 @@
 	d = PyModule_GetDict(m);
 	ErrorObject = PyString_FromString("pyexpat.error");
 	PyDict_SetItemString(d, "error", ErrorObject);
-
+	PyDict_SetItemString(d, "API_Revision", PyString_FromString(rev));
 #define MYCONST(name) \
 	PyDict_SetItemString(d, #name, PyInt_FromLong(name))
 		

Modified: Zope/trunk/lib/python/Shared/DC/xml/pyexpat/expat/xmltok/xmltok.h
===================================================================
--- Zope/trunk/lib/python/Shared/DC/xml/pyexpat/expat/xmltok/xmltok.h	2005-01-14 22:31:22 UTC (rev 28838)
+++ Zope/trunk/lib/python/Shared/DC/xml/pyexpat/expat/xmltok/xmltok.h	2005-01-15 11:14:22 UTC (rev 28839)
@@ -175,7 +175,7 @@
 		       const unsigned short *toLim);
   int minBytesPerChar;
   char isUtf8;
-  char isUtf16;
+  int isUtf16;
 };
 
 /*

Modified: Zope/trunk/lib/python/Shared/DC/xml/pyexpat/expat/xmltok/xmltok_impl.c
===================================================================
--- Zope/trunk/lib/python/Shared/DC/xml/pyexpat/expat/xmltok/xmltok_impl.c	2005-01-14 22:31:22 UTC (rev 28838)
+++ Zope/trunk/lib/python/Shared/DC/xml/pyexpat/expat/xmltok/xmltok_impl.c	2005-01-15 11:14:22 UTC (rev 28839)
@@ -593,7 +593,7 @@
     /* fall through */
     case BT_EQUALS:
       {
-	int open;
+	int open = 0;
 #ifdef XML_NS
 	hadColon = 0;
 #endif
@@ -1391,7 +1391,7 @@
 {
   enum { other, inName, inValue } state = inName;
   int nAtts = 0;
-  int open;
+  int open = 0;
 
   for (ptr += MINBPC(enc);; ptr += MINBPC(enc)) {
     switch (BYTE_TYPE(enc, ptr)) {