summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2001-12-04 13:19:42 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2001-12-04 13:19:42 (GMT)
commita330835a5b44954570b176bf9a57bdbbc88a40cf (patch)
treedb832f468f4893c0ca0d10c6539ec64f1c8a22c0
parente30b98d7fbffc23065435c2b475fb5fce563afb6 (diff)
downloadhdf5-a330835a5b44954570b176bf9a57bdbbc88a40cf.zip
hdf5-a330835a5b44954570b176bf9a57bdbbc88a40cf.tar.gz
hdf5-a330835a5b44954570b176bf9a57bdbbc88a40cf.tar.bz2
[svn-r4666] Purpose:
Bug fix Description: Missing a statement for an else branch when HAVE_GETTIMEOFDAY was defined, which caused most machines to fail compiling. Solution: Re-arranged if/else statement to eliminate problem. Platforms tested: FreeBSD 4.4 (sleipnir)
-rw-r--r--src/H5FDlog.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/H5FDlog.c b/src/H5FDlog.c
index f04b0c6..27359b2 100644
--- a/src/H5FDlog.c
+++ b/src/H5FDlog.c
@@ -1055,8 +1055,8 @@ H5FD_log_write(H5FD_t *_file, H5FD_mem_t type, hid_t UNUSED dxpl_id, haddr_t add
/* Log information about the seek */
if(file->fa.flags&H5FD_LOG_LOC_SEEK) {
- HDfprintf(file->logfp,"Seek: From %10a To %10a",file->pos,addr);
#ifdef H5_HAVE_GETTIMEOFDAY
+ HDfprintf(file->logfp,"Seek: From %10a To %10a",file->pos,addr);
if(file->fa.flags&H5FD_LOG_TIME_SEEK) {
/* Calculate the elapsed gettimeofday time */
timeval_diff.tv_usec=timeval_stop.tv_usec-timeval_start.tv_usec;
@@ -1068,8 +1068,9 @@ H5FD_log_write(H5FD_t *_file, H5FD_mem_t type, hid_t UNUSED dxpl_id, haddr_t add
HDfprintf(file->logfp," (%f s)\n",(double)timeval_diff.tv_sec+((double)timeval_diff.tv_usec/(double)1000000.0));
} /* end if */
else
-#else /* H5_HAVE_GETTIMEOFDAY */
HDfprintf(file->logfp,"\n");
+#else /* H5_HAVE_GETTIMEOFDAY */
+ HDfprintf(file->logfp,"Seek: From %10a To %10a\n",file->pos,addr);
#endif /* H5_HAVE_GETTIMEOFDAY */
} /* end if */
} /* end if */
@@ -1131,8 +1132,9 @@ H5FD_log_write(H5FD_t *_file, H5FD_mem_t type, hid_t UNUSED dxpl_id, haddr_t add
HDfprintf(file->logfp," (%f s)\n",(double)timeval_diff.tv_sec+((double)timeval_diff.tv_usec/(double)1000000.0));
} /* end if */
else
-#else /* H5_HAVE_GETTIMEOFDAY */
HDfprintf(file->logfp,"\n");
+#else /* H5_HAVE_GETTIMEOFDAY */
+ HDfprintf(file->logfp,"\n");
#endif /* H5_HAVE_GETTIMEOFDAY */
} /* end if */