Issue #21036: Fix typo in macro name

_PY_HASHTABLE_ENTRY_DATA => _Py_HASHTABLE_ENTRY_DATA

diff --git a/Modules/_tracemalloc.c b/Modules/_tracemalloc.c
index 42dbeaee0834d68e800b867b1382b3bbe8cef3b0..780e8eda82631fc08017fdfaa4b8660307dab761 100644 (file)
--- a/Modules/_tracemalloc.c
+++ b/Modules/_tracemalloc.c
@@ -1052,7 +1052,7 @@ tracemalloc_get_traces_fill(_Py_hashtable_entry_t *entry, void *user_data)
     PyObject *tracemalloc_obj;
     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);
     if (tracemalloc_obj == NULL)

diff --git a/Modules/hashtable.c b/Modules/hashtable.c
index 221ed53b9f604ecdd2cf9944f1d86034d670868d..aaded46a9e4cb7febd72aeb65247a2692e8737f8 100644 (file)
--- a/Modules/hashtable.c
+++ b/Modules/hashtable.c
@@ -326,7 +326,7 @@ _Py_hashtable_set(_Py_hashtable_t *ht, const void *key,
     entry->key_hash = key_hash;
 
     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);
     ht->entries++;
@@ -504,7 +504,7 @@ _Py_hashtable_copy(_Py_hashtable_t *src)
                     err = 1;
             }
             else {
-                data = _PY_HASHTABLE_ENTRY_DATA(entry);
+                data = _Py_HASHTABLE_ENTRY_DATA(entry);
                 err = _Py_hashtable_set(dst, entry->key, data, src->data_size);
             }
             if (err) {

diff --git a/Modules/hashtable.h b/Modules/hashtable.h
index 539e490c3197393abcd857773910885b18e1c510..a9f9993bfd7b7aaf7817b3499ee59114e19e457b 100644 (file)
--- a/Modules/hashtable.h
+++ b/Modules/hashtable.h
@@ -26,16 +26,16 @@ typedef struct {
     /* data follows */
 } _Py_hashtable_entry_t;
 
-#define _PY_HASHTABLE_ENTRY_DATA(ENTRY) \
+#define _Py_HASHTABLE_ENTRY_DATA(ENTRY) \
         ((char *)(ENTRY) + sizeof(_Py_hashtable_entry_t))
 
 #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) \
     do { \
         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)
 
 typedef Py_uhash_t (*_Py_hashtable_hash_func) (const void *key);