mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-23 18:04:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #21036: Fix typo in macro name

Browse Source 
_PY_HASHTABLE_ENTRY_DATA => _Py_HASHTABLE_ENTRY_DATA
This commit is contained in:
Victor Stinner 2014-03-24 22:34:34 +01:00
parent df48b97855
commit d9a7352348
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/_tracemalloc.c
View File

@ -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)

4
Modules/hashtable.c
View File

@ -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) {

6
Modules/hashtable.h
View File

@ -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);