remove unneeded parameter to log_put_record

darshan-util/darshan-bgq-logutils.c

@@ -35,7 +35,7 @@ char *bgq_f_counter_names[] = {
 #define DARSHAN_BGQ_FILE_SIZE_1 (112 + 8)
 
 static int darshan_log_get_bgq_rec(darshan_fd fd, void** bgq_buf_p);
-static int darshan_log_put_bgq_rec(darshan_fd fd, void* bgq_buf, int ver);
+static int darshan_log_put_bgq_rec(darshan_fd fd, void* bgq_buf);
 static void darshan_log_print_bgq_rec(void *file_rec,
     char *file_name, char *mnt_pt, char *fs_type, int ver);
 static void darshan_log_print_bgq_description(int ver);
@@ -136,7 +136,7 @@ static int darshan_log_get_bgq_rec(darshan_fd fd, void** bgq_buf_p)
     }
 }
 
-static int darshan_log_put_bgq_rec(darshan_fd fd, void* bgq_buf, int ver)
+static int darshan_log_put_bgq_rec(darshan_fd fd, void* bgq_buf)
 {
     struct darshan_bgq_record *rec = (struct darshan_bgq_record *)bgq_buf;
     int ret;

darshan-util/darshan-convert.c

@@ -407,7 +407,7 @@ int main(int argc, char **argv)
 
             if(!hash || hash == base_rec->id)
             {
-                ret = mod_logutils[i]->log_put_record(outfile, mod_buf, infile->mod_ver[i]);
+                ret = mod_logutils[i]->log_put_record(outfile, mod_buf);
                 if(ret < 0)
                 {
                     darshan_log_close(infile);

darshan-util/darshan-hdf5-logutils.c

@@ -31,7 +31,7 @@ char *hdf5_f_counter_names[] = {
 #undef X
 
 static int darshan_log_get_hdf5_file(darshan_fd fd, void** hdf5_buf_p);
-static int darshan_log_put_hdf5_file(darshan_fd fd, void* hdf5_buf, int ver);
+static int darshan_log_put_hdf5_file(darshan_fd fd, void* hdf5_buf);
 static void darshan_log_print_hdf5_file(void *file_rec,
     char *file_name, char *mnt_pt, char *fs_type, int ver);
 static void darshan_log_print_hdf5_description(int ver);
@@ -97,7 +97,7 @@ static int darshan_log_get_hdf5_file(darshan_fd fd, void** hdf5_buf_p)
     }
 }
 
-static int darshan_log_put_hdf5_file(darshan_fd fd, void* hdf5_buf, int ver)
+static int darshan_log_put_hdf5_file(darshan_fd fd, void* hdf5_buf)
 {
     struct darshan_hdf5_file *file = (struct darshan_hdf5_file *)hdf5_buf;
     int ret;

darshan-util/darshan-logutils.h

@@ -80,12 +80,10 @@ struct darshan_mod_logutil_funcs
      * return 0 on success, -1 on error
      *      - 'fd' is the file descriptor to put record into
      *      - 'buf' is the buffer containing the record data
-     *      - 'ver' is the version of the record
      */
     int (*log_put_record)(
         darshan_fd fd,
-        void *buf,
-        int ver
+        void *buf
     );
     /* print the counters for a given log record
      *      - 'file_rec' is the record's data buffer

darshan-util/darshan-lustre-logutils.c

@@ -25,7 +25,7 @@ char *lustre_counter_names[] = {
 #undef X
 
 static int darshan_log_get_lustre_record(darshan_fd fd, void** lustre_buf_p);
-static int darshan_log_put_lustre_record(darshan_fd fd, void* lustre_buf, int ver);
+static int darshan_log_put_lustre_record(darshan_fd fd, void* lustre_buf);
 static void darshan_log_print_lustre_record(void *file_rec,
     char *file_name, char *mnt_pt, char *fs_type, int ver);
 static void darshan_log_print_lustre_description(int ver);
@@ -114,7 +114,7 @@ static int darshan_log_get_lustre_record(darshan_fd fd, void** lustre_buf_p)
     return(ret);
 }
 
-static int darshan_log_put_lustre_record(darshan_fd fd, void* lustre_buf, int ver)
+static int darshan_log_put_lustre_record(darshan_fd fd, void* lustre_buf)
 {
     struct darshan_lustre_record *rec = (struct darshan_lustre_record *)lustre_buf;
     int ret;

darshan-util/darshan-merge.c

@@ -419,7 +419,7 @@ int main(int argc, char *argv[])
                 /* write out the shared records first */
                 HASH_ITER(hlink, shared_rec_hash, sref, stmp)
                 {
-                    ret = mod_logutils[i]->log_put_record(merge_fd, sref->agg_rec, in_fd->mod_ver[i]);
+                    ret = mod_logutils[i]->log_put_record(merge_fd, sref->agg_rec);
                     if(ret < 0)
                     {
                         fprintf(stderr,
@@ -443,7 +443,7 @@ int main(int argc, char *argv[])
                 if(sref)
                     continue; /* skip shared records */
 
-                ret = mod_logutils[i]->log_put_record(merge_fd, mod_buf, in_fd->mod_ver[i]);
+                ret = mod_logutils[i]->log_put_record(merge_fd, mod_buf);
                 if(ret < 0)
                 {
                     fprintf(stderr,

darshan-util/darshan-mpiio-logutils.c

@@ -31,7 +31,7 @@ char *mpiio_f_counter_names[] = {
 #undef X
 
 static int darshan_log_get_mpiio_file(darshan_fd fd, void** mpiio_buf_p);
-static int darshan_log_put_mpiio_file(darshan_fd fd, void* mpiio_buf, int ver);
+static int darshan_log_put_mpiio_file(darshan_fd fd, void* mpiio_buf);
 static void darshan_log_print_mpiio_file(void *file_rec,
     char *file_name, char *mnt_pt, char *fs_type, int ver);
 static void darshan_log_print_mpiio_description(int ver);
@@ -97,7 +97,7 @@ static int darshan_log_get_mpiio_file(darshan_fd fd, void** mpiio_buf_p)
     }
 }
 
-static int darshan_log_put_mpiio_file(darshan_fd fd, void* mpiio_buf, int ver)
+static int darshan_log_put_mpiio_file(darshan_fd fd, void* mpiio_buf)
 {
     struct darshan_mpiio_file *file = (struct darshan_mpiio_file *)mpiio_buf;
     int ret;

darshan-util/darshan-null-logutils.c

@@ -33,7 +33,7 @@ char *null_f_counter_names[] = {
 
 /* prototypes for each of the NULL module's logutil functions */
 static int darshan_log_get_null_record(darshan_fd fd, void** null_buf_p);
-static int darshan_log_put_null_record(darshan_fd fd, void* null_buf, int ver);
+static int darshan_log_put_null_record(darshan_fd fd, void* null_buf);
 static void darshan_log_print_null_record(void *file_rec,
     char *file_name, char *mnt_pt, char *fs_type, int ver);
 static void darshan_log_print_null_description(int ver);
@@ -108,10 +108,10 @@ static int darshan_log_get_null_record(darshan_fd fd, void** null_buf_p)
     }
 }
 
-/* write the NULL record stored in 'null_buf' (with version number 'ver')
- * to log file descriptor 'fd'. Return 0 on success, -1 on failure
+/* write the NULL record stored in 'null_buf' to log file descriptor 'fd'.
+ * Return 0 on success, -1 on failure
  */
-static int darshan_log_put_null_record(darshan_fd fd, void* null_buf, int ver)
+static int darshan_log_put_null_record(darshan_fd fd, void* null_buf)
 {
     struct darshan_null_record *rec = (struct darshan_null_record *)null_buf;
     int ret;

darshan-util/darshan-pnetcdf-logutils.c

@@ -31,7 +31,7 @@ char *pnetcdf_f_counter_names[] = {
 #undef X
 
 static int darshan_log_get_pnetcdf_file(darshan_fd fd, void** pnetcdf_buf_p);
-static int darshan_log_put_pnetcdf_file(darshan_fd fd, void* pnetcdf_buf, int ver);
+static int darshan_log_put_pnetcdf_file(darshan_fd fd, void* pnetcdf_buf);
 static void darshan_log_print_pnetcdf_file(void *file_rec,
     char *file_name, char *mnt_pt, char *fs_type, int ver);
 static void darshan_log_print_pnetcdf_description(int ver);
@@ -97,7 +97,7 @@ static int darshan_log_get_pnetcdf_file(darshan_fd fd, void** pnetcdf_buf_p)
     }
 }
 
-static int darshan_log_put_pnetcdf_file(darshan_fd fd, void* pnetcdf_buf, int ver)
+static int darshan_log_put_pnetcdf_file(darshan_fd fd, void* pnetcdf_buf)
 {
     struct darshan_pnetcdf_file *file = (struct darshan_pnetcdf_file *)pnetcdf_buf;
     int ret;

darshan-util/darshan-posix-logutils.c

@@ -34,7 +34,7 @@ char *posix_f_counter_names[] = {
 #define DARSHAN_POSIX_FILE_SIZE_2 648
 
 static int darshan_log_get_posix_file(darshan_fd fd, void** posix_buf_p);
-static int darshan_log_put_posix_file(darshan_fd fd, void* posix_buf, int ver);
+static int darshan_log_put_posix_file(darshan_fd fd, void* posix_buf);
 static void darshan_log_print_posix_file(void *file_rec,
     char *file_name, char *mnt_pt, char *fs_type, int ver);
 static void darshan_log_print_posix_description(int ver);
@@ -160,7 +160,7 @@ exit:
     }
 }
 
-static int darshan_log_put_posix_file(darshan_fd fd, void* posix_buf, int ver)
+static int darshan_log_put_posix_file(darshan_fd fd, void* posix_buf)
 {
     struct darshan_posix_file *file = (struct darshan_posix_file *)posix_buf;
     int ret;

darshan-util/darshan-stdio-logutils.c

@@ -33,7 +33,7 @@ char *stdio_f_counter_names[] = {
 
 /* prototypes for each of the STDIO module's logutil functions */
 static int darshan_log_get_stdio_record(darshan_fd fd, void** stdio_buf_p);
-static int darshan_log_put_stdio_record(darshan_fd fd, void* stdio_buf, int ver);
+static int darshan_log_put_stdio_record(darshan_fd fd, void* stdio_buf);
 static void darshan_log_print_stdio_record(void *file_rec,
     char *file_name, char *mnt_pt, char *fs_type, int ver);
 static void darshan_log_print_stdio_description(int ver);
@@ -111,7 +111,7 @@ static int darshan_log_get_stdio_record(darshan_fd fd, void** stdio_buf_p)
 /* write the STDIO record stored in 'stdio_buf' to log file descriptor 'fd'.
  * Return 0 on success, -1 on failure
  */
-static int darshan_log_put_stdio_record(darshan_fd fd, void* stdio_buf, int ver)
+static int darshan_log_put_stdio_record(darshan_fd fd, void* stdio_buf)
 {
     struct darshan_stdio_file *rec = (struct darshan_stdio_file *)stdio_buf;
     int ret;