mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Issue #18722: Remove uses of the "register" keyword in C code.

Browse source
This commit is contained in:
Antoine Pitrou 2013-08-13 20:18:52 +02:00
parent 9eaa3e6732
commit 9ed5f27266
38 changed files with 288 additions and 286 deletions
Download patch file Download diff file Expand all files Collapse all files

74
Objects/setobject.c
View file

@ -75,15 +75,15 @@ NULL if the rich comparison returns an error.
*/
static setentry *
set_lookkey(PySetObject *so, PyObject *key, register Py_hash_t hash)
set_lookkey(PySetObject *so, PyObject *key, Py_hash_t hash)
{
register size_t i; /* Unsigned for defined overflow behavior. */
register size_t perturb;
register setentry *freeslot;
register size_t mask = so->mask;
size_t i; /* Unsigned for defined overflow behavior. */
size_t perturb;
setentry *freeslot;
size_t mask = so->mask;
setentry *table = so->table;
register setentry *entry;
register int cmp;
setentry *entry;
int cmp;
PyObject *startkey;
i = (size_t)hash & mask;
@ -157,14 +157,14 @@ set_lookkey(PySetObject *so, PyObject *key, register Py_hash_t hash)
* see if the comparison altered the table.
*/
static setentry *
set_lookkey_unicode(PySetObject *so, PyObject *key, register Py_hash_t hash)
set_lookkey_unicode(PySetObject *so, PyObject *key, Py_hash_t hash)
{
register size_t i; /* Unsigned for defined overflow behavior. */
register size_t perturb;
register setentry *freeslot;
register size_t mask = so->mask;
size_t i; /* Unsigned for defined overflow behavior. */
size_t perturb;
setentry *freeslot;
size_t mask = so->mask;
setentry *table = so->table;
register setentry *entry;
setentry *entry;
/* Make sure this function doesn't have to handle non-unicode keys,
including subclasses of str; e.g., one reason to subclass
@ -211,9 +211,9 @@ Used by the public insert routine.
Eats a reference to key.
*/
static int
set_insert_key(register PySetObject *so, PyObject *key, Py_hash_t hash)
set_insert_key(PySetObject *so, PyObject *key, Py_hash_t hash)
{
register setentry *entry;
setentry *entry;
assert(so->lookup != NULL);
entry = so->lookup(so, key, hash);
@ -247,13 +247,13 @@ Note that no refcounts are changed by this routine; if needed, the caller
is responsible for incref'ing `key`.
*/
static void
set_insert_clean(register PySetObject *so, PyObject *key, Py_hash_t hash)
set_insert_clean(PySetObject *so, PyObject *key, Py_hash_t hash)
{
register size_t i;
register size_t perturb;
register size_t mask = (size_t)so->mask;
size_t i;
size_t perturb;
size_t mask = (size_t)so->mask;
setentry *table = so->table;
register setentry *entry;
setentry *entry;
i = (size_t)hash & mask;
entry = &table[i];
@ -360,9 +360,9 @@ set_table_resize(PySetObject *so, Py_ssize_t minused)
/* CAUTION: set_add_key/entry() must guarantee it won't resize the table */
static int
set_add_entry(register PySetObject *so, setentry *entry)
set_add_entry(PySetObject *so, setentry *entry)
{
register Py_ssize_t n_used;
Py_ssize_t n_used;
PyObject *key = entry->key;
Py_hash_t hash = entry->hash;
@ -379,10 +379,10 @@ set_add_entry(register PySetObject *so, setentry *entry)
}
static int
set_add_key(register PySetObject *so, PyObject *key)
set_add_key(PySetObject *so, PyObject *key)
{
register Py_hash_t hash;
register Py_ssize_t n_used;
Py_hash_t hash;
Py_ssize_t n_used;
if (!PyUnicode_CheckExact(key) ||
(hash = ((PyASCIIObject *) key)->hash) == -1) {
@ -407,7 +407,7 @@ set_add_key(register PySetObject *so, PyObject *key)
static int
set_discard_entry(PySetObject *so, setentry *oldentry)
{ register setentry *entry;
{ setentry *entry;
PyObject *old_key;
entry = (so->lookup)(so, oldentry->key, oldentry->hash);
@ -426,8 +426,8 @@ set_discard_entry(PySetObject *so, setentry *oldentry)
static int
set_discard_key(PySetObject *so, PyObject *key)
{
register Py_hash_t hash;
register setentry *entry;
Py_hash_t hash;
setentry *entry;
PyObject *old_key;
assert (PyAnySet_Check(so));
@ -533,7 +533,7 @@ set_next(PySetObject *so, Py_ssize_t *pos_ptr, setentry **entry_ptr)
{
Py_ssize_t i;
Py_ssize_t mask;
register setentry *table;
setentry *table;
assert (PyAnySet_Check(so));
i = *pos_ptr;
@ -553,7 +553,7 @@ set_next(PySetObject *so, Py_ssize_t *pos_ptr, setentry **entry_ptr)
static void
set_dealloc(PySetObject *so)
{
register setentry *entry;
setentry *entry;
Py_ssize_t fill = so->fill;
PyObject_GC_UnTrack(so);
Py_TRASHCAN_SAFE_BEGIN(so)
@ -632,8 +632,8 @@ set_merge(PySetObject *so, PyObject *otherset)
PySetObject *other;
PyObject *key;
Py_hash_t hash;
register Py_ssize_t i;
register setentry *entry;
Py_ssize_t i;
setentry *entry;
assert (PyAnySet_Check(so));
assert (PyAnySet_Check(otherset));
@ -701,8 +701,8 @@ set_contains_entry(PySetObject *so, setentry *entry)
static PyObject *
set_pop(PySetObject *so)
{
register Py_ssize_t i = 0;
register setentry *entry;
Py_ssize_t i = 0;
setentry *entry;
PyObject *key;
assert (PyAnySet_Check(so));
@ -869,8 +869,8 @@ static PyMethodDef setiter_methods[] = {
static PyObject *setiter_iternext(setiterobject *si)
{
PyObject *key;
register Py_ssize_t i, mask;
register setentry *entry;
Py_ssize_t i, mask;
setentry *entry;
PySetObject *so = si->si_set;
if (so == NULL)
@ -1024,7 +1024,7 @@ PyDoc_STRVAR(update_doc,
static PyObject *
make_new_set(PyTypeObject *type, PyObject *iterable)
{
register PySetObject *so = NULL;
PySetObject *so = NULL;
if (dummy == NULL) { /* Auto-initialize dummy */
dummy = PyUnicode_FromString("<dummy key>");