Skip to content

Commit 8c92d08

Browse files
committed
Fix naming of unsplit -> combined
1 parent b9f691a commit 8c92d08

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Objects/dictobject.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1278,7 +1278,7 @@ insert_into_dictkeys(PyDictKeysObject *keys, PyObject *name)
12781278

12791279

12801280
static inline int
1281-
insert_unsplit_dict(PyInterpreterState *interp, PyDictObject *mp,
1281+
insert_combined_dict(PyInterpreterState *interp, PyDictObject *mp,
12821282
Py_hash_t hash, PyObject *key, PyObject *value, int unicode)
12831283
{
12841284
if (mp->ma_keys->dk_usable <= 0) {
@@ -1325,7 +1325,7 @@ insert_split_dict(PyInterpreterState *interp, PyDictObject *mp,
13251325
assert(!_PyDict_HasSplitTable(mp));
13261326
assert(DK_IS_UNICODE(keys));
13271327
UNLOCK_KEYS(keys);
1328-
return insert_unsplit_dict(interp, mp, hash, key, value, 1);
1328+
return insert_combined_dict(interp, mp, hash, key, value, 1);
13291329
}
13301330

13311331
Py_ssize_t hashpos = find_empty_slot(keys, hash);
@@ -1406,7 +1406,7 @@ insertdict(PyInterpreterState *interp, PyDictObject *mp,
14061406

14071407
int unicode = DK_IS_UNICODE(mp->ma_keys);
14081408
if (!unicode || !_PyDict_HasSplitTable(mp)) {
1409-
if (insert_unsplit_dict(interp, mp, hash, key, value, unicode) < 0) {
1409+
if (insert_combined_dict(interp, mp, hash, key, value, unicode) < 0) {
14101410
goto Fail;
14111411
}
14121412
} else {
@@ -3819,7 +3819,7 @@ dict_setdefault_ref_lock_held(PyObject *d, PyObject *key, PyObject *default_valu
38193819

38203820
int unicode = DK_IS_UNICODE(mp->ma_keys);
38213821
if (!unicode || !_PyDict_HasSplitTable(mp)) {
3822-
if (insert_unsplit_dict(interp, mp, hash, Py_NewRef(key), Py_NewRef(value), unicode) < 0) {
3822+
if (insert_combined_dict(interp, mp, hash, Py_NewRef(key), Py_NewRef(value), unicode) < 0) {
38233823
Py_DECREF(key);
38243824
Py_DECREF(value);
38253825
if (result) {

0 commit comments

Comments
 (0)