Merge pull request #47 from byrnHDF/develop

Whitespace and url correction

5 files changed, 18 insertions, 17 deletions

diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index 3a8d5b7..61c535e 100644
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -204,7 +204,7 @@ endif ()
 #set (LOCAL_NO_PACKAGE "TRUE")
 #####       Following controls source update                  #####
 #set (LOCAL_UPDATE "TRUE")
-set (REPOSITORY_URL "https://git@bitbucket.hdfgroup.org/scm/hdffv/hdf5.git")
+set (REPOSITORY_URL "https://github.com/HDFGroup/hdf5.git")
 set (REPOSITORY_BRANCH "develop")
 
 #uncomment to use a compressed source file: *.tar on linux or mac *.zip on windows
diff --git a/release_docs/README_HPC b/release_docs/README_HPC
index 513064c..6b31ce6 100644
--- a/release_docs/README_HPC
+++ b/release_docs/README_HPC
@@ -32,7 +32,7 @@ II. Obtain HDF5 source
 Obtain HDF5 source code from the HDF5 repository using a git command or
 from a release tar file in a working directory:
 
-    git clone https://git@bitbucket.hdfgroup.org/scm/hdffv/hdf5.git
+    git clone https://github.com/HDFGroup/hdf5.git
         [-b branch] [source directory]
 
 If no branch is specified, then the 'develop' version will be checked out.
diff --git a/src/H5FDcore.c b/src/H5FDcore.c
index 419a0d9..61f46c7 100644
--- a/src/H5FDcore.c
+++ b/src/H5FDcore.c
@@ -281,13 +281,13 @@ H5FD__core_add_dirty_region(H5FD_core_t *file, haddr_t start, haddr_t end)
         else {
             /* Store the new item endpoint if it's bigger */
             item->end = (item->end < end) ? end : item->end;
-        } /* end else */
-    }     /* end if */
+        }
+    }
     else {
         /* Update the size of the before region */
         if (b_item->end < end)
             b_item->end = end;
-    } /* end else */
+    }
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5FDhdfs.c b/src/H5FDhdfs.c
index e1b06d3..a7c6aae 100644
--- a/src/H5FDhdfs.c
+++ b/src/H5FDhdfs.c
@@ -231,8 +231,7 @@ typedef struct {
  *
  * Programmer: Jacob Smith
  *
- ***************************************************************************
- */
+ ***************************************************************************/
 typedef struct H5FD_hdfs_t {
     H5FD_t           pub;
     H5FD_hdfs_fapl_t fa;
@@ -362,7 +361,7 @@ H5FD_hdfs_init(void)
     unsigned int bin_i;
 #endif
 
-    FUNC_ENTER_NOAPI(FAIL)
+    FUNC_ENTER_NOAPI(H5I_INVALID_HID)
 
 #if HDFS_DEBUG
     HDfprintf(stdout, "called %s.\n", FUNC);
@@ -379,7 +378,7 @@ H5FD_hdfs_init(void)
 
         HDFS_STATS_POW(bin_i, &value)
         hdfs_stats_boundaries[bin_i] = value;
-    } /* end for */
+    }
 #endif
 
     ret_value = H5FD_HDFS_g;
@@ -662,9 +661,11 @@ H5Pget_fapl_hdfs(hid_t fapl_id, H5FD_hdfs_fapl_t *fa_out)
 
     if (fa_out == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "fa_out is NULL")
+
     plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS);
     if (plist == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access list")
+
     if (H5FD_HDFS != H5P_peek_driver(plist))
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "incorrect VFL driver")
 
@@ -813,7 +814,7 @@ hdfs__reset_stats(H5FD_hdfs_t *file)
     FUNC_ENTER_STATIC
 
 #if HDFS_DEBUG
-    HDprintf("hdfs__reset_stats() called\n");
+    HDfprintf(stdout, "called %s.\n", FUNC);
 #endif
 
     if (file == NULL)
@@ -1203,8 +1204,8 @@ done:
 static herr_t
 H5FD__hdfs_close(H5FD_t *_file)
 {
-    herr_t       ret_value = SUCCEED;
     H5FD_hdfs_t *file      = (H5FD_hdfs_t *)_file;
+    herr_t       ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC
 
@@ -1245,8 +1246,8 @@ done:
  *     field-by-field.
  *
  * Return:
- *     + Equivalent:      0
- *     + Not Equivalent: -1
+ *      Equivalent:      0
+ *      Not Equivalent: -1
  *
  * Programmer: Gerd Herber
  *             May 2018
@@ -1470,8 +1471,8 @@ H5FD__hdfs_get_eof(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 static herr_t
 H5FD__hdfs_get_handle(H5FD_t *_file, hid_t H5_ATTR_UNUSED fapl, void **file_handle)
 {
-    herr_t       ret_value = SUCCEED;
     H5FD_hdfs_t *file      = (H5FD_hdfs_t *)_file;
+    herr_t       ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC
 
@@ -1514,9 +1515,9 @@ static herr_t
 H5FD__hdfs_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr,
                 size_t size, void *buf)
 {
-    herr_t       ret_value = SUCCEED;
     H5FD_hdfs_t *file      = (H5FD_hdfs_t *)_file;
     size_t       filesize  = 0;
+    herr_t       ret_value = SUCCEED;
 #if HDFS_STATS
     /* working variables for storing stats */
     hdfs_statsbin *bin   = NULL;
@@ -1655,7 +1656,7 @@ done:
  *     No effect on Read-Only S3 file.
  *
  *     Suggestion: remove lock/unlock from class
- *               > would result in error at H5FD_[un]lock() (H5FD.c)
+ *                 would result in error at H5FD_[un]lock() (H5FD.c)
  *
  * Return:
  *
diff --git a/src/H5FDhdfs.h b/src/H5FDhdfs.h
index 05506d4..9d14e9a 100644
--- a/src/H5FDhdfs.h
+++ b/src/H5FDhdfs.h
@@ -16,7 +16,7 @@
  * Programmer:  Jacob Smith
  *              2018-04-23
  *
- * Purpose:	The public header file for the hdfs driver.
+ * Purpose:    The public header file for the hdfs driver.
  */
 
 #ifndef H5FDhdfs_H