Brings over most of the HD prefix removal (#3293)

1 files changed, 106 insertions, 106 deletions

diff --git a/src/H5FDs3comms.c b/src/H5FDs3comms.c
index 628c55a..d1cae0e 100644
--- a/src/H5FDs3comms.c
+++ b/src/H5FDs3comms.c
@@ -222,14 +222,14 @@ H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value)
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_hrb_node_set.");
-    HDprintf("NAME: %s\n", name);
-    HDprintf("VALUE: %s\n", value);
-    HDprintf("LIST:\n->");
+    fprintf(stdout, "called H5FD_s3comms_hrb_node_set.");
+    printf("NAME: %s\n", name);
+    printf("VALUE: %s\n", value);
+    printf("LIST:\n->");
     for (node_ptr = (*L); node_ptr != NULL; node_ptr = node_ptr->next)
-        HDfprintf(stdout, "{%s}\n->", node_ptr->cat);
-    HDprintf("(null)\n");
-    HDfflush(stdout);
+        fprintf(stdout, "{%s}\n->", node_ptr->cat);
+    printf("(null)\n");
+    fflush(stdout);
     node_ptr = NULL;
 #endif
 
@@ -276,7 +276,7 @@ H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value)
         ret = HDsnprintf(nvcat, catwrite, "%s: %s", name, value);
         if (ret < 0 || (size_t)ret > catlen)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "cannot concatenate `%s: %s", name, value);
-        HDassert(catlen == HDstrlen(nvcat));
+        assert(catlen == HDstrlen(nvcat));
 
         /* create new_node, should we need it
          */
@@ -301,8 +301,8 @@ H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "trying to remove node from empty list")
         else {
 #if S3COMMS_DEBUG
-            HDprintf("CREATE NEW\n");
-            HDfflush(stdout);
+            printf("CREATE NEW\n");
+            fflush(stdout);
 #endif
             /*******************
              * CREATE NEW LIST *
@@ -320,8 +320,8 @@ H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value)
 
     /* sanity-check pointer passed in
      */
-    HDassert((*L) != NULL);
-    HDassert((*L)->magic == S3COMMS_HRB_NODE_MAGIC);
+    assert((*L) != NULL);
+    assert((*L)->magic == S3COMMS_HRB_NODE_MAGIC);
     node_ptr = (*L);
 
     /* Check whether to modify/remove first node in list
@@ -332,8 +332,8 @@ H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value)
 
         if (value == NULL) {
 #if S3COMMS_DEBUG
-            HDprintf("REMOVE HEAD\n");
-            HDfflush(stdout);
+            printf("REMOVE HEAD\n");
+            fflush(stdout);
 #endif
             /***************
              * REMOVE HEAD *
@@ -342,48 +342,48 @@ H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value)
             *L = node_ptr->next;
 
 #if S3COMMS_DEBUG
-            HDprintf("FREEING CAT (node)\n");
-            HDfflush(stdout);
+            printf("FREEING CAT (node)\n");
+            fflush(stdout);
 #endif
             H5MM_xfree(node_ptr->cat);
 #if S3COMMS_DEBUG
-            HDprintf("FREEING LOWERNAME (node)\n");
-            HDfflush(stdout);
+            printf("FREEING LOWERNAME (node)\n");
+            fflush(stdout);
 #endif
             H5MM_xfree(node_ptr->lowername);
 #if S3COMMS_DEBUG
-            HDprintf("FREEING NAME (node)\n");
-            HDfflush(stdout);
+            printf("FREEING NAME (node)\n");
+            fflush(stdout);
 #endif
             H5MM_xfree(node_ptr->name);
 #if S3COMMS_DEBUG
-            HDprintf("FREEING VALUE (node)\n");
-            HDfflush(stdout);
+            printf("FREEING VALUE (node)\n");
+            fflush(stdout);
 #endif
             H5MM_xfree(node_ptr->value);
 #if S3COMMS_DEBUG
-            HDprintf("MAGIC OK? %s\n", (node_ptr->magic == S3COMMS_HRB_NODE_MAGIC) ? "YES" : "NO");
-            HDfflush(stdout);
+            printf("MAGIC OK? %s\n", (node_ptr->magic == S3COMMS_HRB_NODE_MAGIC) ? "YES" : "NO");
+            fflush(stdout);
 #endif
-            HDassert(node_ptr->magic == S3COMMS_HRB_NODE_MAGIC);
+            assert(node_ptr->magic == S3COMMS_HRB_NODE_MAGIC);
             node_ptr->magic += 1ul;
 #if S3COMMS_DEBUG
-            HDprintf("FREEING POINTER\n");
-            HDfflush(stdout);
+            printf("FREEING POINTER\n");
+            fflush(stdout);
 #endif
             H5MM_xfree(node_ptr);
 
 #if S3COMMS_DEBUG
-            HDprintf("FREEING WORKING LOWERNAME\n");
-            HDfflush(stdout);
+            printf("FREEING WORKING LOWERNAME\n");
+            fflush(stdout);
 #endif
             H5MM_xfree(lowername);
             lowername = NULL;
         }
         else {
 #if S3COMMS_DEBUG
-            HDprintf("MODIFY HEAD\n");
-            HDfflush(stdout);
+            printf("MODIFY HEAD\n");
+            fflush(stdout);
 #endif
             /***************
              * MODIFY HEAD *
@@ -412,8 +412,8 @@ H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "trying to remove a node 'before' head")
         else {
 #if S3COMMS_DEBUG
-            HDprintf("PREPEND NEW HEAD\n");
-            HDfflush(stdout);
+            printf("PREPEND NEW HEAD\n");
+            fflush(stdout);
 #endif
             /*******************
              * INSERT NEW HEAD *
@@ -441,14 +441,14 @@ H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value)
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "trying to remove absent node")
             else {
 #if S3COMMS_DEBUG
-                HDprintf("APPEND A NODE\n");
-                HDfflush(stdout);
+                printf("APPEND A NODE\n");
+                fflush(stdout);
 #endif
                 /*******************
                  * APPEND NEW NODE *
                  *******************/
 
-                HDassert(HDstrcmp(lowername, node_ptr->lowername) > 0);
+                assert(HDstrcmp(lowername, node_ptr->lowername) > 0);
                 new_node->name      = namecpy;
                 new_node->value     = valuecpy;
                 new_node->lowername = lowername;
@@ -464,14 +464,14 @@ H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value)
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "trying to remove absent node")
             else {
 #if S3COMMS_DEBUG
-                HDprintf("INSERT A NODE\n");
-                HDfflush(stdout);
+                printf("INSERT A NODE\n");
+                fflush(stdout);
 #endif
                 /*******************
                  * INSERT NEW NODE *
                  *******************/
 
-                HDassert(HDstrcmp(lowername, node_ptr->lowername) > 0);
+                assert(HDstrcmp(lowername, node_ptr->lowername) > 0);
                 new_node->name      = namecpy;
                 new_node->value     = valuecpy;
                 new_node->lowername = lowername;
@@ -493,15 +493,15 @@ H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value)
                 node_ptr->next  = tmp->next;
 
 #if S3COMMS_DEBUG
-                HDprintf("REMOVE A NODE\n");
-                HDfflush(stdout);
+                printf("REMOVE A NODE\n");
+                fflush(stdout);
 #endif
                 H5MM_xfree(tmp->cat);
                 H5MM_xfree(tmp->lowername);
                 H5MM_xfree(tmp->name);
                 H5MM_xfree(tmp->value);
 
-                HDassert(tmp->magic == S3COMMS_HRB_NODE_MAGIC);
+                assert(tmp->magic == S3COMMS_HRB_NODE_MAGIC);
                 tmp->magic += 1ul;
                 H5MM_xfree(tmp);
 
@@ -510,8 +510,8 @@ H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value)
             }
             else {
 #if S3COMMS_DEBUG
-                HDprintf("MODIFY A NODE\n");
-                HDfflush(stdout);
+                printf("MODIFY A NODE\n");
+                fflush(stdout);
 #endif
                 /*****************
                  * MODIFY A NODE *
@@ -522,7 +522,7 @@ H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value)
                 H5MM_xfree(node_ptr->value);
                 H5MM_xfree(node_ptr->cat);
 
-                HDassert(new_node->magic == S3COMMS_HRB_NODE_MAGIC);
+                assert(new_node->magic == S3COMMS_HRB_NODE_MAGIC);
                 new_node->magic += 1ul;
                 H5MM_xfree(new_node);
                 H5MM_xfree(lowername);
@@ -555,7 +555,7 @@ done:
         if (valuecpy != NULL)
             H5MM_xfree(valuecpy);
         if (new_node != NULL) {
-            HDassert(new_node->magic == S3COMMS_HRB_NODE_MAGIC);
+            assert(new_node->magic == S3COMMS_HRB_NODE_MAGIC);
             new_node->magic += 1ul;
             H5MM_xfree(new_node);
         }
@@ -609,7 +609,7 @@ H5FD_s3comms_hrb_destroy(hrb_t **_buf)
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_hrb_destroy.\n");
+    fprintf(stdout, "called H5FD_s3comms_hrb_destroy.\n");
 #endif
 
     if (_buf != NULL && *_buf != NULL) {
@@ -673,7 +673,7 @@ H5FD_s3comms_hrb_init_request(const char *_verb, const char *_resource, const ch
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_hrb_init_request.\n");
+    fprintf(stdout, "called H5FD_s3comms_hrb_init_request.\n");
 #endif
 
     if (_resource == NULL)
@@ -709,7 +709,7 @@ H5FD_s3comms_hrb_init_request(const char *_verb, const char *_resource, const ch
             HGOTO_ERROR(H5E_ARGS, H5E_CANTALLOC, NULL, "no space for resource string");
         *res = '/';
         H5MM_memcpy((&res[1]), _resource, (reslen + 1));
-        HDassert((reslen + 1) == HDstrlen(res));
+        assert((reslen + 1) == HDstrlen(res));
     } /* end if (else resource string not starting with '/') */
 
     verblen = HDstrlen(_verb) + 1;
@@ -780,7 +780,7 @@ H5FD_s3comms_s3r_close(s3r_t *handle)
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_s3r_close.\n");
+    fprintf(stdout, "called H5FD_s3comms_s3r_close.\n");
 #endif
 
     if (handle == NULL)
@@ -794,7 +794,7 @@ H5FD_s3comms_s3r_close(s3r_t *handle)
     H5MM_xfree(handle->region);
     H5MM_xfree(handle->signing_key);
 
-    HDassert(handle->httpverb != NULL);
+    assert(handle->httpverb != NULL);
     H5MM_xfree(handle->httpverb);
 
     if (FAIL == H5FD_s3comms_free_purl(handle->purl))
@@ -885,7 +885,7 @@ H5FD_s3comms_s3r_getsize(s3r_t *handle)
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_s3r_getsize.\n");
+    fprintf(stdout, "called H5FD_s3comms_s3r_getsize.\n");
 #endif
 
     if (handle == NULL)
@@ -906,7 +906,7 @@ H5FD_s3comms_s3r_getsize(s3r_t *handle)
     if (CURLE_OK != curl_easy_setopt(curlh, CURLOPT_HEADERDATA, &sds))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "error while setting CURL option (CURLOPT_HEADERDATA).");
 
-    HDassert(handle->httpverb == NULL);
+    assert(handle->httpverb == NULL);
     handle->httpverb = (char *)H5MM_malloc(sizeof(char) * 16);
     if (handle->httpverb == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_CANTALLOC, FAIL, "unable to allocate space for S3 request HTTP verb");
@@ -934,7 +934,7 @@ H5FD_s3comms_s3r_getsize(s3r_t *handle)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "No HTTP metadata")
 #if S3COMMS_DEBUG
     else
-        HDfprintf(stderr, "GETSIZE: OK\n");
+        fprintf(stderr, "GETSIZE: OK\n");
 #endif
 
     /******************
@@ -1034,7 +1034,7 @@ H5FD_s3comms_s3r_open(const char *url, const char *region, const char *id, const
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_s3r_open.\n");
+    fprintf(stdout, "called H5FD_s3comms_s3r_open.\n");
 #endif
 
     if (url == NULL || url[0] == '\0')
@@ -1044,8 +1044,8 @@ H5FD_s3comms_s3r_open(const char *url, const char *region, const char *id, const
         /* probably a malformed url, but could be internal error */
         HGOTO_ERROR(H5E_ARGS, H5E_CANTCREATE, NULL, "unable to create parsed url structure");
 
-    HDassert(purl != NULL); /* if above passes, this must be true */
-    HDassert(purl->magic == S3COMMS_PARSED_URL_MAGIC);
+    assert(purl != NULL); /* if above passes, this must be true */
+    assert(purl->magic == S3COMMS_PARSED_URL_MAGIC);
 
     handle = (s3r_t *)H5MM_malloc(sizeof(s3r_t));
     if (handle == NULL)
@@ -1137,7 +1137,7 @@ H5FD_s3comms_s3r_open(const char *url, const char *region, const char *id, const
      * FINAL PREPARATION *
      *********************/
 
-    HDassert(handle->httpverb != NULL);
+    assert(handle->httpverb != NULL);
     H5MM_memcpy(handle->httpverb, "GET", 4);
 
     ret_value = handle;
@@ -1221,7 +1221,7 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_s3r_read.\n");
+    fprintf(stdout, "called H5FD_s3comms_s3r_read.\n");
 #endif
 
     /**************************************
@@ -1236,7 +1236,7 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "handle has bad (null) curlhandle.")
     if (handle->purl == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "handle has bad (null) url.")
-    HDassert(handle->purl->magic == S3COMMS_PARSED_URL_MAGIC);
+    assert(handle->purl->magic == S3COMMS_PARSED_URL_MAGIC);
     if (offset > handle->filesize || (len + offset) > handle->filesize)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to read past EoF")
 
@@ -1292,9 +1292,9 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
             char *bytesrange_ptr = NULL; /* pointer past "bytes=" portion */
 
             bytesrange_ptr = HDstrchr(rangebytesstr, '=');
-            HDassert(bytesrange_ptr != NULL);
+            assert(bytesrange_ptr != NULL);
             bytesrange_ptr++; /* move to first char past '=' */
-            HDassert(*bytesrange_ptr != '\0');
+            assert(*bytesrange_ptr != '\0');
 
             if (CURLE_OK != curl_easy_setopt(curlh, CURLOPT_RANGE, bytesrange_ptr))
                 HGOTO_ERROR(H5E_VFL, H5E_UNINITIALIZED, FAIL,
@@ -1351,7 +1351,7 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
                                                 (const char *)handle->purl->path, "HTTP/1.1");
         if (request == NULL)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "could not allocate hrb_t request.");
-        HDassert(request->magic == S3COMMS_HRB_MAGIC);
+        assert(request->magic == S3COMMS_HRB_MAGIC);
 
         now = gmnow();
         if (ISO8601NOW(iso8601now, now) != (ISO8601_SIZE - 1))
@@ -1361,27 +1361,27 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to set x-amz-date header")
         if (headers == NULL)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "problem building headers list.");
-        HDassert(headers->magic == S3COMMS_HRB_NODE_MAGIC);
+        assert(headers->magic == S3COMMS_HRB_NODE_MAGIC);
 
         if (FAIL == H5FD_s3comms_hrb_node_set(&headers, "x-amz-content-sha256", (const char *)EMPTY_SHA256))
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to set x-amz-content-sha256 header")
         if (headers == NULL)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "problem building headers list.");
-        HDassert(headers->magic == S3COMMS_HRB_NODE_MAGIC);
+        assert(headers->magic == S3COMMS_HRB_NODE_MAGIC);
 
         if (rangebytesstr != NULL) {
             if (FAIL == H5FD_s3comms_hrb_node_set(&headers, "Range", rangebytesstr))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to set range header")
             if (headers == NULL)
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "problem building headers list.");
-            HDassert(headers->magic == S3COMMS_HRB_NODE_MAGIC);
+            assert(headers->magic == S3COMMS_HRB_NODE_MAGIC);
         }
 
         if (FAIL == H5FD_s3comms_hrb_node_set(&headers, "Host", handle->purl->host))
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to set host header")
         if (headers == NULL)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "problem building headers list.");
-        HDassert(headers->magic == S3COMMS_HRB_NODE_MAGIC);
+        assert(headers->magic == S3COMMS_HRB_NODE_MAGIC);
 
         request->first_header = headers;
 
@@ -1421,7 +1421,7 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
 
         node = request->first_header;
         while (node != NULL) {
-            HDassert(node->magic == S3COMMS_HRB_NODE_MAGIC);
+            assert(node->magic == S3COMMS_HRB_NODE_MAGIC);
             curlheaders = curl_slist_append(curlheaders, (const char *)node->cat);
             if (curlheaders == NULL)
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "could not append header to curl slist.");
@@ -1460,8 +1460,8 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
         if (p_status != CURLE_OK) {
             if (CURLE_OK != curl_easy_getinfo(curlh, CURLINFO_RESPONSE_CODE, &httpcode))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "problem getting response code")
-            HDfprintf(stderr, "CURL ERROR CODE: %d\nHTTP CODE: %d\n", p_status, httpcode);
-            HDfprintf(stderr, "%s\n", curl_easy_strerror(p_status));
+            fprintf(stderr, "CURL ERROR CODE: %d\nHTTP CODE: %d\n", p_status, httpcode);
+            fprintf(stderr, "%s\n", curl_easy_strerror(p_status));
             HGOTO_ERROR(H5E_VFL, H5E_CANTOPENFILE, FAIL, "problem while performing request.");
         }
         if (CURLE_OK != curl_easy_setopt(curlh, CURLOPT_ERRORBUFFER, NULL))
@@ -1476,19 +1476,19 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
 
 #if S3COMMS_DEBUG
     if (dest != NULL) {
-        HDfprintf(stderr, "len: %d\n", (int)len);
-        HDfprintf(stderr, "CHECKING FOR BUFFER OVERFLOW\n");
+        fprintf(stderr, "len: %d\n", (int)len);
+        fprintf(stderr, "CHECKING FOR BUFFER OVERFLOW\n");
         if (sds == NULL)
-            HDfprintf(stderr, "sds is NULL!\n");
+            fprintf(stderr, "sds is NULL!\n");
         else {
-            HDfprintf(stderr, "sds: 0x%lx\n", (long long)sds);
-            HDfprintf(stderr, "sds->size: %d\n", (int)sds->size);
+            fprintf(stderr, "sds: 0x%lx\n", (long long)sds);
+            fprintf(stderr, "sds->size: %d\n", (int)sds->size);
             if (len > sds->size)
-                HDfprintf(stderr, "buffer overwrite\n");
+                fprintf(stderr, "buffer overwrite\n");
         }
     }
     else
-        HDfprintf(stderr, "performed on entire file\n");
+        fprintf(stderr, "performed on entire file\n");
 #endif
 
 done:
@@ -1510,10 +1510,10 @@ done:
         while (headers != NULL)
             if (FAIL == H5FD_s3comms_hrb_node_set(&headers, headers->name, NULL))
                 HDONE_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "cannot release header node")
-        HDassert(NULL == headers);
+        assert(NULL == headers);
         if (FAIL == H5FD_s3comms_hrb_destroy(&request))
             HDONE_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "cannot release header request structure")
-        HDassert(NULL == request);
+        assert(NULL == request);
     }
 
     if (curlh != NULL) {
@@ -1562,7 +1562,7 @@ gmnow(void)
     if ((time_t)(-1) != HDtime(now_ptr))
         ret_value = HDgmtime(now_ptr);
 
-    HDassert(ret_value != NULL);
+    assert(ret_value != NULL);
 
     return ret_value;
 } /* end gmnow() */
@@ -1634,12 +1634,12 @@ H5FD_s3comms_aws_canonical_request(char *canonical_request_dest, int _cr_size, c
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_aws_canonical_request.\n");
+    fprintf(stdout, "called H5FD_s3comms_aws_canonical_request.\n");
 #endif
 
     if (http_request == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "hrb object cannot be null.");
-    HDassert(http_request->magic == S3COMMS_HRB_MAGIC);
+    assert(http_request->magic == S3COMMS_HRB_MAGIC);
 
     if (canonical_request_dest == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "canonical request destination cannot be null.");
@@ -1662,7 +1662,7 @@ H5FD_s3comms_aws_canonical_request(char *canonical_request_dest, int _cr_size, c
     node = http_request->first_header; /* assumed sorted */
     while (node != NULL) {
 
-        HDassert(node->magic == S3COMMS_HRB_NODE_MAGIC);
+        assert(node->magic == S3COMMS_HRB_NODE_MAGIC);
 
         ret = HDsnprintf(tmpstr, 256, "%s:%s\n", node->lowername, node->value);
         if (ret < 0 || ret >= 256)
@@ -1741,7 +1741,7 @@ H5FD_s3comms_bytes_to_hex(char *dest, const unsigned char *msg, size_t msg_len,
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_bytes_to_hex.\n");
+    fprintf(stdout, "called H5FD_s3comms_bytes_to_hex.\n");
 #endif
 
     if (dest == NULL)
@@ -1785,11 +1785,11 @@ H5FD_s3comms_free_purl(parsed_url_t *purl)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
 #if S3COMMS_DEBUG
-    HDprintf("called H5FD_s3comms_free_purl.\n");
+    printf("called H5FD_s3comms_free_purl.\n");
 #endif
 
     if (purl != NULL) {
-        HDassert(purl->magic == S3COMMS_PARSED_URL_MAGIC);
+        assert(purl->magic == S3COMMS_PARSED_URL_MAGIC);
         if (purl->scheme != NULL)
             H5MM_xfree(purl->scheme);
         if (purl->host != NULL)
@@ -1848,7 +1848,7 @@ H5FD_s3comms_HMAC_SHA256(const unsigned char *key, size_t key_len, const char *m
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_HMAC_SHA256.\n");
+    fprintf(stdout, "called H5FD_s3comms_HMAC_SHA256.\n");
 #endif
 
     if (dest == NULL)
@@ -1938,7 +1938,7 @@ H5FD__s3comms_load_aws_creds_from_file(FILE *file, const char *profile_name, cha
     FUNC_ENTER_PACKAGE
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called load_aws_creds_from_file.\n");
+    fprintf(stdout, "called load_aws_creds_from_file.\n");
 #endif
 
     /* format target line for start of profile */
@@ -2058,7 +2058,7 @@ H5FD_s3comms_load_aws_profile(const char *profile_name, char *key_id_out, char *
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_load_aws_profile.\n");
+    fprintf(stdout, "called H5FD_s3comms_load_aws_profile.\n");
 #endif
 
 #ifdef H5_HAVE_WIN32_API
@@ -2072,7 +2072,7 @@ H5FD_s3comms_load_aws_profile(const char *profile_name, char *key_id_out, char *
     if (ret < 0 || (size_t)ret >= 128)
         HGOTO_ERROR(H5E_ARGS, H5E_CANTCOPY, FAIL, "unable to format credentials path")
 
-    credfile = HDfopen(filepath, "r");
+    credfile = fopen(filepath, "r");
     if (credfile != NULL) {
         if (H5FD__s3comms_load_aws_creds_from_file(credfile, profile_name, key_id_out, secret_access_key_out,
                                                    aws_region_out) == FAIL)
@@ -2085,7 +2085,7 @@ H5FD_s3comms_load_aws_profile(const char *profile_name, char *key_id_out, char *
     ret = HDsnprintf(filepath, 128, "%s%s", awspath, "config");
     if (ret < 0 || (size_t)ret >= 128)
         HGOTO_ERROR(H5E_ARGS, H5E_CANTCOPY, FAIL, "unable to format config path")
-    credfile = HDfopen(filepath, "r");
+    credfile = fopen(filepath, "r");
     if (credfile != NULL) {
         if (H5FD__s3comms_load_aws_creds_from_file(
                 credfile, profile_name, (*key_id_out == 0) ? key_id_out : NULL,
@@ -2143,7 +2143,7 @@ H5FD_s3comms_nlowercase(char *dest, const char *s, size_t len)
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_nlowercase.\n");
+    fprintf(stdout, "called H5FD_s3comms_nlowercase.\n");
 #endif
 
     if (dest == NULL)
@@ -2206,7 +2206,7 @@ H5FD_s3comms_parse_url(const char *str, parsed_url_t **_purl)
     FUNC_ENTER_NOAPI_NOINIT;
 
 #if S3COMMS_DEBUG
-    HDprintf("called H5FD_s3comms_parse_url.\n");
+    printf("called H5FD_s3comms_parse_url.\n");
 #endif
 
     if (str == NULL || *str == '\0')
@@ -2232,7 +2232,7 @@ H5FD_s3comms_parse_url(const char *str, parsed_url_t **_purl)
     if (tmpstr == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid SCHEME construction: probably not URL");
     len = tmpstr - curstr;
-    HDassert((0 <= len) && (len < urllen));
+    assert((0 <= len) && (len < urllen));
 
     /* check for restrictions */
     for (i = 0; i < len; i++) {
@@ -2422,7 +2422,7 @@ H5FD_s3comms_percent_encode_char(char *repr, const unsigned char c, size_t *repr
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_percent_encode_char.\n");
+    fprintf(stdout, "called H5FD_s3comms_percent_encode_char.\n");
 #endif
 
     if (repr == NULL)
@@ -2430,8 +2430,8 @@ H5FD_s3comms_percent_encode_char(char *repr, const unsigned char c, size_t *repr
 
 #if S3COMMS_DEBUG
     H5FD_s3comms_bytes_to_hex((char *)hex, s, 1, FALSE);
-    HDfprintf(stdout, "    CHAR: \'%s\'\n", s);
-    HDfprintf(stdout, "    CHAR-HEX: \"%s\"\n", hex);
+    fprintf(stdout, "    CHAR: \'%s\'\n", s);
+    fprintf(stdout, "    CHAR-HEX: \"%s\"\n", hex);
 #endif
 
     if (c <= (unsigned char)0x7f) {
@@ -2439,7 +2439,7 @@ H5FD_s3comms_percent_encode_char(char *repr, const unsigned char c, size_t *repr
          * and single percent-code
          */
 #if S3COMMS_DEBUG
-        HDfprintf(stdout, "    SINGLE-BYTE\n");
+        fprintf(stdout, "    SINGLE-BYTE\n");
 #endif
         *repr_len     = 3;
         chars_written = HDsnprintf(repr, 4, "%%%02X", c);
@@ -2454,7 +2454,7 @@ H5FD_s3comms_percent_encode_char(char *repr, const unsigned char c, size_t *repr
         unsigned int  stack_size = 0;
         unsigned char stack[4]   = {0, 0, 0, 0};
 #if S3COMMS_DEBUG
-        HDfprintf(stdout, "    MULTI-BYTE\n");
+        fprintf(stdout, "    MULTI-BYTE\n");
 #endif
         stack_size = 0;
         k          = (unsigned int)c;
@@ -2474,13 +2474,13 @@ H5FD_s3comms_percent_encode_char(char *repr, const unsigned char c, size_t *repr
          */
 
 #if S3COMMS_DEBUG
-        HDfprintf(stdout, "    STACK:\n    {\n");
+        fprintf(stdout, "    STACK:\n    {\n");
         for (i = 0; i < stack_size; i++) {
             H5FD_s3comms_bytes_to_hex((char *)hex, (&stack[i]), 1, FALSE);
             hex[2] = 0;
-            HDfprintf(stdout, "      %s,\n", hex);
+            fprintf(stdout, "      %s,\n", hex);
         }
-        HDfprintf(stdout, "    }\n");
+        fprintf(stdout, "    }\n");
 #endif
 
         /****************
@@ -2570,7 +2570,7 @@ H5FD_s3comms_signing_key(unsigned char *md, const char *secret, const char *regi
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_signing_key.\n");
+    fprintf(stdout, "called H5FD_s3comms_signing_key.\n");
 #endif
 
     if (md == NULL)
@@ -2662,7 +2662,7 @@ H5FD_s3comms_tostringtosign(char *dest, const char *req, const char *now, const
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_tostringtosign.\n");
+    fprintf(stdout, "called H5FD_s3comms_tostringtosign.\n");
 #endif
 
     if (dest == NULL)
@@ -2749,7 +2749,7 @@ H5FD_s3comms_trim(char *dest, char *s, size_t s_len, size_t *n_written)
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_trim.\n");
+    fprintf(stdout, "called H5FD_s3comms_trim.\n");
 #endif
 
     if (dest == NULL)
@@ -2839,7 +2839,7 @@ H5FD_s3comms_uriencode(char *dest, const char *s, size_t s_len, hbool_t encode_s
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "H5FD_s3comms_uriencode called.\n");
+    fprintf(stdout, "H5FD_s3comms_uriencode called.\n");
 #endif
 
     if (s == NULL)