[svn-r15510] Description:

	Clean up warnings & formatting

Tested on:
	Mac OS X/32 10.5.4 (amazon)
	More tests forthcoming

1 files changed, 36 insertions, 33 deletions

diff --git a/src/H5FDlog.c b/src/H5FDlog.c
index 9824511..9a34a45 100644
--- a/src/H5FDlog.c
+++ b/src/H5FDlog.c
@@ -192,6 +192,7 @@ static herr_t H5FD_log_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, hadd
 			      size_t size, const void *buf);
 static herr_t H5FD_log_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing);
 
+#ifdef OLD_WAY
 /*
  * The free list map which causes each request type to use no free lists
  */
@@ -204,6 +205,7 @@ static herr_t H5FD_log_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing);
     H5FD_MEM_NOLIST,			/*lheap*/			      \
     H5FD_MEM_NOLIST			/*ohdr*/			      \
 }
+#endif /* OLD_WAY */
 
 static const H5FD_class_t H5FD_log_g = {
     "log",					/*name			*/
@@ -358,14 +360,14 @@ H5Pset_fapl_log(hid_t fapl_id, const char *logfile, unsigned flags, size_t buf_s
     if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
 
-    fa.logfile=(char*)logfile;
-    fa.flags=flags;
-    fa.buf_size=buf_size;
-    ret_value= H5P_set_driver(plist, H5FD_LOG, &fa);
+    fa.logfile = (char *)logfile;
+    fa.flags = flags;
+    fa.buf_size = buf_size;
+    ret_value = H5P_set_driver(plist, H5FD_LOG, &fa);
 
 done:
     FUNC_LEAVE_API(ret_value)
-}
+} /* end H5Pset_fapl_log() */
 
 
 /*-------------------------------------------------------------------------
@@ -423,12 +425,12 @@ static void *
 H5FD_log_fapl_copy(const void *_old_fa)
 {
     const H5FD_log_fapl_t *old_fa = (const H5FD_log_fapl_t*)_old_fa;
-    H5FD_log_fapl_t *new_fa = H5MM_malloc(sizeof(H5FD_log_fapl_t));
+    H5FD_log_fapl_t *new_fa = (H5FD_log_fapl_t *)H5MM_malloc(sizeof(H5FD_log_fapl_t));
     void *ret_value;    /* Return value */
 
     FUNC_ENTER_NOAPI(H5FD_log_fapl_copy, NULL)
 
-    assert(new_fa);
+    HDassert(new_fa);
 
     /* Copy the general information */
     HDmemcpy(new_fa, old_fa, sizeof(H5FD_log_fapl_t));
@@ -537,16 +539,17 @@ H5FD_log_open(const char *name, unsigned flags, hid_t fapl_id,
         HGOTO_ERROR(H5E_FILE, H5E_BADFILE, NULL, "unable to fstat file")
 
     /* Create the new file struct */
-    if (NULL==(file=H5MM_calloc(sizeof(H5FD_log_t))))
+    if(NULL == (file = (H5FD_log_t *)H5MM_calloc(sizeof(H5FD_log_t))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "unable to allocate file struct")
 
     /* Get the driver specific information */
     if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list")
-    fa = H5P_get_driver_info(plist);
+    fa = (H5FD_log_fapl_t *)H5P_get_driver_info(plist);
+    HDassert(fa);
 
     file->fd = fd;
-    H5_ASSIGN_OVERFLOW(file->eof,sb.st_size,h5_stat_size_t,haddr_t);
+    H5_ASSIGN_OVERFLOW(file->eof, sb.st_size, h5_stat_size_t, haddr_t);
     file->pos = HADDR_UNDEF;
     file->op = OP_UNKNOWN;
 #ifdef _WIN32
@@ -563,32 +566,32 @@ H5FD_log_open(const char *name, unsigned flags, hid_t fapl_id,
     file->fa.flags=fa->flags;
 
     /* Check if we are doing any logging at all */
-    if(file->fa.flags!=0) {
-        file->iosize=fa->buf_size;
-        if(file->fa.flags&H5FD_LOG_FILE_READ) {
-            file->nread=H5MM_calloc(file->iosize);
-            assert(file->nread);
+    if(file->fa.flags != 0) {
+        file->iosize = fa->buf_size;
+        if(file->fa.flags & H5FD_LOG_FILE_READ) {
+            file->nread = (unsigned char *)H5MM_calloc(file->iosize);
+            HDassert(file->nread);
         } /* end if */
-        if(file->fa.flags&H5FD_LOG_FILE_WRITE) {
-            file->nwrite=H5MM_calloc(file->iosize);
-            assert(file->nwrite);
+        if(file->fa.flags & H5FD_LOG_FILE_WRITE) {
+            file->nwrite = (unsigned char *)H5MM_calloc(file->iosize);
+            HDassert(file->nwrite);
         } /* end if */
-        if(file->fa.flags&H5FD_LOG_FLAVOR) {
-            file->flavor=H5MM_calloc(file->iosize);
-            assert(file->flavor);
+        if(file->fa.flags & H5FD_LOG_FLAVOR) {
+            file->flavor = (unsigned char *)H5MM_calloc(file->iosize);
+            HDassert(file->flavor);
         } /* end if */
         if(fa->logfile)
-            file->logfp=HDfopen(fa->logfile,"w");
+            file->logfp = HDfopen(fa->logfile, "w");
         else
-            file->logfp=stderr;
+            file->logfp = stderr;
     } /* end if */
 
     /* Set return value */
-    ret_value=(H5FD_t*)file;
+    ret_value = (H5FD_t*)file;
 
 done:
-    if(ret_value==NULL) {
-        if(fd>=0)
+    if(NULL == ret_value) {
+        if(fd >= 0)
             HDclose(fd);
     } /* end if */
 
@@ -706,13 +709,13 @@ H5FD_log_close(H5FD_t *_file)
         } /* end if */
 
         /* Free the logging information */
-        if(file->fa.flags&H5FD_LOG_FILE_WRITE)
-            file->nwrite=H5MM_xfree(file->nwrite);
-        if(file->fa.flags&H5FD_LOG_FILE_READ)
-            file->nread=H5MM_xfree(file->nread);
-        if(file->fa.flags&H5FD_LOG_FLAVOR)
-            file->flavor=H5MM_xfree(file->flavor);
-        if(file->logfp!=stderr)
+        if(file->fa.flags & H5FD_LOG_FILE_WRITE)
+            file->nwrite = (unsigned char *)H5MM_xfree(file->nwrite);
+        if(file->fa.flags & H5FD_LOG_FILE_READ)
+            file->nread = (unsigned char *)H5MM_xfree(file->nread);
+        if(file->fa.flags & H5FD_LOG_FLAVOR)
+            file->flavor = (unsigned char *)H5MM_xfree(file->flavor);
+        if(file->logfp != stderr)
             fclose(file->logfp);
     } /* end if */