mxq_group/mxq_job: Cleanup old mxq_mysql fields not needed anymore

mariux · Sep 24, 2015 · 9c739de · 9c739de
1 parent 8f9edb2
commit 9c739de
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 33 deletions.
diff --git 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
@@ -10,22 +10,18 @@ struct mxq_group {
    uint64_t  group_id;
 
    char *    group_name;
-   unsigned long  _group_name_length;
 
    uint8_t   group_status;
    uint64_t  group_flags;
    uint16_t  group_priority;
 
    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
@@ -156,35 +156,20 @@ 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;
         } else {
             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
@@ -19,33 +19,26 @@ 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;
 
     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;