Skip to content

Commit 4da5161

Browse files
committed
Fix naming of unsplit -> combined
1 parent b865e2c commit 4da5161

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
@@ -1257,7 +1257,7 @@ insert_into_dictkeys(PyDictKeysObject *keys, PyObject *name)
12571257

12581258

12591259
static inline int
1260-
insert_unsplit_dict(PyInterpreterState *interp, PyDictObject *mp,
1260+
insert_combined_dict(PyInterpreterState *interp, PyDictObject *mp,
12611261
Py_hash_t hash, PyObject *key, PyObject *value, int unicode)
12621262
{
12631263
if (mp->ma_keys->dk_usable <= 0) {
@@ -1304,7 +1304,7 @@ insert_split_dict(PyInterpreterState *interp, PyDictObject *mp,
13041304
assert(!_PyDict_HasSplitTable(mp));
13051305
assert(DK_IS_UNICODE(keys));
13061306
UNLOCK_KEYS(keys);
1307-
return insert_unsplit_dict(interp, mp, hash, key, value, 1);
1307+
return insert_combined_dict(interp, mp, hash, key, value, 1);
13081308
}
13091309

13101310
Py_ssize_t hashpos = find_empty_slot(keys, hash);
@@ -1383,7 +1383,7 @@ insertdict(PyInterpreterState *interp, PyDictObject *mp,
13831383

13841384
int unicode = DK_IS_UNICODE(mp->ma_keys);
13851385
if (!unicode || !_PyDict_HasSplitTable(mp)) {
1386-
if (insert_unsplit_dict(interp, mp, hash, key, value, unicode) < 0) {
1386+
if (insert_combined_dict(interp, mp, hash, key, value, unicode) < 0) {
13871387
goto Fail;
13881388
}
13891389
} else {
@@ -3526,7 +3526,7 @@ PyDict_SetDefault(PyObject *d, PyObject *key, PyObject *defaultobj)
35263526

35273527
int unicode = DK_IS_UNICODE(mp->ma_keys);
35283528
if (!unicode || !_PyDict_HasSplitTable(mp)) {
3529-
if (insert_unsplit_dict(interp, mp, hash, Py_NewRef(key), Py_NewRef(value), unicode) < 0) {
3529+
if (insert_combined_dict(interp, mp, hash, Py_NewRef(key), Py_NewRef(value), unicode) < 0) {
35303530
Py_DECREF(key);
35313531
Py_DECREF(value);
35323532
return NULL;

0 commit comments

Comments
 (0)