VFD SWMR: Normalization with develop (#1270)

Brings many October-November changes from develop

1 files changed, 10 insertions, 2 deletions

diff --git a/src/H5RS.c b/src/H5RS.c
index d9915f2..65cfd38 100644
--- a/src/H5RS.c
+++ b/src/H5RS.c
@@ -316,8 +316,16 @@ H5RS_wrap(const char *s)
     if (NULL == (ret_value = H5FL_MALLOC(H5RS_str_t)))
         HGOTO_ERROR(H5E_RS, H5E_CANTALLOC, NULL, "memory allocation failed")
 
-    /* Set the internal fields */
-    ret_value->s   = (char *)s;
+    /* Set the internal fields
+     *
+     * We ignore warnings about storing a const char pointer in the struct
+     * since we never modify or free the string when the wrapped struct
+     * field is set to TRUE.
+     */
+    H5_GCC_CLANG_DIAG_OFF("cast-qual")
+    ret_value->s = (char *)s;
+    H5_GCC_CLANG_DIAG_ON("cast-qual")
+
     ret_value->len = HDstrlen(s);
     ret_value->end = ret_value->s + ret_value->len;