[Zope-Checkins] CVS: Zope2 - Record.c:1.9.104.1

[Brian Lloyd]

Update of /cvs-repository/Zope2/lib/Components/ExtensionClass/src
In directory korak:/home/brian/temp/zope-23-branch/lib/Components/ExtensionClass/src

Modified Files:
      Tag: zope-2_3-branch
	Record.c 
Log Message:
Merge warning fixes and test updated missed from trunk



--- Updated File Record.c in package Zope2 --
--- Record.c	2000/04/21 14:17:23	1.9
+++ Record.c	2001/03/14 19:05:10	1.9.104.1
@@ -151,7 +151,7 @@
 
   UNLESS(PyArg_ParseTuple(args, "|OO", &state, &parent)) return NULL;
 
-  if(state)
+  if(state) {
     if(PyDict_Check(state))
       {
 	PyObject *k, *v;
@@ -170,6 +170,7 @@
 	    UNLESS(*d) return NULL;
 	  }
       }
+  }
 
   Py_INCREF(Py_None);
   return Py_None;
@@ -262,11 +263,11 @@
 
   if((l=Record_init(self)) < 0) return NULL;
 
-  if(io=Py_FindAttr((PyObject *)self, name)) return io;
+  if ((io=Py_FindAttr((PyObject *)self, name))) return io;
 
   PyErr_Clear();
 
-  if(io=PyObject_GetItem(self->schema, name))
+  if((io=PyObject_GetItem(self->schema, name)))
     {
       UNLESS(PyInt_Check(io))
 	{
@@ -296,7 +297,7 @@
   PyObject *io;
 
   if((l=Record_init(self)) < 0) return -1;
-  if(io=PyObject_GetItem(self->schema, name))
+  if((io=PyObject_GetItem(self->schema, name)))
     {
       UNLESS(PyInt_Check(io))
 	{
@@ -350,7 +351,7 @@
       if(*dv)
 	if(*dw)
 	  {
-	    if(c=PyObject_Compare(*dv,*dw)) return c;
+	    if((c=PyObject_Compare(*dv,*dw))) return c;
 	  }
 	else return 1;
       else if(*dw) return -1;
@@ -474,7 +475,7 @@
       return Record_item(self, i);
     }
 
-  if(io=PyObject_GetItem(self->schema, key))
+  if((io=PyObject_GetItem(self->schema, key)))
     {
       UNLESS(PyInt_Check(io))
 	{
@@ -493,7 +494,7 @@
     }
 
   PyErr_Clear();
-  if (io=PyObject_GetAttr(OBJECT(self), key)) return io;
+  if ((io=PyObject_GetAttr(OBJECT(self), key))) return io;
 
   PyErr_SetObject(PyExc_KeyError, key);					   
   return NULL;
@@ -514,7 +515,7 @@
       return Record_ass_item(self, i, v);
     }
 
-  if(io=PyObject_GetItem(self->schema, key))
+  if((io=PyObject_GetItem(self->schema, key)))
     {
       UNLESS(PyInt_Check(io))
 	{
@@ -631,6 +632,13 @@
 Revision Log:
 
   $Log$
+  Revision 1.9.104.1  2001/03/14 19:05:10  brian
+  Merge warning fixes and test updated missed from trunk
+
+  Revision 1.10  2001/02/19 19:16:07  jeremy
+  silence compiler warnings
+  (2 remain)
+
   Revision 1.9  2000/04/21 14:17:23  tseaver
   Collector #1012: Guarantee null-terminated buffer in Record_init() so Record_compare doesn't UMR