summaryrefslogtreecommitdiff
path: root/numpy/f2py/cb_rules.py
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/f2py/cb_rules.py')
-rw-r--r--numpy/f2py/cb_rules.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/numpy/f2py/cb_rules.py b/numpy/f2py/cb_rules.py
index 9efb9683b..a4cb546a3 100644
--- a/numpy/f2py/cb_rules.py
+++ b/numpy/f2py/cb_rules.py
@@ -45,7 +45,7 @@ static void show_#name#(#name#_t *ptr) {
CFUNCSMESSPY(\"show_#name#: capi=\", ptr->capi);
CFUNCSMESSPY(\"show_#name#: args_capi=\", ptr->args_capi);
} else {
- CFUNCSMESS(\"show_#name#: ptr=NULL");
+ CFUNCSMESS(\"show_#name#: ptr=NULL\\n");
}
}
@@ -54,6 +54,7 @@ static void show_#name#(#name#_t *ptr) {
static F2PY_THREAD_LOCAL_DECL #name#_t *_active_#name# = NULL;
static #name#_t *swap_active_#name#(#name#_t *ptr) {
+ CFUNCSMESS2(\"swap_active_#name#: active=%p, ptr=%p\\n", _active_#name#, ptr);
#name#_t *prev = _active_#name#;
_active_#name# = ptr;
return prev;
@@ -79,7 +80,7 @@ static #name#_t *get_active_#name#(void) {
/*typedef #rctype#(*#name#_typedef)(#optargs_td##args_td##strarglens_td##noargs#);*/
#static# #rctype# #callbackname# (#optargs##args##strarglens##noargs#) {
- #name#_t *cb;
+ #name#_t *cb = NULL;
PyTupleObject *capi_arglist = NULL;
PyObject *capi_return = NULL;
PyObject *capi_tmp = NULL;
@@ -93,6 +94,7 @@ f2py_cb_start_clock();
cb = get_active_#name#();
show_#name#(cb);
if (cb == NULL) {
+ capi_longjmp_ok = 0;
PyErr_SetString(#modulename#_error,\"cb: No active callback #name#!\\n\");
goto capi_fail;
}