@@ -1456,11 +1456,9 @@ bytes_concat(PyObject *a, PyObject *b)
1456
1456
}
1457
1457
1458
1458
static PyObject *
1459
- bytes_repeat (PyBytesObject * a , Py_ssize_t n )
1459
+ bytes_repeat (PyObject * self , Py_ssize_t n )
1460
1460
{
1461
- Py_ssize_t size ;
1462
- PyBytesObject * op ;
1463
- size_t nbytes ;
1461
+ PyBytesObject * a = (PyBytesObject * )self ;
1464
1462
if (n < 0 )
1465
1463
n = 0 ;
1466
1464
/* watch out for overflows: the size can overflow int,
@@ -1471,16 +1469,17 @@ bytes_repeat(PyBytesObject *a, Py_ssize_t n)
1471
1469
"repeated bytes are too long" );
1472
1470
return NULL ;
1473
1471
}
1474
- size = Py_SIZE (a ) * n ;
1472
+ Py_ssize_t size = Py_SIZE (a ) * n ;
1475
1473
if (size == Py_SIZE (a ) && PyBytes_CheckExact (a )) {
1476
1474
return Py_NewRef (a );
1477
1475
}
1478
- nbytes = (size_t )size ;
1476
+ size_t nbytes = (size_t )size ;
1479
1477
if (nbytes + PyBytesObject_SIZE <= nbytes ) {
1480
1478
PyErr_SetString (PyExc_OverflowError ,
1481
1479
"repeated bytes are too long" );
1482
1480
return NULL ;
1483
1481
}
1482
+ PyBytesObject * op ;
1484
1483
op = (PyBytesObject * )PyObject_Malloc (PyBytesObject_SIZE + nbytes );
1485
1484
if (op == NULL ) {
1486
1485
return PyErr_NoMemory ();
@@ -1531,8 +1530,10 @@ bytes_compare_eq(PyBytesObject *a, PyBytesObject *b)
1531
1530
}
1532
1531
1533
1532
static PyObject *
1534
- bytes_richcompare (PyBytesObject * a , PyBytesObject * b , int op )
1533
+ bytes_richcompare (PyObject * arg , PyObject * arg2 , int op )
1535
1534
{
1535
+ PyBytesObject * a = (PyBytesObject * )arg ;
1536
+ PyBytesObject * b = (PyBytesObject * )arg2 ;
1536
1537
int c ;
1537
1538
Py_ssize_t len_a , len_b ;
1538
1539
Py_ssize_t min_len ;
@@ -1592,8 +1593,9 @@ bytes_richcompare(PyBytesObject *a, PyBytesObject *b, int op)
1592
1593
}
1593
1594
1594
1595
static Py_hash_t
1595
- bytes_hash (PyBytesObject * a )
1596
+ bytes_hash (PyObject * op )
1596
1597
{
1598
+ PyBytesObject * a = (PyBytesObject * )op ;
1597
1599
_Py_COMP_DIAG_PUSH
1598
1600
_Py_COMP_DIAG_IGNORE_DEPR_DECLS
1599
1601
if (a -> ob_shash == -1 ) {
@@ -1605,8 +1607,9 @@ _Py_COMP_DIAG_POP
1605
1607
}
1606
1608
1607
1609
static PyObject *
1608
- bytes_subscript (PyBytesObject * self , PyObject * item )
1610
+ bytes_subscript (PyObject * op , PyObject * item )
1609
1611
{
1612
+ PyBytesObject * self = (PyBytesObject * )op ;
1610
1613
if (_PyIndex_Check (item )) {
1611
1614
Py_ssize_t i = PyNumber_AsSsize_t (item , PyExc_IndexError );
1612
1615
if (i == -1 && PyErr_Occurred ())
@@ -1670,8 +1673,9 @@ bytes_subscript(PyBytesObject* self, PyObject* item)
1670
1673
}
1671
1674
1672
1675
static int
1673
- bytes_buffer_getbuffer (PyBytesObject * self , Py_buffer * view , int flags )
1676
+ bytes_buffer_getbuffer (PyObject * op , Py_buffer * view , int flags )
1674
1677
{
1678
+ PyBytesObject * self = (PyBytesObject * )op ;
1675
1679
return PyBuffer_FillInfo (view , (PyObject * )self , (void * )self -> ob_sval , Py_SIZE (self ),
1676
1680
1 , flags );
1677
1681
}
0 commit comments