diff options
| author | Christian Heimes <christian@cheimes.de> | 2013-07-22 16:34:28 +0200 |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2013-07-22 16:34:28 +0200 |
| commit | b2decdab33ce8b74051a8dcddfa409d7f9af8fb1 (patch) | |
| tree | d58fc597874e0c5bb3e878ed2b446bcb606f5f04 /Python/thread.c | |
| parent | b69651179a1ac37b3e959a404388ce9fc1b273f8 (diff) | |
| parent | edc97951e09d9ea20937dbddf4b0d9b09c6cb463 (diff) | |
| download | cpython-b2decdab33ce8b74051a8dcddfa409d7f9af8fb1.tar.gz | |
Some compilers complain about 'control reaches end of non-void function'
because they don't understand that Py_FatalError() terminates the program.
Diffstat (limited to 'Python/thread.c')
| -rw-r--r-- | Python/thread.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Python/thread.c b/Python/thread.c index e55d34244e..54ce875eb2 100644 --- a/Python/thread.c +++ b/Python/thread.c @@ -91,10 +91,6 @@ static size_t _pythread_stacksize = 0; #include "thread_nt.h" #endif -#ifdef OS2_THREADS -#define PYTHREAD_NAME "os2" -#include "thread_os2.h" -#endif /* #ifdef FOOBAR_THREADS @@ -235,7 +231,7 @@ find_key(int key, void *value) assert(p == NULL); goto Done; } - p = (struct key *)malloc(sizeof(struct key)); + p = (struct key *)PyMem_RawMalloc(sizeof(struct key)); if (p != NULL) { p->id = id; p->key = key; @@ -274,7 +270,7 @@ PyThread_delete_key(int key) while ((p = *q) != NULL) { if (p->key == key) { *q = p->next; - free((void *)p); + PyMem_RawFree((void *)p); /* NB This does *not* free p->value! */ } else @@ -328,7 +324,7 @@ PyThread_delete_key_value(int key) while ((p = *q) != NULL) { if (p->key == key && p->id == id) { *q = p->next; - free((void *)p); + PyMem_RawFree((void *)p); /* NB This does *not* free p->value! */ break; } @@ -361,7 +357,7 @@ PyThread_ReInitTLS(void) while ((p = *q) != NULL) { if (p->id != id) { *q = p->next; - free((void *)p); + PyMem_RawFree((void *)p); /* NB This does *not* free p->value! */ } else |