8000 Make Modules/_bsddb.c and PC/_winreg.c compile again by renaming · python/cpython@39763a1 · GitHub
[go: up one dir, main page]
Skip to content

Commit 39763a1

Browse files
author
Thomas Heller
committed
Make Modules/_bsddb.c and PC/_winreg.c compile again by renaming
PyBuffer into Py_buffer.
1 parent 4d8c193 commit 39763a1

File tree

2 files changed

+39
-39
lines changed

2 files changed

+39
-39
lines changed

‎Modules/_bsddb.c

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ static void free_dbt(DBT *dbt)
382382

383383

384384
/* Cleanup a Python buffer API view created by make_dbt() */
385-
static void free_buf_view(PyObject *obj, PyBuffer *view)
385+
static void free_buf_view(PyObject *obj, Py_buffer *view)
386386
{
387387
if (view) {
388388
PyObject_ReleaseBuffer(obj, view);
@@ -400,13 +400,13 @@ static void free_buf_view(PyObject *obj, PyBuffer *view)
400400
} while(0);
401401

402402

403-
static PyBuffer * _malloc_view(PyObject *obj)
403+
static Py_buffer * _malloc_view(PyObject *obj)
404404
{
405-
PyBuffer *view;
405+
Py_buffer *view;
406406

407-
if (!(view = PyMem_Malloc(sizeof(PyBuffer)))) {
407+
if (!(view = PyMem_Malloc(sizeof(Py_buffer)))) {
408408
PyErr_SetString(PyExc_MemoryError,
409-
"PyBuffer malloc failed");
409+
"Py_buffer malloc failed");
410410
return NULL;
411411
}
412412
/* XXX(gps): PyBUF_LOCKDATA is desired to prevent other theads from
@@ -429,11 +429,11 @@ static PyBuffer * _malloc_view(PyObject *obj)
429429

430430
/* Create a DBT structure (containing key and data values) from Python
431431
strings. Returns >= 1 on success, 0 on an error. The returned_view_p
432-
may be filled with a newly allocated PyBuffer view on success.
433-
The caller MUST call free_buf_view() on any returned PyBuffer. */
434-
static int make_dbt(PyObject* obj, DBT* dbt, PyBuffer** returned_view_p)
432+
may be filled with a newly allocated Py_buffer view on success.
433+
The caller MUST call free_buf_view() on any returned Py_buffer. */
434+
static int make_dbt(PyObject* obj, DBT* dbt, Py_buffer** returned_view_p)
435435
{
436-
PyBuffer *view;
436+
Py_buffer *view;
437437

438438
/* simple way to ensure the caller can detect if we've returned a
439439
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)
464464
what's been given, verifies that it's allowed, and then makes the DBT.
465465
466466
Caller MUST call FREE_DBT_VIEW(keydbt, keyobj, key_view) with all
467-
returned DBT and PyBuffer values when done. */
467+
returned DBT and Py_buffer values when done. */
468468
static int
469469
make_key_dbt(DBObject* self, PyObject* keyobj, DBT* key, int* pflags,
470-
PyBuffer** returned_view_p)
470+
Py_buffer** returned_view_p)
471471
{
472472
db_recno_t recno;
473473
int type;
474-
PyBuffer *view;
474+
Py_buffer *view;
475475

476476
/* simple way to ensure the caller can detect if we've returned a
477477
new buffer view or not: require their pointer to start out NULL. */
@@ -1221,7 +1221,7 @@ DB_append(DBObject* self, PyObject* args)
12211221
{
12221222
PyObject* txnobj = NULL;
12231223
PyObject* dataobj;
1224-
PyBuffer* data_buf_view = NULL;
1224+
Py_buffer* data_buf_view = NULL;
12251225
db_recno_t recno;
12261226
DBT key, data;
12271227
DB_TXN *txn = NULL;
@@ -1534,7 +1534,7 @@ DB_delete(DBObject* self, PyObject* args, PyObject* kwargs)
15341534
PyObject* txnobj = NULL;
15351535
int flags = 0;
15361536
PyObject* keyobj;
1537-
PyBuffer* key_buf_view = NULL;
1537+
Py_buffer* key_buf_view = NULL;
15381538
DBT key;
15391539
DB_TXN *txn = NULL;
15401540
static char* kwnames[] = { "key", "txn", "flags", NULL };
@@ -1585,7 +1585,7 @@ DB_get(DBObject* self, PyObject* args, PyObject* kwargs)
15851585
PyObject* keyobj;
15861586
PyObject* dfltobj = NULL;
15871587
PyObject* retval = NULL;
1588-
PyBuffer* key_buf_view = NULL;
1588+
Py_buffer* key_buf_view = NULL;
15891589
int dlen = -1;
15901590
int doff = -1;
15911591
DBT key, data;
@@ -1654,7 +1654,7 @@ DB_pget(DBObject* self, PyObject* args, PyObject* kwargs)
16541654
PyObject* keyobj;
16551655
PyObject* dfltobj = NULL;
16561656
PyObject* retval = NULL;
1657-
PyBuffer* key_buf_view = NULL;
1657+
Py_buffer* key_buf_view = NULL;
16581658
int dlen = -1;
16591659
int doff = -1;
16601660
DBT key, pkey, data;
@@ -1758,7 +1758,7 @@ DB_get_size(DBObject* self, PyObject* args, PyObject* kwargs)
17581758
PyObject* txnobj = NULL;
17591759
PyObject* keyobj;
17601760
PyObject* retval = NULL;
1761-
PyBuffer* key_buf_view = NULL;
1761+
Py_buffer* key_buf_view = NULL;
17621762
DBT key, data;
17631763
DB_TXN *txn = NULL;
17641764
static char* kwnames[] = { "key", "txn", NULL };
@@ -1802,8 +1802,8 @@ DB_get_both(DBObject* self, PyObject* args, PyObject* kwargs)
18021802
PyObject* keyobj;
18031803
PyObject* dataobj;
18041804
PyObject* retval = NULL;
1805-
PyBuffer* data_buf_view = NULL;
1806-
PyBuffer* key_buf_view = NULL;
1805+
Py_buffer* data_buf_view = NULL;
1806+
Py_buffer* key_buf_view = NULL;
18071807
DBT key, data;
18081808
void *orig_data;
18091809
DB_TXN *txn = NULL;
@@ -1969,7 +1969,7 @@ DB_key_range(DBObject* self, PyObject* args, PyObject* kwargs)
19691969
int err, flags=0;
19701970
PyObject* txnobj = NULL;
19711971
PyObject* keyobj;
1972-
PyBuffer* key_buf_view = NULL;
1972+
Py_buffer* key_buf_view = NULL;
19731973
DBT key;
19741974
DB_TXN *txn = NULL;
19751975
DB_KEY_RANGE range;
@@ -2100,8 +2100,8 @@ DB_put(DBObject* self, PyObject* args, PyObject* kwargs)
21002100
int dlen = -1;
21012101
int doff = -1;
21022102
PyObject *keyobj, *dataobj, *retval;
2103-
PyBuffer *data_buf_view = NULL;
2104-
PyBuffer *key_buf_view = NULL;
2103+
Py_buffer *data_buf_view = NULL;
2104+
Py_buffer *key_buf_view = NULL;
21052105
DBT key, data;
21062106
DB_TXN *txn = NULL;
21072107
static char* kwnames[] = { "key", "data", "txn", "flags", "dlen",
@@ -2881,7 +2881,7 @@ PyObject* DB_subscript(DBObject* self, PyObject* keyobj)
28812881
{
28822882
int err;
28832883
PyObject* retval;
2884-
PyBuffer* key_buf_view = NULL;
2884+
Py_buffer* key_buf_view = NULL;
28852885
DBT key;
28862886
DBT data;
28872887

@@ -2920,8 +2920,8 @@ DB_ass_sub(DBObject* self, PyObject* keyobj, PyObject* dataobj)
29202920
DBT key, data;
29212921
int retval;
29222922
int flags = 0;
2923-
PyBuffer *data_buf_view = NULL;
2924-
PyBuffer *key_buf_view = NULL;
2923+
Py_buffer *data_buf_view = NULL;
2924+
Py_buffer *key_buf_view = NULL;
29252925

29262926
if (self->db == NULL) {
29272927
PyObject *t = Py_BuildValue("(is)", 0, "DB object has been closed");
@@ -2966,7 +2966,7 @@ DB_has_key(DBObject* self, PyObject* args)
29662966
{
29672967
int err;
29682968
PyObject* keyobj;
2969-
PyBuffer* key_buf_view = NULL;
2969+
Py_buffer* key_buf_view = NULL;
29702970
DBT key, data;
29712971
PyObject* txnobj = NULL;
29722972
DB_TXN *txn = NULL;
@@ -3263,8 +3263,8 @@ DBC_get(DBCursorObject* self, PyObject* args, PyObject *kwargs)
32633263
PyObject* keyobj = NULL;
32643264
PyObject* dataobj = NULL;
32653265
PyObject* retval = NULL;
3266-
PyBuffer* data_buf_view = NULL;
3267-
PyBuffer* key_buf_view = NULL;
3266+
Py_buffer* data_buf_view = NULL;
3267+
Py_buffer* key_buf_view = NULL;
32683268
int dlen = -1;
32693269
int doff = -1;
32703270
DBT key, data;
@@ -3354,8 +3354,8 @@ DBC_pget(DBCursorObject* self, PyObject* args, PyObject *kwargs)
33543354
PyObject* keyobj = NULL;
33553355
PyObject* dataobj = NULL;
33563356
PyObject* retval = NULL;
3357-
PyBuffer* data_buf_view = NULL;
3358-
PyBuffer* key_buf_view = NULL;
3357+
Py_buffer* data_buf_view = NULL;
3358+
Py_buffer* key_buf_view = NULL;
33593359
int dlen = -1;
33603360
int doff = -1;
33613361
DBT key, pkey, data;
@@ -3517,8 +3517,8 @@ DBC_put(DBCursorObject* self, PyObject* args, PyObject* kwargs)
35173517
{
35183518
int err, flags = 0;
35193519
PyObject *keyobj, *dataobj;
3520-
PyBuffer *data_buf_view = NULL;
3521-
PyBuffer *key_buf_view = NULL;
3520+
Py_buffer *data_buf_view = NULL;
3521+
Py_buffer *key_buf_view = NULL;
35223522
DBT key, data;
35233523
static char* kwnames[] = { "key", "data", "flags", "dlen", "doff",
35243524
NULL };
@@ -3558,7 +3558,7 @@ DBC_set(DBCursorObject* self, PyObject* args, PyObject *kwargs)
35583558
int err, flags = 0;
35593559
DBT key, data;
35603560
PyObject *retval, *keyobj;
3561-
PyBuffer *key_buf_view = NULL;
3561+
Py_buffer *key_buf_view = NULL;
35623562
static char* kwnames[] = { "key", "flags", "dlen", "doff", NULL };
35633563
int dlen = -1;
35643564
int doff = -1;
@@ -3630,7 +3630,7 @@ DBC_set_range(DBCursorObject* self, PyObject* args, PyObject* kwargs)
36303630
int err, flags = 0;
36313631
DBT key, data;
36323632
PyObject *retval, *keyobj;
3633-
PyBuffer *key_buf_view = NULL;
3633+
Py_buffer *key_buf_view = NULL;
36343634
static char* kwnames[] = { "key", "flags", "dlen", "doff", NULL };
36353635
int dlen = -1;
36363636
int doff = -1;
@@ -3705,8 +3705,8 @@ _DBC_get_set_both(DBCursorObject* self, PyObject* keyobj, PyObject* dataobj,
37053705
int err;
37063706
DBT key, data;
37073707
PyObject *retval;
3708-
PyBuffer *data_buf_view = NULL;
3709-
PyBuffer *key_buf_view = NULL;
3708+
Py_buffer *data_buf_view = NULL;
3709+
Py_buffer *key_buf_view = NULL;
37103710

37113711
/* the caller did this: CHECK_CURSOR_NOT_CLOSED(self); */
37123712
if (!make_key_dbt(self->mydb, keyobj, &key, NULL, &key_buf_view))
@@ -4480,7 +4480,7 @@ DBEnv_lock_get(DBEnvObject* self, PyObject* args)
44804480
int locker, lock_mode;
44814481
DBT obj;
44824482
PyObject *objobj, *retval;
4483-
PyBuffer *obj_buf_view = NULL;
4483+
Py_buffer *obj_buf_view = NULL;
44844484

44854485
if (!PyArg_ParseTuple(args, "iOi|i:lock_get", &locker, &objobj, &lock_mode, &flags))
44864486
return NULL;
@@ -5057,7 +5057,7 @@ DBSequence_open(DBSequenceObject* self, PyObject* args, PyObject* kwargs)
50575057
{
50585058
int err, flags = 0;
50595059
PyObject *keyobj;
5060-
PyBuffer *key_buf_view = NULL;
5060+
Py_buffer *key_buf_view = NULL;
50615061
PyObject *txnobj = NULL;
50625062
DB_TXN *txn = NULL;
50635063
DBT key;

‎PC/_winreg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ Py2Reg(PyObject *value, DWORD typ, BYTE **retDataBuf, DWORD *retDataSize)
773773
if (value == Py_None)
774774
*retDataSize = 0;
775775
else {
776-
PyBuffer view;
776+
Py_buffer view;
777777

778778
if (!PyObject_CheckBuffer(value)) {
779779
PyErr_Format(PyExc_TypeError,

0 commit comments

Comments
 (0)
0