Skip to content

C
cpython
Kaydet (Commit) 39763a16 authored tarafından Thomas Heller's avatar Thomas Heller
Dosyalara gözat
Seçenekler

Make Modules/_bsddb.c and PC/_winreg.c compile again by renaming 

PyBuffer into Py_buffer.
üst 4d8c1933
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 39 deletions
Modules/_bsddb.c
Dosyayı görüntüle @ 39763a16
...@@ -382,7 +382,7 @@ static void free_dbt(DBT *dbt) ...@@ -382,7 +382,7 @@ static void free_dbt(DBT *dbt)
/* Cleanup a Python buffer API view created by make_dbt() */ /* Cleanup a Python buffer API view created by make_dbt() */
static void free_buf_view(PyObject *obj, PyBuffer *view) static void free_buf_view(PyObject *obj, Py_buffer *view)
{ {
if (view) { if (view) {
PyObject_ReleaseBuffer(obj, view); PyObject_ReleaseBuffer(obj, view);
...@@ -400,13 +400,13 @@ static void free_buf_view(PyObject *obj, PyBuffer *view) ...@@ -400,13 +400,13 @@ static void free_buf_view(PyObject *obj, PyBuffer *view)
} while(0); } while(0);
static PyBuffer * _malloc_view(PyObject *obj) static Py_buffer * _malloc_view(PyObject *obj)
{ {
PyBuffer *view; Py_buffer *view;
if (!(view = PyMem_Malloc(sizeof(PyBuffer)))) { if (!(view = PyMem_Malloc(sizeof(Py_buffer)))) {
PyErr_SetString(PyExc_MemoryError, PyErr_SetString(PyExc_MemoryError,
"PyBuffer malloc failed"); "Py_buffer malloc failed");
return NULL; return NULL;
} }
/* XXX(gps): PyBUF_LOCKDATA is desired to prevent other theads from /* XXX(gps): PyBUF_LOCKDATA is desired to prevent other theads from
...@@ -429,11 +429,11 @@ static PyBuffer * _malloc_view(PyObject *obj) ...@@ -429,11 +429,11 @@ static PyBuffer * _malloc_view(PyObject *obj)
/* Create a DBT structure (containing key and data values) from Python /* Create a DBT structure (containing key and data values) from Python
strings. Returns >= 1 on success, 0 on an error. The returned_view_p strings. Returns >= 1 on success, 0 on an error. The returned_view_p
may be filled with a newly allocated PyBuffer view on success. may be filled with a newly allocated Py_buffer view on success.
The caller MUST call free_buf_view() on any returned PyBuffer. */ The caller MUST call free_buf_view() on any returned Py_buffer. */
static int make_dbt(PyObject* obj, DBT* dbt, PyBuffer** returned_view_p) static int make_dbt(PyObject* obj, DBT* dbt, Py_buffer** returned_view_p)
{ {
PyBuffer *view; Py_buffer *view;
/* simple way to ensure the caller can detect if we've returned a /* simple way to ensure the caller can detect if we've returned a
new buffer view or not: require their pointer to start out NULL. */ new buffer view or not: require their pointer to start out NULL. */
...@@ -464,14 +464,14 @@ static int make_dbt(PyObject* obj, DBT* dbt, PyBuffer** returned_view_p) ...@@ -464,14 +464,14 @@ static int make_dbt(PyObject* obj, DBT* dbt, PyBuffer** returned_view_p)
what's been given, verifies that it's allowed, and then makes the DBT. what's been given, verifies that it's allowed, and then makes the DBT.
Caller MUST call FREE_DBT_VIEW(keydbt, keyobj, key_view) with all Caller MUST call FREE_DBT_VIEW(keydbt, keyobj, key_view) with all
returned DBT and PyBuffer values when done. */ returned DBT and Py_buffer values when done. */
static int static int
make_key_dbt(DBObject* self, PyObject* keyobj, DBT* key, int* pflags, make_key_dbt(DBObject* self, PyObject* keyobj, DBT* key, int* pflags,
PyBuffer** returned_view_p) Py_buffer** returned_view_p)
{ {
db_recno_t recno; db_recno_t recno;
int type; int type;
PyBuffer *view; Py_buffer *view;
/* simple way to ensure the caller can detect if we've returned a /* simple way to ensure the caller can detect if we've returned a
new buffer view or not: require their pointer to start out NULL. */ new buffer view or not: require their pointer to start out NULL. */
...@@ -1221,7 +1221,7 @@ DB_append(DBObject* self, PyObject* args) ...@@ -1221,7 +1221,7 @@ DB_append(DBObject* self, PyObject* args)
{ {
PyObject* txnobj = NULL; PyObject* txnobj = NULL;
PyObject* dataobj; PyObject* dataobj;
PyBuffer* data_buf_view = NULL; Py_buffer* data_buf_view = NULL;
db_recno_t recno; db_recno_t recno;
DBT key, data; DBT key, data;
DB_TXN *txn = NULL; DB_TXN *txn = NULL;
...@@ -1534,7 +1534,7 @@ DB_delete(DBObject* self, PyObject* args, PyObject* kwargs) ...@@ -1534,7 +1534,7 @@ DB_delete(DBObject* self, PyObject* args, PyObject* kwargs)
PyObject* txnobj = NULL; PyObject* txnobj = NULL;
int flags = 0; int flags = 0;
PyObject* keyobj; PyObject* keyobj;
PyBuffer* key_buf_view = NULL; Py_buffer* key_buf_view = NULL;
DBT key; DBT key;
DB_TXN *txn = NULL; DB_TXN *txn = NULL;
static char* kwnames[] = { "key", "txn", "flags", NULL }; static char* kwnames[] = { "key", "txn", "flags", NULL };
...@@ -1585,7 +1585,7 @@ DB_get(DBObject* self, PyObject* args, PyObject* kwargs) ...@@ -1585,7 +1585,7 @@ DB_get(DBObject* self, PyObject* args, PyObject* kwargs)
PyObject* keyobj; PyObject* keyobj;
PyObject* dfltobj = NULL; PyObject* dfltobj = NULL;
PyObject* retval = NULL; PyObject* retval = NULL;
PyBuffer* key_buf_view = NULL; Py_buffer* key_buf_view = NULL;
int dlen = -1; int dlen = -1;
int doff = -1; int doff = -1;
DBT key, data; DBT key, data;
...@@ -1654,7 +1654,7 @@ DB_pget(DBObject* self, PyObject* args, PyObject* kwargs) ...@@ -1654,7 +1654,7 @@ DB_pget(DBObject* self, PyObject* args, PyObject* kwargs)
PyObject* keyobj; PyObject* keyobj;
PyObject* dfltobj = NULL; PyObject* dfltobj = NULL;
PyObject* retval = NULL; PyObject* retval = NULL;
PyBuffer* key_buf_view = NULL; Py_buffer* key_buf_view = NULL;
int dlen = -1; int dlen = -1;
int doff = -1; int doff = -1;
DBT key, pkey, data; DBT key, pkey, data;
...@@ -1758,7 +1758,7 @@ DB_get_size(DBObject* self, PyObject* args, PyObject* kwargs) ...@@ -1758,7 +1758,7 @@ DB_get_size(DBObject* self, PyObject* args, PyObject* kwargs)
PyObject* txnobj = NULL; PyObject* txnobj = NULL;
PyObject* keyobj; PyObject* keyobj;
PyObject* retval = NULL; PyObject* retval = NULL;
PyBuffer* key_buf_view = NULL; Py_buffer* key_buf_view = NULL;
DBT key, data; DBT key, data;
DB_TXN *txn = NULL; DB_TXN *txn = NULL;
static char* kwnames[] = { "key", "txn", NULL }; static char* kwnames[] = { "key", "txn", NULL };
...@@ -1802,8 +1802,8 @@ DB_get_both(DBObject* self, PyObject* args, PyObject* kwargs) ...@@ -1802,8 +1802,8 @@ DB_get_both(DBObject* self, PyObject* args, PyObject* kwargs)
PyObject* keyobj; PyObject* keyobj;
PyObject* dataobj; PyObject* dataobj;
PyObject* retval = NULL; PyObject* retval = NULL;
PyBuffer* data_buf_view = NULL; Py_buffer* data_buf_view = NULL;
PyBuffer* key_buf_view = NULL; Py_buffer* key_buf_view = NULL;
DBT key, data; DBT key, data;
void *orig_data; void *orig_data;
DB_TXN *txn = NULL; DB_TXN *txn = NULL;
...@@ -1969,7 +1969,7 @@ DB_key_range(DBObject* self, PyObject* args, PyObject* kwargs) ...@@ -1969,7 +1969,7 @@ DB_key_range(DBObject* self, PyObject* args, PyObject* kwargs)
int err, flags=0; int err, flags=0;
PyObject* txnobj = NULL; PyObject* txnobj = NULL;
PyObject* keyobj; PyObject* keyobj;
PyBuffer* key_buf_view = NULL; Py_buffer* key_buf_view = NULL;
DBT key; DBT key;
DB_TXN *txn = NULL; DB_TXN *txn = NULL;
DB_KEY_RANGE range; DB_KEY_RANGE range;
...@@ -2100,8 +2100,8 @@ DB_put(DBObject* self, PyObject* args, PyObject* kwargs) ...@@ -2100,8 +2100,8 @@ DB_put(DBObject* self, PyObject* args, PyObject* kwargs)
int dlen = -1; int dlen = -1;
int doff = -1; int doff = -1;
PyObject *keyobj, *dataobj, *retval; PyObject *keyobj, *dataobj, *retval;
PyBuffer *data_buf_view = NULL; Py_buffer *data_buf_view = NULL;
PyBuffer *key_buf_view = NULL; Py_buffer *key_buf_view = NULL;
DBT key, data; DBT key, data;
DB_TXN *txn = NULL; DB_TXN *txn = NULL;
static char* kwnames[] = { "key", "data", "txn", "flags", "dlen", static char* kwnames[] = { "key", "data", "txn", "flags", "dlen",
...@@ -2881,7 +2881,7 @@ PyObject* DB_subscript(DBObject* self, PyObject* keyobj) ...@@ -2881,7 +2881,7 @@ PyObject* DB_subscript(DBObject* self, PyObject* keyobj)
{ {
int err; int err;
PyObject* retval; PyObject* retval;
PyBuffer* key_buf_view = NULL; Py_buffer* key_buf_view = NULL;
DBT key; DBT key;
DBT data; DBT data;
...@@ -2920,8 +2920,8 @@ DB_ass_sub(DBObject* self, PyObject* keyobj, PyObject* dataobj) ...@@ -2920,8 +2920,8 @@ DB_ass_sub(DBObject* self, PyObject* keyobj, PyObject* dataobj)
DBT key, data; DBT key, data;
int retval; int retval;
int flags = 0; int flags = 0;
PyBuffer *data_buf_view = NULL; Py_buffer *data_buf_view = NULL;
PyBuffer *key_buf_view = NULL; Py_buffer *key_buf_view = NULL;
if (self->db == NULL) { if (self->db == NULL) {
PyObject *t = Py_BuildValue("(is)", 0, "DB object has been closed"); PyObject *t = Py_BuildValue("(is)", 0, "DB object has been closed");
...@@ -2966,7 +2966,7 @@ DB_has_key(DBObject* self, PyObject* args) ...@@ -2966,7 +2966,7 @@ DB_has_key(DBObject* self, PyObject* args)
{ {
int err; int err;
PyObject* keyobj; PyObject* keyobj;
PyBuffer* key_buf_view = NULL; Py_buffer* key_buf_view = NULL;
DBT key, data; DBT key, data;
PyObject* txnobj = NULL; PyObject* txnobj = NULL;
DB_TXN *txn = NULL; DB_TXN *txn = NULL;
...@@ -3263,8 +3263,8 @@ DBC_get(DBCursorObject* self, PyObject* args, PyObject *kwargs) ...@@ -3263,8 +3263,8 @@ DBC_get(DBCursorObject* self, PyObject* args, PyObject *kwargs)
PyObject* keyobj = NULL; PyObject* keyobj = NULL;
PyObject* dataobj = NULL; PyObject* dataobj = NULL;
PyObject* retval = NULL; PyObject* retval = NULL;
PyBuffer* data_buf_view = NULL; Py_buffer* data_buf_view = NULL;
PyBuffer* key_buf_view = NULL; Py_buffer* key_buf_view = NULL;
int dlen = -1; int dlen = -1;
int doff = -1; int doff = -1;
DBT key, data; DBT key, data;
...@@ -3354,8 +3354,8 @@ DBC_pget(DBCursorObject* self, PyObject* args, PyObject *kwargs) ...@@ -3354,8 +3354,8 @@ DBC_pget(DBCursorObject* self, PyObject* args, PyObject *kwargs)
PyObject* keyobj = NULL; PyObject* keyobj = NULL;
PyObject* dataobj = NULL; PyObject* dataobj = NULL;
PyObject* retval = NULL; PyObject* retval = NULL;
PyBuffer* data_buf_view = NULL; Py_buffer* data_buf_view = NULL;
PyBuffer* key_buf_view = NULL; Py_buffer* key_buf_view = NULL;
int dlen = -1; int dlen = -1;
int doff = -1; int doff = -1;
DBT key, pkey, data; DBT key, pkey, data;
...@@ -3517,8 +3517,8 @@ DBC_put(DBCursorObject* self, PyObject* args, PyObject* kwargs) ...@@ -3517,8 +3517,8 @@ DBC_put(DBCursorObject* self, PyObject* args, PyObject* kwargs)
{ {
int err, flags = 0; int err, flags = 0;
PyObject *keyobj, *dataobj; PyObject *keyobj, *dataobj;
PyBuffer *data_buf_view = NULL; Py_buffer *data_buf_view = NULL;
PyBuffer *key_buf_view = NULL; Py_buffer *key_buf_view = NULL;
DBT key, data; DBT key, data;
static char* kwnames[] = { "key", "data", "flags", "dlen", "doff", static char* kwnames[] = { "key", "data", "flags", "dlen", "doff",
NULL }; NULL };
...@@ -3558,7 +3558,7 @@ DBC_set(DBCursorObject* self, PyObject* args, PyObject *kwargs) ...@@ -3558,7 +3558,7 @@ DBC_set(DBCursorObject* self, PyObject* args, PyObject *kwargs)
int err, flags = 0; int err, flags = 0;
DBT key, data; DBT key, data;
PyObject *retval, *keyobj; PyObject *retval, *keyobj;
PyBuffer *key_buf_view = NULL; Py_buffer *key_buf_view = NULL;
static char* kwnames[] = { "key", "flags", "dlen", "doff", NULL }; static char* kwnames[] = { "key", "flags", "dlen", "doff", NULL };
int dlen = -1; int dlen = -1;
int doff = -1; int doff = -1;
...@@ -3630,7 +3630,7 @@ DBC_set_range(DBCursorObject* self, PyObject* args, PyObject* kwargs) ...@@ -3630,7 +3630,7 @@ DBC_set_range(DBCursorObject* self, PyObject* args, PyObject* kwargs)
int err, flags = 0; int err, flags = 0;
DBT key, data; DBT key, data;
PyObject *retval, *keyobj; PyObject *retval, *keyobj;
PyBuffer *key_buf_view = NULL; Py_buffer *key_buf_view = NULL;
static char* kwnames[] = { "key", "flags", "dlen", "doff", NULL }; static char* kwnames[] = { "key", "flags", "dlen", "doff", NULL };
int dlen = -1; int dlen = -1;
int doff = -1; int doff = -1;
...@@ -3705,8 +3705,8 @@ _DBC_get_set_both(DBCursorObject* self, PyObject* keyobj, PyObject* dataobj, ...@@ -3705,8 +3705,8 @@ _DBC_get_set_both(DBCursorObject* self, PyObject* keyobj, PyObject* dataobj,
int err; int err;
DBT key, data; DBT key, data;
PyObject *retval; PyObject *retval;
PyBuffer *data_buf_view = NULL; Py_buffer *data_buf_view = NULL;
PyBuffer *key_buf_view = NULL; Py_buffer *key_buf_view = NULL;
/* 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, &key_buf_view)) if (!make_key_dbt(self->mydb, keyobj, &key, NULL, &key_buf_view))
...@@ -4480,7 +4480,7 @@ DBEnv_lock_get(DBEnvObject* self, PyObject* args) ...@@ -4480,7 +4480,7 @@ DBEnv_lock_get(DBEnvObject* self, PyObject* args)
int locker, lock_mode; int locker, lock_mode;
DBT obj; DBT obj;
PyObject *objobj, *retval; PyObject *objobj, *retval;
PyBuffer *obj_buf_view = NULL; Py_buffer *obj_buf_view = NULL;
if (!PyArg_ParseTuple(args, "iOi|i:lock_get", &locker, &objobj, &lock_mode, &flags)) if (!PyArg_ParseTuple(args, "iOi|i:lock_get", &locker, &objobj, &lock_mode, &flags))
return NULL; return NULL;
...@@ -5057,7 +5057,7 @@ DBSequence_open(DBSequenceObject* self, PyObject* args, PyObject* kwargs) ...@@ -5057,7 +5057,7 @@ DBSequence_open(DBSequenceObject* self, PyObject* args, PyObject* kwargs)
{ {
int err, flags = 0; int err, flags = 0;
PyObject *keyobj; PyObject *keyobj;
PyBuffer *key_buf_view = NULL; Py_buffer *key_buf_view = NULL;
PyObject *txnobj = NULL; PyObject *txnobj = NULL;
DB_TXN *txn = NULL; DB_TXN *txn = NULL;
DBT key; DBT key;
......
PC/_winreg.c
Dosyayı görüntüle @ 39763a16
...@@ -773,7 +773,7 @@ Py2Reg(PyObject *value, DWORD typ, BYTE **retDataBuf, DWORD *retDataSize) ...@@ -773,7 +773,7 @@ Py2Reg(PyObject *value, DWORD typ, BYTE **retDataBuf, DWORD *retDataSize)
if (value == Py_None) if (value == Py_None)
*retDataSize = 0; *retDataSize = 0;
else { else {
PyBuffer view; Py_buffer view;
if (!PyObject_CheckBuffer(value)) { if (!PyObject_CheckBuffer(value)) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment