From 8a1c40dc8d5d9f22a17f50ecb33b641bae97cf95 Mon Sep 17 00:00:00 2001
From: Marius Tolzmann <tolzmann@molgen.mpg.de>
Date: Tue, 3 Nov 2015 16:45:10 +0100
Subject: [PATCH] mxq_job: Minor cleanup

---
 mxq_job.c | 5 ++---
 mxqd.c    | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/mxq_job.c b/mxq_job.c
index d0e930e..49d97a4 100644
--- a/mxq_job.c
+++ b/mxq_job.c
@@ -149,6 +149,7 @@ char *mxq_job_status_to_name(uint64_t status)
 void mxq_job_free_content(struct mxq_job *j)
 {
         mx_free_null(j->job_workdir);
+        mx_free_null(j->job_argv);
         mx_free_null(j->job_argv_str);
         mx_free_null(j->job_stdout);
         mx_free_null(j->job_stderr);
@@ -161,11 +162,9 @@ void mxq_job_free_content(struct mxq_job *j)
         mx_free_null(j->tmp_stderr);
         mx_free_null(j->host_submit);
         mx_free_null(j->host_id);
-        mx_free_null(j->host_cpu_set_str);
         mx_free_null(j->server_id);
         mx_free_null(j->host_hostname);
-        mx_free_null(j->job_argv);
-        j->job_argv = NULL;
+        mx_free_null(j->host_cpu_set_str);
 }
 
 static int do_jobs_statement(struct mx_mysql *mysql, char *query, struct mx_mysql_bind *param, struct mxq_job **jobs)
diff --git a/mxqd.c b/mxqd.c
index eaa6d52..1feb59c 100644
--- a/mxqd.c
+++ b/mxqd.c
@@ -765,8 +765,8 @@ int mxq_redirect_open(char *fname)
     } else if (!mx_streq(fname, "/dev/null")) {
         res = unlink(fname);
         if (res == -1 && errno != ENOENT) {
-            mx_log_err("unlink() failed: %m");
-           return -2;
+            mx_log_err("%s: unlink() failed: %m", fname);
+            return -2;
         }
         flags |= O_EXCL;
     }