mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-12 14:28:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary cleanup label from job_start

Browse Source 
The argument vector is now freed in the `close_cb` function in job.c
This commit is contained in:
Thiago de Arruda
2014-04-18 12:05:04 -03:00
parent 246d92edb5
commit 7fb36ebb1d
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/eval.c
View File

@@ -63,7 +63,6 @@
#include "window.h" #include "window.h"
#include "os/os.h" #include "os/os.h"
#include "os/job.h" #include "os/job.h"
#include "os/shell.h"
#include "os/rstream.h" #include "os/rstream.h"
#include "os/rstream_defs.h" #include "os/rstream_defs.h"
@@ -11023,7 +11022,7 @@ static void f_job_start(typval_T *argvars, typval_T *rettv)
rettv->vval.v_number = 0; rettv->vval.v_number = 0;
if (check_restricted() || check_secure()) { if (check_restricted() || check_secure()) {
goto cleanup; return;
} }
if (argvars[0].v_type != VAR_STRING if (argvars[0].v_type != VAR_STRING
@@ -11032,7 +11031,7 @@ static void f_job_start(typval_T *argvars, typval_T *rettv)
&& argvars[2].v_type != VAR_UNKNOWN)) { && argvars[2].v_type != VAR_UNKNOWN)) {
// Wrong argument types // Wrong argument types
EMSG(_(e_invarg)); EMSG(_(e_invarg));
goto cleanup; return;
} }
argsl = 0; argsl = 0;
@@ -11043,7 +11042,7 @@ static void f_job_start(typval_T *argvars, typval_T *rettv)
for (arg = args->lv_first; arg != NULL; arg = arg->li_next) { for (arg = args->lv_first; arg != NULL; arg = arg->li_next) {
if (arg->li_tv.v_type != VAR_STRING) { if (arg->li_tv.v_type != VAR_STRING) {
EMSG(_(e_invarg)); EMSG(_(e_invarg));
goto cleanup; return;
} }
} }
} }
@@ -11051,7 +11050,7 @@ static void f_job_start(typval_T *argvars, typval_T *rettv)
if (!os_can_exe(get_tv_string(&argvars[1]))) { if (!os_can_exe(get_tv_string(&argvars[1]))) {
// String is not executable // String is not executable
EMSG2(e_jobexe, get_tv_string(&argvars[1])); EMSG2(e_jobexe, get_tv_string(&argvars[1]));
goto cleanup; return;
} }
// Allocate extra memory for the argument vector and the NULL pointer // Allocate extra memory for the argument vector and the NULL pointer
@@ -11085,14 +11084,6 @@ static void f_job_start(typval_T *argvars, typval_T *rettv)
EMSG(_(e_jobexe)); EMSG(_(e_jobexe));
} }
} }
cleanup:
if (rettv->vval.v_number > 0) {
// Success
return;
}
// Cleanup argv memory in case the `job_start` call failed
shell_free_argv(argv);
} }
// "jobstop()" function // "jobstop()" function

2
src/os/job.c
View File

@@ -248,7 +248,6 @@ void job_exit_event(Event event)
job->exit_cb(job, job->data); job->exit_cb(job, job->data);
// Free the job resources // Free the job resources
shell_free_argv(job->proc_opts.args);
free_job(job); free_job(job);
// Stop polling job status if this was the last // Stop polling job status if this was the last
@@ -356,6 +355,7 @@ static void close_cb(uv_handle_t *handle)
rstream_free(job->out); rstream_free(job->out);
rstream_free(job->err); rstream_free(job->err);
wstream_free(job->in); wstream_free(job->in);
shell_free_argv(job->proc_opts.args);
free(job->data); free(job->data);
free(job); free(job);
} }