mirror of https://github.com/python/cpython.git
* SF patch 835100 - C++ // comments are not allowed. Use /* */
This commit is contained in:
parent
ceac90aecb
commit
7441e65821
|
@ -1560,11 +1560,11 @@ DB_join(DBObject* self, PyObject* args)
|
||||||
free(cursors);
|
free(cursors);
|
||||||
RETURN_IF_ERR();
|
RETURN_IF_ERR();
|
||||||
|
|
||||||
// FIXME: this is a buggy interface. The returned cursor
|
/* FIXME: this is a buggy interface. The returned cursor
|
||||||
// contains internal references to the passed in cursors
|
contains internal references to the passed in cursors
|
||||||
// but does not hold python references to them or prevent
|
but does not hold python references to them or prevent
|
||||||
// them from being closed prematurely. This can cause
|
them from being closed prematurely. This can cause
|
||||||
// python to crash when things are done in the wrong order.
|
python to crash when things are done in the wrong order. */
|
||||||
return (PyObject*) newDBCursorObject(dbc, self);
|
return (PyObject*) newDBCursorObject(dbc, self);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2946,7 +2946,7 @@ _DBC_get_set_both(DBCursorObject* self, PyObject* keyobj, PyObject* dataobj,
|
||||||
DBT key, data;
|
DBT key, data;
|
||||||
PyObject* retval;
|
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))
|
if (!make_key_dbt(self->mydb, keyobj, &key, NULL))
|
||||||
return NULL;
|
return NULL;
|
||||||
if (!make_dbt(dataobj, &data))
|
if (!make_dbt(dataobj, &data))
|
||||||
|
@ -2994,7 +2994,7 @@ DBC_get_both(DBCursorObject* self, PyObject* args)
|
||||||
if (!PyArg_ParseTuple(args, "OO|i:get_both", &keyobj, &dataobj, &flags))
|
if (!PyArg_ParseTuple(args, "OO|i:get_both", &keyobj, &dataobj, &flags))
|
||||||
return NULL;
|
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);
|
CHECK_CURSOR_NOT_CLOSED(self);
|
||||||
|
|
||||||
return _DBC_get_set_both(self, keyobj, dataobj, flags,
|
return _DBC_get_set_both(self, keyobj, dataobj, flags,
|
||||||
|
@ -3043,7 +3043,7 @@ DBC_set_both(DBCursorObject* self, PyObject* args)
|
||||||
if (!PyArg_ParseTuple(args, "OO|i:set_both", &keyobj, &dataobj, &flags))
|
if (!PyArg_ParseTuple(args, "OO|i:set_both", &keyobj, &dataobj, &flags))
|
||||||
return NULL;
|
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);
|
CHECK_CURSOR_NOT_CLOSED(self);
|
||||||
|
|
||||||
return _DBC_get_set_both(self, keyobj, dataobj, flags,
|
return _DBC_get_set_both(self, keyobj, dataobj, flags,
|
||||||
|
|
Loading…
Reference in New Issue