From a810ab9f8f8b57cb81bca09ae28065b10305c9b7 Mon Sep 17 00:00:00 2001 From: sinanmohd Date: Sat, 3 Aug 2024 13:09:49 +0530 Subject: util/vpopen: return pid on success --- src/jobs.c | 9 +++++---- src/util.c | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/jobs.c b/src/jobs.c index cb5fe3b..043dac0 100644 --- a/src/jobs.c +++ b/src/jobs.c @@ -302,6 +302,8 @@ static int job_read_cache(struct job *job) i++; } + ret = 0; + out_free_line: free(line); fclose(nix_build_stream); @@ -395,6 +397,8 @@ int job_read(FILE *stream, struct job **job) goto out_free; } + ret = JOB_READ_SUCCESS; + out_free: cJSON_Delete(root); if (ret != JOB_READ_SUCCESS) @@ -522,7 +526,6 @@ int jobs_init(FILE **stream, char *expr) { size_t argindex; char *args[4]; - int ret; argindex = 0; args[argindex++] = XSTR(NIX_EVAL_JOBS_PATH); @@ -532,9 +535,7 @@ int jobs_init(FILE **stream, char *expr) args[argindex++] = NULL; /* the package is wrapProgram-ed with nix-eval-jobs */ - ret = vpopen(stream, XSTR(NIX_EVAL_JOBS_PATH), args, VPOPEN_STDOUT); - - return ret; + return vpopen(stream, XSTR(NIX_EVAL_JOBS_PATH), args, VPOPEN_STDOUT); } void job_stale_set(struct job *job) diff --git a/src/util.c b/src/util.c index 2a81670..8ffbb71 100644 --- a/src/util.c +++ b/src/util.c @@ -69,7 +69,7 @@ int vpopen(FILE **stream, const char *file, char *const argv[], vpopen_t type) return -errno; } - return 0; + return ret; } close(fd[0]); -- cgit v1.2.3