Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fixed few compiler warnings.

This commit is contained in:
Serhiy Storchaka 2015-02-16 09:40:12 +02:00
parent a9e00d13cd
commit 53fa8b2a4b
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Modules/cjkcodecs/_codecs_iso2022.c
View File

@ -292,7 +292,7 @@ iso2022processesc(const void *config, MultibyteCodec_State *state,
const unsigned char **inbuf, Py_ssize_t *inleft) const unsigned char **inbuf, Py_ssize_t *inleft)
{ {
unsigned char charset, designation; unsigned char charset, designation;
Py_ssize_t i, esclen; Py_ssize_t i, esclen = 0;
for (i = 1;i < MAX_ESCSEQLEN;i++) { for (i = 1;i < MAX_ESCSEQLEN;i++) {
if (i >= *inleft) if (i >= *inleft)
@ -307,10 +307,9 @@ iso2022processesc(const void *config, MultibyteCodec_State *state,
} }
} }
if (i >= MAX_ESCSEQLEN)
return 1; /* unterminated escape sequence */
switch (esclen) { switch (esclen) {
case 0:
return 1; /* unterminated escape sequence */
case 3: case 3:
if (INBYTE2 == '$') { if (INBYTE2 == '$') {
charset = INBYTE3 | CHARSET_DBCS; charset = INBYTE3 | CHARSET_DBCS;

2
Modules/faulthandler.c
View File

@ -458,7 +458,7 @@ faulthandler_thread(void *unused)
assert(st == PY_LOCK_FAILURE); assert(st == PY_LOCK_FAILURE);
/* get the thread holding the GIL, NULL if no thread hold the GIL */ /* get the thread holding the GIL, NULL if no thread hold the GIL */
current = _Py_atomic_load_relaxed(&_PyThreadState_Current); current = (PyThreadState*)_Py_atomic_load_relaxed(&_PyThreadState_Current);
write(thread.fd, thread.header, (int)thread.header_len); write(thread.fd, thread.header, (int)thread.header_len);

4
Python/ceval_gil.h
View File

@ -191,7 +191,7 @@ static void drop_gil(PyThreadState *tstate)
if (_Py_atomic_load_relaxed(&gil_drop_request) && tstate != NULL) { if (_Py_atomic_load_relaxed(&gil_drop_request) && tstate != NULL) {
MUTEX_LOCK(switch_mutex); MUTEX_LOCK(switch_mutex);
/* Not switched yet => wait */ /* Not switched yet => wait */
if (_Py_atomic_load_relaxed(&gil_last_holder) == tstate) { if ((PyThreadState*)_Py_atomic_load_relaxed(&gil_last_holder) == tstate) {
RESET_GIL_DROP_REQUEST(); RESET_GIL_DROP_REQUEST();
/* NOTE: if COND_WAIT does not atomically start waiting when /* NOTE: if COND_WAIT does not atomically start waiting when
releasing the mutex, another thread can run through, take releasing the mutex, another thread can run through, take
@ -239,7 +239,7 @@ _ready:
_Py_atomic_store_relaxed(&gil_locked, 1); _Py_atomic_store_relaxed(&gil_locked, 1);
_Py_ANNOTATE_RWLOCK_ACQUIRED(&gil_locked, /*is_write=*/1); _Py_ANNOTATE_RWLOCK_ACQUIRED(&gil_locked, /*is_write=*/1);
if (tstate != _Py_atomic_load_relaxed(&gil_last_holder)) { if (tstate != (PyThreadState*)_Py_atomic_load_relaxed(&gil_last_holder)) {
_Py_atomic_store_relaxed(&gil_last_holder, tstate); _Py_atomic_store_relaxed(&gil_last_holder, tstate);
++gil_switch_number; ++gil_switch_number;
} }

2
Python/pylifecycle.c
View File

@ -1258,7 +1258,7 @@ Py_FatalError(const char *msg)
PyErr_PrintEx(0); PyErr_PrintEx(0);
} }
else { else {
tstate = _Py_atomic_load_relaxed(&_PyThreadState_Current); tstate = (PyThreadState*)_Py_atomic_load_relaxed(&_PyThreadState_Current);
if (tstate != NULL) { if (tstate != NULL) {
fputc('\n', stderr); fputc('\n', stderr);
fflush(stderr); fflush(stderr);

4
Python/pystate.c
View File

@ -403,7 +403,7 @@ tstate_delete_common(PyThreadState *tstate)
void void
PyThreadState_Delete(PyThreadState *tstate) PyThreadState_Delete(PyThreadState *tstate)
{ {
if (tstate == _Py_atomic_load_relaxed(&_PyThreadState_Current)) if (tstate == (PyThreadState*)_Py_atomic_load_relaxed(&_PyThreadState_Current))
Py_FatalError("PyThreadState_Delete: tstate is still current"); Py_FatalError("PyThreadState_Delete: tstate is still current");
#ifdef WITH_THREAD #ifdef WITH_THREAD
if (autoInterpreterState && PyThread_get_key_value(autoTLSkey) == tstate) if (autoInterpreterState && PyThread_get_key_value(autoTLSkey) == tstate)
@ -662,7 +662,7 @@ PyThreadState_IsCurrent(PyThreadState *tstate)
{ {
/* Must be the tstate for this thread */ /* Must be the tstate for this thread */
assert(PyGILState_GetThisThreadState()==tstate); assert(PyGILState_GetThisThreadState()==tstate);
return tstate == _Py_atomic_load_relaxed(&_PyThreadState_Current); return tstate == (PyThreadState*)_Py_atomic_load_relaxed(&_PyThreadState_Current);
} }
/* Internal initialization/finalization functions called by /* Internal initialization/finalization functions called by