diff options
Diffstat (limited to 'src/helper')
| -rw-r--r-- | src/helper/command.c | 16 | ||||
| -rw-r--r-- | src/helper/log.h | 2 |
2 files changed, 7 insertions, 11 deletions
diff --git a/src/helper/command.c b/src/helper/command.c index 868d0952..ef0afa2b 100644 --- a/src/helper/command.c +++ b/src/helper/command.c @@ -118,15 +118,10 @@ static void command_log_capture_finish(struct log_capture_state *state) static int command_retval_set(Jim_Interp *interp, int retval) { int *return_retval = Jim_GetAssocData(interp, "retval"); - if (retval == ERROR_COMMAND_CLOSE_CONNECTION) { - if (return_retval != NULL) - *return_retval = 0; - return JIM_EXIT; - } else { - if (return_retval != NULL) - *return_retval = retval; - return (retval == ERROR_OK) ? JIM_OK : JIM_ERR; - } + if (return_retval != NULL) + *return_retval = retval; + + return (retval == ERROR_OK) ? JIM_OK : JIM_ERR; } extern struct command_context *global_cmd_ctx; @@ -676,7 +671,8 @@ int command_run_line(struct command_context *context, char *line) } return retval; } else if (retcode == JIM_EXIT) { - return ERROR_OK_EXIT; + /* ignore. + * exit(Jim_GetExitCode(interp)); */ } else { const char *result; int reslen; diff --git a/src/helper/log.h b/src/helper/log.h index ad8d2479..e161a6ea 100644 --- a/src/helper/log.h +++ b/src/helper/log.h @@ -138,5 +138,5 @@ extern int debug_level; * make no assumptions about what went wrong and try to handle the problem. */ #define ERROR_FAIL (-4) -#define ERROR_OK_EXIT (-5) + #endif /* LOG_H */ |