From 216291e778d19f38086ed869b474f39e9e47696a Mon Sep 17 00:00:00 2001 From: carns Date: Mon, 28 Jun 2010 20:59:44 +0000 Subject: [PATCH] fix various bugs in backwards compatibility git-svn-id: https://svn.mcs.anl.gov/repos/darshan/trunk@272 3b7491f3-a168-0410-bf4b-c445ed680a29 --- darshan-logutils.c | 12 ++++++------ darshan-parser.c | 9 ++++++--- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/darshan-logutils.c b/darshan-logutils.c index 863ac44..99e6806 100644 --- a/darshan-logutils.c +++ b/darshan-logutils.c @@ -753,13 +753,13 @@ static int getfile_internal_122(darshan_fd fd, struct darshan_job *job, { int ret; - ret = getfile_internal_1x(fd, job, file, 133, 12); - if(ret < 0) + ret = getfile_internal_1x(fd, job, file, 138, 14); + if(ret <= 0) return(ret); shift_missing_1_22(file); - return(0); + return(1); } static int getfile_internal_121(darshan_fd fd, struct darshan_job *job, @@ -767,13 +767,13 @@ static int getfile_internal_121(darshan_fd fd, struct darshan_job *job, { int ret; - ret = getfile_internal_1x(fd, job, file, 138, 14); - if(ret < 0) + ret = getfile_internal_1x(fd, job, file, 133, 12); + if(ret <= 0) return(ret); shift_missing_1_21(file); - return(0); + return(1); } static int getfile_internal_1x(darshan_fd fd, struct darshan_job *job, diff --git a/darshan-parser.c b/darshan-parser.c index bd028f1..83ce45f 100644 --- a/darshan-parser.c +++ b/darshan-parser.c @@ -200,9 +200,12 @@ int main(int argc, char **argv) free(mnt_pts[i]); free(fs_types[i]); } - free(devs); - free(mnt_pts); - free(fs_types); + if(mount_count > 0) + { + free(devs); + free(mnt_pts); + free(fs_types); + } darshan_log_close(file); return(0); -- 2.26.2