[Zope-Checkins] CVS: Zope2 - BTreeModuleTemplate.c:1.11 BTreeTemplate.c:1.16 BucketTemplate.c:1.14 MergeTemplate.c:1.5 SetOpTemplate.c:1.7 intkeymacros.h:1.6 intvaluemacros.h:1.7

Jim Fulton jim@digicool.com
Tue, 3 Apr 2001 11:02:18 -0400 (EDT)


Update of /cvs-repository/Zope2/lib/python/BTrees
In directory korak:/tmp/cvs-serv12077

Modified Files:
	BTreeModuleTemplate.c BTreeTemplate.c BucketTemplate.c 
	MergeTemplate.c SetOpTemplate.c intkeymacros.h 
	intvaluemacros.h 
Log Message:
numerous changes to prevent gcc warnings


--- Updated File BTreeModuleTemplate.c in package Zope2 --
--- BTreeModuleTemplate.c	2001/04/02 16:56:09	1.10
+++ BTreeModuleTemplate.c	2001/04/03 15:02:17	1.11
@@ -366,7 +366,7 @@
       return;
 
 #ifdef PERSISTENT
-  if (cPersistenceCAPI=PyCObject_Import("cPersistence","CAPI"))
+  if ((cPersistenceCAPI=PyCObject_Import("cPersistence","CAPI")))
     {
 	BucketType.methods.link=cPersistenceCAPI->methods;
 	BucketType.tp_getattro=cPersistenceCAPI->getattro;

--- Updated File BTreeTemplate.c in package Zope2 --
--- BTreeTemplate.c	2001/04/02 16:57:40	1.15
+++ BTreeTemplate.c	2001/04/03 15:02:17	1.16
@@ -505,36 +505,43 @@
                 }
               self->len--;
               Py_DECREF(d->value);
-              if (min) DECREF_KEY(d->key);
+              if (min) 
+                {
+                  DECREF_KEY(d->key);
+                }
               if (min < self->len)
                 memmove(d, d+1, (self->len-min)*sizeof(BTreeItem));
 
               if (! min) 
-                if (self->len)
-                  { /* We just deleted our first child, so we need to
-                       adjust our first bucket. */
-                    if (SameType_Check(self, self->data->value))
-                      {
-                        UNLESS (PER_USE(BTREE(self->data->value))) goto err;
-                        ASSIGNB(self->firstbucket, 
-                                BTREE(self->data->value)->firstbucket);
-                        Py_XINCREF(self->firstbucket);
-                        PER_ALLOW_DEACTIVATION(BTREE(self->data->value));
-                        PER_ACCESSED(BTREE(self->data->value));
-                      }
-                    else
-                      {
-                        ASSIGNB(self->firstbucket, BUCKET(self->data->value));
-                        Py_INCREF(self->firstbucket);
-                      }
-                    /* We can toss our first key now */
-                    DECREF_KEY(self->data->key);
-                  }
-                else 
-                  {
-                    Py_XDECREF(self->firstbucket);
-                    self->firstbucket = 0;
-                  }
+                {
+                  if (self->len)
+                    { /* We just deleted our first child, so we need to
+                         adjust our first bucket. */
+                      if (SameType_Check(self, self->data->value))
+                        {
+                          UNLESS (PER_USE(BTREE(self->data->value))) goto err;
+                          ASSIGNB(self->firstbucket, 
+                                  BTREE(self->data->value)->firstbucket);
+                          Py_XINCREF(self->firstbucket);
+                          PER_ALLOW_DEACTIVATION(BTREE(self->data->value));
+                          PER_ACCESSED(BTREE(self->data->value));
+                        }
+                      else
+                        {
+                          ASSIGNB(self->firstbucket, 
+                                  BUCKET(self->data->value));
+                          Py_INCREF(self->firstbucket);
+                        }
+                      /* We can toss our first key now */
+                      DECREF_KEY(self->data->key);
+                    }
+                  else 
+                    {
+                      Py_XDECREF(self->firstbucket);
+                      self->firstbucket = 0;
+                    }
+                }
+
               changed=1;
             }
         }
@@ -612,7 +619,10 @@
 
   for (l=self->len, i=0; i < l; i++)
     {
-      if (i) DECREF_KEY(self->data[i].key);
+      if (i) 
+        {
+          DECREF_KEY(self->data[i].key);
+        }
       Py_DECREF(self->data[i].value);
     }
   self->len=0;

--- Updated File BucketTemplate.c in package Zope2 --
--- BucketTemplate.c	2001/04/02 16:57:40	1.13
+++ BucketTemplate.c	2001/04/03 15:02:17	1.14
@@ -566,8 +566,6 @@
   
  empty:
   PyErr_SetString(PyExc_ValueError, "empty bucket");
-
- err:
   PER_ALLOW_DEACTIVATION(self);
   PER_ACCESSED(self);
   return NULL;
@@ -834,7 +832,10 @@
   for (i=self->len; --i >= 0; )
     {
       DECREF_KEY(self->keys[i]);
-      if (self->values) DECREF_VALUE(self->values[i]);
+      if (self->values) 
+        {
+          DECREF_VALUE(self->values[i]);
+        }
     }
   self->len=0;
   if (self->values) 
@@ -1072,12 +1073,12 @@
   
   for (i=0; i < 3; i++)
     {
-      if (b[i]=(Bucket*)PyObject_CallObject(OBJECT(ob_type), NULL))
+      if ((b[i]=(Bucket*)PyObject_CallObject(OBJECT(ob_type), NULL)))
         {
-          if (s[i] == Py_None)  /* None is equivalent to empty, for BTrees */
+          if ((s[i] == Py_None))  /* None is equivalent to empty, for BTrees */
             continue;
           ASSIGN(r, PyObject_GetAttr(OBJECT(b[i]), __setstate___str));
-          if (a=PyTuple_New(1))
+          if ((a=PyTuple_New(1)))
             {
               if (r)
                 {

--- Updated File MergeTemplate.c in package Zope2 --
--- MergeTemplate.c	2001/04/02 16:57:40	1.4
+++ MergeTemplate.c	2001/04/03 15:02:17	1.5
@@ -111,7 +111,10 @@
 
   UNLESS (r=Py_BuildValue("iiii", p1, p2, p3, reason)) r=Py_None;
   PyErr_SetObject(PyExc_ValueError, r);
-  if (r != Py_None) Py_DECREF(r);
+  if (r != Py_None) 
+    {
+      Py_DECREF(r);
+    }
 
   return NULL;
 }
@@ -330,9 +333,7 @@
 
   return s;
 
-invalid_set_operation:
-  PyErr_SetString(PyExc_TypeError, "invalid set operation");
-err:
+ err:
   Py_XDECREF(i1.set);
   Py_XDECREF(i2.set);
   Py_XDECREF(i3.set);

--- Updated File SetOpTemplate.c in package Zope2 --
--- SetOpTemplate.c	2001/03/21 14:16:58	1.6
+++ SetOpTemplate.c	2001/04/03 15:02:17	1.7
@@ -357,8 +357,11 @@
 
   return OBJECT(r);
 
+#ifndef MERGE_DEFAULT
 invalid_set_operation:
   PyErr_SetString(PyExc_TypeError, "invalid set operation");
+#endif
+
 err:
   Py_XDECREF(i1.set);
   Py_XDECREF(i2.set);

--- Updated File intkeymacros.h in package Zope2 --
--- intkeymacros.h	2001/03/21 14:16:58	1.5
+++ intkeymacros.h	2001/04/03 15:02:17	1.6
@@ -11,4 +11,4 @@
 #define COPY_KEY_FROM_ARG(TARGET, ARG, STATUS) \
   if (PyInt_Check(ARG)) TARGET=PyInt_AsLong(ARG); else { \
       PyErr_SetString(PyExc_TypeError, "expected integer key"); \
-      (STATUS)=0; } 
+      (STATUS)=0; (TARGET)=0; } 

--- Updated File intvaluemacros.h in package Zope2 --
--- intvaluemacros.h	2001/03/21 14:16:58	1.6
+++ intvaluemacros.h	2001/04/03 15:02:17	1.7
@@ -13,7 +13,7 @@
 #define COPY_VALUE_FROM_ARG(TARGET, ARG, STATUS) \
   if (PyInt_Check(ARG)) TARGET=PyInt_AsLong(ARG); else { \
       PyErr_SetString(PyExc_TypeError, "expected integer value"); \
-      (STATUS)=0; } 
+      (STATUS)=0; (TARGET)=0; } 
   
 #define NORMALIZE_VALUE(V, MIN) ((MIN) > 0) ? ((V)/=(MIN)) : 0