diff --git a/src/H5FD.c b/src/H5FD.c
index 28f6155f87c..b50afc2bd9d 100644
--- a/src/H5FD.c
+++ b/src/H5FD.c
@@ -403,7 +403,8 @@ H5FD_register(const void *_cls, size_t size, bool app_ref)
 
     /* Copy the class structure so the caller can reuse or free it */
     if (NULL == (saved = (H5FD_class_t *)H5MM_malloc(size)))
-        HGOTO_ERROR(H5E_VFL, H5E_CANTALLOC, H5I_INVALID_HID, "memory allocation failed for file driver class struct");
+        HGOTO_ERROR(H5E_VFL, H5E_CANTALLOC, H5I_INVALID_HID,
+                    "memory allocation failed for file driver class struct");
     H5MM_memcpy(saved, cls, size);
 
     /* Create the new class ID */
diff --git a/src/H5FDspace.c b/src/H5FDspace.c
index 54747018cfd..747fdfb9bd2 100644
--- a/src/H5FDspace.c
+++ b/src/H5FDspace.c
@@ -86,7 +86,7 @@ static haddr_t
 H5FD__extend(H5FD_t *file, H5FD_mem_t type, hsize_t size)
 {
     haddr_t eoa;                     /* Address of end-of-allocated space */
-    herr_t      status;                 /* Generic status return */
+    herr_t  status;                  /* Generic status return */
     haddr_t ret_value = HADDR_UNDEF; /* Return value */
 
     FUNC_ENTER_PACKAGE
@@ -147,7 +147,7 @@ H5FD__alloc_real(H5FD_t *file, H5FD_mem_t type, hsize_t size, haddr_t *frag_addr
     hsize_t       extra;                   /* Extra space to allocate, to align request */
     unsigned long flags = 0;               /* Driver feature flags */
     bool          use_alloc_size;          /* Just pass alloc size to the driver */
-    herr_t      status;                 /* Generic status return */
+    herr_t        status;                  /* Generic status return */
     haddr_t       ret_value = HADDR_UNDEF; /* Return value */
 
     FUNC_ENTER_PACKAGE