[Python-checkins] python/dist/src/Modules _bsddb.c, 1.17.6.6, 1.17.6.7

[greg at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17337/Modules

Modified Files:
      Tag: release23-maint
	_bsddb.c 
Log Message:
In 1.17.6.4 part of the patch committed in 1.17.6.3 got reapplied to
the end of a second function whos code was identical enough for patch
not to reject the patch.  this reverses that misapplication (only the
DBC_set_range method needed modification, not DBC_set as well).  This
problem only exists in the release32-maint branch.


Index: _bsddb.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_bsddb.c,v
retrieving revision 1.17.6.6
retrieving revision 1.17.6.7
diff -u -d -r1.17.6.6 -r1.17.6.7
--- _bsddb.c	19 Dec 2004 22:39:01 -0000	1.17.6.6
+++ _bsddb.c	19 Dec 2004 23:27:48 -0000	1.17.6.7
@@ -2849,15 +2849,7 @@
                                    data.data, data.size);
             break;
         }
-        if (_DB_get_type(self->mydb) == DB_BTREE) {
-            /* the only time a malloced key is returned is when we
-             * call this on a BTree database because it performs
-             * partial matching and needs to return the real key.
-             * All others leave key untouched [where calling free()
-             * on it would often segfault].
-             */
-            FREE_DBT(key);
-        }
+        FREE_DBT(key);
         FREE_DBT(data);
     }