[Python-checkins] python/dist/src/Modules _bsddb.c,1.24,1.25

greg at users.sourceforge.net greg at users.sourceforge.net
Mon Nov 3 16:35:33 EST 2003


Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1:/tmp/cvs-serv7748/Modules

Modified Files:
	_bsddb.c 
Log Message:
* 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.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** _bsddb.c	3 Nov 2003 01:04:41 -0000	1.24
--- _bsddb.c	3 Nov 2003 21:35:31 -0000	1.25
***************
*** 1561,1569 ****
      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.
      return (PyObject*) newDBCursorObject(dbc, self);
  }
--- 1561,1569 ----
      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. */
      return (PyObject*) newDBCursorObject(dbc, self);
  }
***************
*** 2947,2951 ****
      PyObject* retval;
  
!     // the caller did this:  CHECK_CURSOR_NOT_CLOSED(self);
      if (!make_key_dbt(self->mydb, keyobj, &key, NULL))
          return NULL;
--- 2947,2951 ----
      PyObject* retval;
  
!     /* the caller did this:  CHECK_CURSOR_NOT_CLOSED(self); */
      if (!make_key_dbt(self->mydb, keyobj, &key, NULL))
          return NULL;
***************
*** 2995,2999 ****
          return NULL;
  
!     // if the cursor is closed, self->mydb may be invalid
      CHECK_CURSOR_NOT_CLOSED(self);
  
--- 2995,2999 ----
          return NULL;
  
!     /* if the cursor is closed, self->mydb may be invalid */
      CHECK_CURSOR_NOT_CLOSED(self);
  
***************
*** 3044,3048 ****
          return NULL;
  
!     // if the cursor is closed, self->mydb may be invalid
      CHECK_CURSOR_NOT_CLOSED(self);
  
--- 3044,3048 ----
          return NULL;
  
!     /* if the cursor is closed, self->mydb may be invalid */
      CHECK_CURSOR_NOT_CLOSED(self);
  





More information about the Python-checkins mailing list