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

[greg at users.sourceforge.net]

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

Modified Files:
      Tag: release23-maint
	_bsddb.c 
Log Message:
redo this patch on release23-maint rather than release23-branch:
  revision 1.17.4.1
  date: 2003/11/03 21:37:43;  author: greg;  state: Exp;  lines: +9 -9
  * SF patch 835100 - C++ // comments are not allowed.  use /* */


Index: _bsddb.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_bsddb.c,v
retrieving revision 1.17.6.5
retrieving revision 1.17.6.6
diff -u -d -r1.17.6.5 -r1.17.6.6
--- _bsddb.c	4 Sep 2004 01:41:01 -0000	1.17.6.5
+++ _bsddb.c	19 Dec 2004 22:39:01 -0000	1.17.6.6
@@ -1540,11 +1540,11 @@
     free(cursors);
     RETURN_IF_ERR();
 
-    // FIXME: this is a buggy interface.  The returned cursor
-    // contains internal references to the passed in cursors
-    // but does not hold python references to them or prevent
-    // them from being closed prematurely.  This can cause
-    // python to crash when things are done in the wrong order.
+    /* FIXME: this is a buggy interface.  The returned cursor
+       contains internal references to the passed in cursors
+       but does not hold python references to them or prevent
+       them from being closed prematurely.  This can cause
+       python to crash when things are done in the wrong order. */
     return (PyObject*) newDBCursorObject(dbc, self);
 }
 
@@ -2942,7 +2942,7 @@
     DBT key, data;
     PyObject* retval;
 
-    // the caller did this:  CHECK_CURSOR_NOT_CLOSED(self);
+    /* the caller did this:  CHECK_CURSOR_NOT_CLOSED(self); */
     if (!make_key_dbt(self->mydb, keyobj, &key, NULL))
         return NULL;
     if (!make_dbt(dataobj, &data))
@@ -2990,7 +2990,7 @@
     if (!PyArg_ParseTuple(args, "OO|i:get_both", &keyobj, &dataobj, &flags))
         return NULL;
 
-    // if the cursor is closed, self->mydb may be invalid
+    /* if the cursor is closed, self->mydb may be invalid */
     CHECK_CURSOR_NOT_CLOSED(self);
 
     return _DBC_get_set_both(self, keyobj, dataobj, flags,
@@ -3006,7 +3006,7 @@
     if (!PyArg_ParseTuple(args, "OO|i:set_both", &keyobj, &dataobj, &flags))
         return NULL;
 
-    // if the cursor is closed, self->mydb may be invalid
+    /* if the cursor is closed, self->mydb may be invalid */
     CHECK_CURSOR_NOT_CLOSED(self);
 
     return _DBC_get_set_both(self, keyobj, dataobj, flags,