Fix casting warnings identified with -Wcast-qual flag (#482)

LLNL · Jun 20, 2024 · 4eed309 · 4eed309
1 parent 65d0b2b
commit 4eed309
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/sundials/sundials_hashmap.c b/src/sundials/sundials_hashmap.c
@@ -140,7 +140,8 @@ SUNErrCode SUNHashMap_Destroy(SUNHashMap* map, void (*freevalue)(void* ptr))
     * ``<-1`` -- an error occurred
  */
 int SUNHashMap_Iterate(SUNHashMap map, int start,
-                       int (*yieldfn)(int, SUNHashMapKeyValue, void*), void* ctx)
+                       int (*yieldfn)(int, SUNHashMapKeyValue, const void*),
+                       const void* ctx)
 {
   int i;
 
@@ -159,7 +160,8 @@ int SUNHashMap_Iterate(SUNHashMap map, int start,
   return (map->max_size);
 }
 
-static int sunHashMapLinearProbeInsert(int idx, SUNHashMapKeyValue kv, void* ctx)
+static int sunHashMapLinearProbeInsert(int idx, SUNHashMapKeyValue kv,
+                                       const void* ctx)
 {
   /* find the next open spot */
   if (kv == NULL) { return (idx); /* open spot found at idx */ }
@@ -216,7 +218,8 @@ int SUNHashMap_Insert(SUNHashMap map, const char* key, void* value)
   return (0);
 }
 
-static int sunHashMapLinearProbeGet(int idx, SUNHashMapKeyValue kv, void* key)
+static int sunHashMapLinearProbeGet(int idx, SUNHashMapKeyValue kv,
+                                    const void* key)
 {
   /* target key cannot be NULL */
   if (key == NULL) { return (-2); }
@@ -260,8 +263,7 @@ int SUNHashMap_GetValue(SUNHashMap map, const char* key, void** value)
   if (strcmp(map->buckets[idx]->key, key))
   {
     /* Keys did not match, so we have a collision and need to probe */
-    retval = SUNHashMap_Iterate(map, idx + 1, sunHashMapLinearProbeGet,
-                                (void*)key);
+    retval = SUNHashMap_Iterate(map, idx + 1, sunHashMapLinearProbeGet, key);
     if (retval < 0) { return (-1); /* error occurred */ }
     if (retval == map->max_size) { return (-2); /* not found */ }
   }

diff --git a/src/sundials/sundials_hashmap_impl.h b/src/sundials/sundials_hashmap_impl.h
@@ -43,7 +43,8 @@ struct SUNHashMap_
 SUNErrCode SUNHashMap_New(int max_size, SUNHashMap* map);
 SUNErrCode SUNHashMap_Destroy(SUNHashMap* map, void (*freevalue)(void* ptr));
 int SUNHashMap_Iterate(SUNHashMap map, int start,
-                       int (*yieldfn)(int, SUNHashMapKeyValue, void*), void* ctx);
+                       int (*yieldfn)(int, SUNHashMapKeyValue, const void*),
+                       const void* ctx);
 int SUNHashMap_Insert(SUNHashMap map, const char* key, void* value);
 int SUNHashMap_GetValue(SUNHashMap map, const char* key, void** value);
 SUNErrCode SUNHashMap_Sort(SUNHashMap map, SUNHashMapKeyValue** sorted,

diff --git a/src/sundials/sundials_profiler.c b/src/sundials/sundials_profiler.c
@@ -543,8 +543,8 @@ int sunCompareTimes(const void* l, const void* r)
   double left_max;
   double right_max;
 
-  const SUNHashMapKeyValue left  = *((SUNHashMapKeyValue*)l);
-  const SUNHashMapKeyValue right = *((SUNHashMapKeyValue*)r);
+  const SUNHashMapKeyValue left  = *((const SUNHashMapKeyValue*)l);
+  const SUNHashMapKeyValue right = *((const SUNHashMapKeyValue*)r);
 
   if (left == NULL && right == NULL) { return 0; }
   if (left == NULL) { return 1; }