Commit d679811f authored by Victor Stinner's avatar Victor Stinner

Issue #21036: Fix typo in macro name

_PY_HASHTABLE_ENTRY_DATA => _Py_HASHTABLE_ENTRY_DATA
parent 09ef03b5
...@@ -1052,7 +1052,7 @@ tracemalloc_get_traces_fill(_Py_hashtable_entry_t *entry, void *user_data) ...@@ -1052,7 +1052,7 @@ tracemalloc_get_traces_fill(_Py_hashtable_entry_t *entry, void *user_data)
PyObject *tracemalloc_obj; PyObject *tracemalloc_obj;
int res; int res;
trace = (trace_t *)_PY_HASHTABLE_ENTRY_DATA(entry); trace = (trace_t *)_Py_HASHTABLE_ENTRY_DATA(entry);
tracemalloc_obj = trace_to_pyobject(trace, get_traces->tracebacks); tracemalloc_obj = trace_to_pyobject(trace, get_traces->tracebacks);
if (tracemalloc_obj == NULL) if (tracemalloc_obj == NULL)
......
...@@ -326,7 +326,7 @@ _Py_hashtable_set(_Py_hashtable_t *ht, const void *key, ...@@ -326,7 +326,7 @@ _Py_hashtable_set(_Py_hashtable_t *ht, const void *key,
entry->key_hash = key_hash; entry->key_hash = key_hash;
assert(data_size == ht->data_size); assert(data_size == ht->data_size);
memcpy(_PY_HASHTABLE_ENTRY_DATA(entry), data, data_size); memcpy(_Py_HASHTABLE_ENTRY_DATA(entry), data, data_size);
_Py_slist_prepend(&ht->buckets[index], (_Py_slist_item_t*)entry); _Py_slist_prepend(&ht->buckets[index], (_Py_slist_item_t*)entry);
ht->entries++; ht->entries++;
...@@ -504,7 +504,7 @@ _Py_hashtable_copy(_Py_hashtable_t *src) ...@@ -504,7 +504,7 @@ _Py_hashtable_copy(_Py_hashtable_t *src)
err = 1; err = 1;
} }
else { else {
data = _PY_HASHTABLE_ENTRY_DATA(entry); data = _Py_HASHTABLE_ENTRY_DATA(entry);
err = _Py_hashtable_set(dst, entry->key, data, src->data_size); err = _Py_hashtable_set(dst, entry->key, data, src->data_size);
} }
if (err) { if (err) {
......
...@@ -26,16 +26,16 @@ typedef struct { ...@@ -26,16 +26,16 @@ typedef struct {
/* data follows */ /* data follows */
} _Py_hashtable_entry_t; } _Py_hashtable_entry_t;
#define _PY_HASHTABLE_ENTRY_DATA(ENTRY) \ #define _Py_HASHTABLE_ENTRY_DATA(ENTRY) \
((char *)(ENTRY) + sizeof(_Py_hashtable_entry_t)) ((char *)(ENTRY) + sizeof(_Py_hashtable_entry_t))
#define _Py_HASHTABLE_ENTRY_DATA_AS_VOID_P(ENTRY) \ #define _Py_HASHTABLE_ENTRY_DATA_AS_VOID_P(ENTRY) \
(*(void **)_PY_HASHTABLE_ENTRY_DATA(ENTRY)) (*(void **)_Py_HASHTABLE_ENTRY_DATA(ENTRY))
#define _Py_HASHTABLE_ENTRY_READ_DATA(TABLE, DATA, DATA_SIZE, ENTRY) \ #define _Py_HASHTABLE_ENTRY_READ_DATA(TABLE, DATA, DATA_SIZE, ENTRY) \
do { \ do { \
assert((DATA_SIZE) == (TABLE)->data_size); \ assert((DATA_SIZE) == (TABLE)->data_size); \
memcpy(DATA, _PY_HASHTABLE_ENTRY_DATA(ENTRY), DATA_SIZE); \ memcpy(DATA, _Py_HASHTABLE_ENTRY_DATA(ENTRY), DATA_SIZE); \
} while (0) } while (0)
typedef Py_uhash_t (*_Py_hashtable_hash_func) (const void *key); typedef Py_uhash_t (*_Py_hashtable_hash_func) (const void *key);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment