From 9c739de4d3a69e624e24251d04682b089ceab2cb Mon Sep 17 00:00:00 2001 From: Marius Tolzmann Date: Thu, 24 Sep 2015 15:17:27 +0200 Subject: [PATCH] mxq_group/mxq_job: Cleanup old mxq_mysql fields not needed anymore --- mxq_group.c | 7 ------- mxq_group.h | 4 ---- mxq_job.c | 15 --------------- mxq_job.h | 7 ------- 4 files changed, 33 deletions(-) diff --git a/mxq_group.c b/mxq_group.c index 558fabd..65f7757 100644 --- a/mxq_group.c +++ b/mxq_group.c @@ -100,16 +100,9 @@ static int bind_result_group_fields(struct mx_mysql_bind *result, struct mxq_gro void mxq_group_free_content(struct mxq_group *g) { mx_free_null(g->group_name); - g->_group_name_length = 0; - mx_free_null(g->user_name); - g->_user_name_length = 0; - mx_free_null(g->user_group); - g->_user_group_length = 0; - mx_free_null(g->job_command); - g->_job_command_length = 0; } diff --git a/mxq_group.h b/mxq_group.h index db6b441..e678cb3 100644 --- a/mxq_group.h +++ b/mxq_group.h @@ -10,7 +10,6 @@ struct mxq_group { uint64_t group_id; char * group_name; - unsigned long _group_name_length; uint8_t group_status; uint64_t group_flags; @@ -18,14 +17,11 @@ struct mxq_group { uint32_t user_uid; char * user_name; - unsigned long _user_name_length; uint32_t user_gid; char * user_group; - unsigned long _user_group_length; char * job_command; - unsigned long _job_command_length; uint16_t job_threads; uint64_t job_memory; diff --git a/mxq_job.c b/mxq_job.c index a0789f8..1deabdb 100644 --- a/mxq_job.c +++ b/mxq_job.c @@ -156,16 +156,9 @@ char *mxq_job_status_to_name(uint64_t status) void mxq_job_free_content(struct mxq_job *j) { mx_free_null(j->job_workdir); - j->_job_workdir_length = 0; - mx_free_null(j->job_argv_str); - j->_job_argv_str_length = 0; - mx_free_null(j->job_stdout); - j->_job_stdout_length = 0; - mx_free_null(j->job_stderr); - j->_job_stderr_length = 0; if (j->tmp_stderr == j->tmp_stdout) { j->tmp_stdout = NULL; @@ -173,18 +166,10 @@ void mxq_job_free_content(struct mxq_job *j) mx_free_null(j->tmp_stdout); } mx_free_null(j->tmp_stderr); - mx_free_null(j->host_submit); - j->_host_submit_length = 0; - mx_free_null(j->host_id); - mx_free_null(j->server_id); - j->_server_id_length = 0; - mx_free_null(j->host_hostname); - j->_host_hostname_length = 0; - mx_free_null(j->job_argv); j->job_argv = NULL; } diff --git a/mxq_job.h b/mxq_job.h index 872010e..506849c 100644 --- a/mxq_job.h +++ b/mxq_job.h @@ -19,18 +19,14 @@ struct mxq_job { struct mxq_group * group_ptr; char * job_workdir; - unsigned long _job_workdir_length; uint16_t job_argc; char ** job_argv; char * job_argv_str; - unsigned long _job_argv_str_length; char * job_stdout; - unsigned long _job_stdout_length; char * job_stderr; - unsigned long _job_stderr_length; char * tmp_stdout; char * tmp_stderr; @@ -38,14 +34,11 @@ struct mxq_job { uint32_t job_umask; char * host_submit; - unsigned long _host_submit_length; char * host_id; char * server_id; - unsigned long _server_id_length; char * host_hostname; - unsigned long _host_hostname_length; uint32_t host_pid; uint32_t host_slots;