Merge pull request #364 from edoapra/gcc15pull

edoapra · web-flow · commit 400aafa770fa · 2025-02-25T08:39:10.000-08:00
fixes for -std=gnu23
diff --git a/armci/src/common/armci.c b/armci/src/common/armci.c
@@ -149,7 +149,7 @@ void armci_abort(int code)
 
 /*For now, until no code requires a function pointer to ARMCI_Error
   (used by GA now).*/
-void ARMCI_Error(char *msg, int code)
+void ARMCI_Error(const char *msg, int code)
 {
     armci_die(msg,code);
 }
diff --git a/armci/src/include/armci.h b/armci/src/include/armci.h
@@ -158,7 +158,7 @@ extern int ARMCI_Free_local(void *ptr);
 extern int ARMCI_Same_node(int proc);
 
 extern void ARMCI_Finalize();    /* terminate ARMCI */
-extern void ARMCI_Error(char *msg, int code);
+extern void ARMCI_Error(const char *msg, int code);
 extern void ARMCI_Fence(int proc);
 extern void ARMCI_AllFence(void);
 extern int  ARMCI_Rmw(int op, void *ploc, void *prem, int extra, int proc);
diff --git a/cmx/src-armci/armci.c b/cmx/src-armci/armci.c
@@ -1179,7 +1179,7 @@ int armci_domain_same_id(armci_domain_t domain, int proc)
 }
 
 
-void ARMCI_Error(char *msg, int code)
+void ARMCI_Error(const char *msg, int code)
 {
     cmx_error(msg, code);
 }
diff --git a/cmx/src-armci/armci.h b/cmx/src-armci/armci.h
@@ -152,7 +152,7 @@ extern int ARMCI_Malloc_memdev(void* ptr_arr[], armci_size_t bytes,
 extern int ARMCI_Free_memdev(void *ptr);
 
 extern void ARMCI_Finalize();    /* terminate ARMCI */
-extern void ARMCI_Error(char *msg, int code);
+extern void ARMCI_Error(const char *msg, int code);
 extern void ARMCI_Fence(int proc);
 extern void ARMCI_AllFence();
 extern int  ARMCI_Rmw(int op, void *ploc, void *prem, int extra, int proc);
diff --git a/cmx/src-common/cmx.h b/cmx/src-common/cmx.h
@@ -85,7 +85,7 @@ extern int cmx_finalize();
  * @param[in] msg the message to print
  * @param[in] code the code to exit with
  */
-extern void cmx_error(char *msg, int code);
+extern void cmx_error(const char *msg, int code);
 
 /**
  * Create a new group from the given group and process ID list.
diff --git a/cmx/src-mpi-pr/cmx.c b/cmx/src-mpi-pr/cmx.c
@@ -762,7 +762,7 @@ int cmx_finalize()
 }
 
 
-void cmx_error(char *msg, int code)
+void cmx_error(const char *msg, int code)
 {
 #if DEBUG
     fprintf(stderr, "[%d] Received an Error in Communication: (%d) %s\n",
diff --git a/cmx/src-mpi-rma/cmx.c b/cmx/src-mpi-rma/cmx.c
@@ -203,7 +203,7 @@ int cmx_initialized()
 }
 
 
-void cmx_error(char *msg, int code)
+void cmx_error(const char *msg, int code)
 {
   fprintf(stderr,"[%d] Received an Error in Communication: (%d) %s\n",
       l_state.rank, code, msg);
diff --git a/comex/src-armci/armci.c b/comex/src-armci/armci.c
@@ -867,7 +867,7 @@ int armci_domain_same_id(armci_domain_t domain, int proc)
 }
 
 
-void ARMCI_Error(char *msg, int code)
+void ARMCI_Error(const char *msg, int code)
 {
     comex_error(msg, code);
 }
diff --git a/comex/src-armci/armci.h b/comex/src-armci/armci.h
@@ -153,7 +153,7 @@ extern int ARMCI_Free_local(void *ptr);
 extern int ARMCI_Same_node(int proc);
 
 extern void ARMCI_Finalize();    /* terminate ARMCI */
-extern void ARMCI_Error(char *msg, int code);
+extern void ARMCI_Error(const char *msg, int code);
 extern void ARMCI_Fence(int proc);
 extern void ARMCI_AllFence();
 extern int  ARMCI_Rmw(int op, void *ploc, void *prem, int extra, int proc);
diff --git a/comex/src-common/comex.h b/comex/src-common/comex.h
@@ -85,7 +85,7 @@ extern int comex_finalize();
  * @param[in] msg the message to print
  * @param[in] code the code to exit with
  */
-extern void comex_error(char *msg, int code);
+extern void comex_error(const char *msg, int code);
 
 /**
  * Create a new group from the given group and process ID list.
diff --git a/comex/src-mpi-mt/comex.c b/comex/src-mpi-mt/comex.c
@@ -455,7 +455,7 @@ int comex_finalize()
 }
 
 
-void comex_error(char *msg, int code)
+void comex_error(const char *msg, int code)
 {
 #if DEBUG
     printf("[%d] Received an Error in Communication: (%d) %s\n",
diff --git a/comex/src-mpi-pr/comex.c b/comex/src-mpi-pr/comex.c
@@ -856,7 +856,7 @@ int comex_finalize()
 }
 
 
-void comex_error(char *msg, int code)
+void comex_error(const char *msg, int code)
 {
 #if DEBUG
     fprintf(stderr, "[%d] Received an Error in Communication: (%d) %s\n",
diff --git a/comex/src-mpi-pt/comex.c b/comex/src-mpi-pt/comex.c
@@ -528,7 +528,7 @@ int comex_finalize()
 }
 
 
-void comex_error(char *msg, int code)
+void comex_error(const char *msg, int code)
 {
 #if DEBUG
     printf("[%d] Received an Error in Communication: (%d) %s\n",
diff --git a/comex/src-mpi/comex.c b/comex/src-mpi/comex.c
@@ -1327,7 +1327,7 @@ int comex_barrier(comex_group_t comex_group)
 }
 
 
-void comex_error(char *msg, int code)
+void comex_error(const char *msg, int code)
 {
     fprintf(stderr, "%s", msg);
     fprintf(stderr,"Received an Error in Communication\n");
diff --git a/comex/src-mpi3/comex.c b/comex/src-mpi3/comex.c
@@ -340,7 +340,7 @@ int comex_initialized()
 }
 
 
-void comex_error(char *msg, int code)
+void comex_error(const char *msg, int code)
 {
     fprintf(stderr,"[%d] Received an Error in Communication: (%d) %s\n",
             l_state.rank, code, msg);
diff --git a/comex/src-ofa/comex.c b/comex/src-ofa/comex.c
@@ -32,7 +32,7 @@ static long sc_page_size=-1;    /* from sysconf, in bytes */
 static void *_comex_malloc_local(size_t size, void **rinfo);
 
 
-void comex_error(char *msg, int code)
+void comex_error(const char *msg, int code)
 {
     if (0 == l_state.rank) {
         fprintf(stderr,"Received an Error in Communication\n");
diff --git a/comex/src-ofi/comex.c b/comex/src-ofi/comex.c
@@ -1272,7 +1272,7 @@ int comex_initialized()
     return initialized;
 }
 
-void comex_error(char *msg, int code)
+void comex_error(const char *msg, int code)
 {
     COMEX_OFI_LOG(ERROR, "[%d] Received an Error in Communication: (%d) %s",
                   l_state.proc, code, msg);
diff --git a/comex/src-portals4/comex.c b/comex/src-portals4/comex.c
@@ -367,7 +367,7 @@ int comex_initialized()
 }
 
 
-void comex_error(char *msg, int code)
+void comex_error(const char *msg, int code)
 {
     fprintf(stderr,"[%d] Received an Error in Communication: (%d) %s\n",
             l_state.rank, code, msg);
diff --git a/comex/src-template/comex.c b/comex/src-template/comex.c
@@ -105,7 +105,7 @@ int comex_initialized()
 }
 
 
-void comex_error(char *msg, int code)
+void comex_error(const char *msg, int code)
 {
     fprintf(stderr,"[%d] Received an Error in Communication: (%d) %s\n",
             l_state.rank, code, msg);
diff --git a/global/testing/sprsmatvec.c b/global/testing/sprsmatvec.c
@@ -166,7 +166,7 @@ void create_laplace_mat(int idim, int jdim, int kdim, int pdi, int pdj, int pdk,
   int *xld, *yld, *zld, *tmapc;
   int *ecnt, *total_distr;
   int total_max;
-  FILE *fp, *fopen();
+  FILE *fp;
 
   me = GA_Nodeid();
   nprocs = GA_Nnodes();
diff --git a/ma/error.c b/ma/error.c
@@ -24,10 +24,10 @@ public Boolean ma_error_print = MA_TRUE;
 /** terminate execution upon any error? */
 public Boolean ma_hard_fail = MA_FALSE;
 
-void (*ma_func_terminate)() = 0;
+void (*ma_func_terminate)(const char*, int) = 0;
 
 
-void MA_set_error_callback(void (*func)())
+void MA_set_error_callback(void (*func)(const char*, int))
 {
     ma_func_terminate = func;
 }
diff --git a/ma/ma.c b/ma/ma.c
@@ -153,7 +153,7 @@ private Boolean ad_big_enough(AD *ad, Pointer ar);
 private Boolean ad_eq(AD *ad, Pointer ad_target);
 private Boolean ad_gt(AD *ad, Pointer ad_target);
 private Boolean ad_le(AD *ad, Pointer ad_target);
-private Boolean ad_lt(AD *ad, Pointer ad_target);
+private Boolean ad_lt(AD *ad, AD *ad_target);
 private void ad_print(AD *ad, char *block_type);
 private void balloc_after(AR *ar, Pointer address, Pointer *client_space, ulongi *nbytes);
 private void balloc_before(AR *ar, Pointer address, Pointer *client_space, ulongi *nbytes);
@@ -169,10 +169,10 @@ private Boolean guard_check(AD *ad);
 private void guard_set(AD *ad);
 private void list_coalesce(AD *list);
 private AD *list_delete(AD *ad, AD **list);
-private int list_delete_many(AD **list, Boolean (*pred)(), Pointer closure, void (*action)());
-private AD *list_delete_one(AD **list, Boolean (*pred)(), Pointer closure);
+private int list_delete_many(AD **list, Boolean (*pred)(AD *, char *), Pointer closure, void (*action)(AD *));
+private AD *list_delete_one(AD **list, Boolean (*pred)(AD *, char *), Pointer closure);
 private void list_insert(AD *ad, AD **list);
-private void list_insert_ordered(AD *ad, AD **list, Boolean (*pred)());
+private void list_insert_ordered(AD *ad, AD **list, Boolean (*pred)(AD *, AD *));
 private Boolean list_member(AD *ad, AD *list);
 private int list_print(AD *list, char *block_type, int index_base);
 private void list_verify(AD *list, char *block_type, char *preamble, int *blocks, int *bad_blocks, int *bad_checksums, int *bad_lguards, int *bad_rguards);
@@ -574,7 +574,7 @@ private Boolean ad_le(ad, ad_target)
 
 private Boolean ad_lt(ad, ad_target)
     AD        *ad;        /* the AD to test */
-    Pointer    ad_target;    /* the AD to match */
+    AD *ad_target;    /* the AD to match */
 {
     return (ad < (AD *)ad_target) ? MA_TRUE : MA_FALSE;
 }
@@ -860,11 +860,13 @@ private void block_free_heap(ad)
         ma_hp = (Pointer)max_ad + max_ad->nbytes;
 
         /* delete any free list blocks that are no longer in heap region */
+	void (*action)(AD *);
+	action= NULL;
         (void)list_delete_many(
             &ma_hfree,
             ad_gt,
             (Pointer)max_ad,
-            (void (*)())NULL);
+            action);
 
         /* if ad is in the heap region, add it to free list */
         if (ad < max_ad)
@@ -1134,9 +1136,9 @@ private AD *list_delete(ad, list)
 
 private int list_delete_many(list, pred, closure, action)
     AD        **list;        /* the list to search */
-    Boolean    (*pred)();    /* predicate */
+    Boolean    (*pred)(AD *, Pointer);    /* predicate */
     Pointer    closure;    /* for pred */
-    void    (*action)();    /* to apply before deletion */
+    void    (*action)(AD *);    /* to apply before deletion */
 {
     AD        *ad1;        /* lead traversal pointer */
     AD        *ad2;        /* trailing traversal pointer */
@@ -1184,7 +1186,7 @@ private int list_delete_many(list, pred, closure, action)
 
 private AD *list_delete_one(list, pred, closure)
     AD        **list;        /* the list to search */
-    Boolean    (*pred)();    /* predicate */
+    Boolean    (*pred)(AD *, Pointer);    /* predicate */
     Pointer    closure;    /* for pred */
 {
     AD        *ad1;        /* lead traversal pointer */
@@ -1242,7 +1244,7 @@ private void list_insert(ad, list)
 private void list_insert_ordered(ad, list, pred)
     AD        *ad;        /* the AD to insert */
     AD        **list;        /* the list to insert into */
-    Boolean    (*pred)();    /* predicate */
+    Boolean    (*pred)(AD *, AD *);    /* predicate */
 {
     AD        *ad1;        /* lead traversal pointer */
     AD        *ad2;        /* trailing traversal pointer */
diff --git a/ma/macdecls.h b/ma/macdecls.h
@@ -100,7 +100,7 @@ extern Integer MA_sizeof_overhead(Integer datatype);
 extern void MA_summarize_allocated_blocks();
 extern void MA_trace(Boolean value);
 extern Boolean MA_verify_allocator_stuff();
-extern void MA_set_error_callback(void(*func)());
+  extern void MA_set_error_callback(void(*func)(const char*, int));
 
 extern void ma_set_error_callback();
 
diff --git a/ma/string-util.h b/ma/string-util.h
@@ -18,7 +18,7 @@
  ** function types
  **/
 
-extern unsigned int str_len();
-extern int str_match();
+extern unsigned int str_len(char *);
+extern int str_match(char *, char *slist[], unsigned int);
 
 #endif /* _string_util_h */
diff --git a/tcgmsg/tcgmsg-mpi/llog.c b/tcgmsg/tcgmsg-mpi/llog.c
@@ -17,7 +17,7 @@
 
 #include "sndrcv.h"
 
-extern void Error();
+extern void Error(char *, long int);
 
 /**
  * close and open stdin and stdout to append to a local logfile
diff --git a/tcgmsg/tcgmsg.h b/tcgmsg/tcgmsg.h
@@ -8,7 +8,7 @@
 extern "C" {
 #endif
 
-extern void   tcg_alt_pbegin();
+extern void   tcg_alt_pbegin(int *argc, char **argv[]);
 extern void   tcg_brdcst(long type, void *buf, long lenbuf, long originator);
 extern void   tcg_dgop(long type, double *x, long n, char *op);
 extern double tcg_drand48();
diff --git a/tcgmsg/tests/test.c b/tcgmsg/tests/test.c
@@ -26,7 +26,7 @@
 #include "msgtypesc.h"
 #include "tcgmsg.h"
 
-extern unsigned char CheckByte();
+unsigned char CheckByte(unsigned char *, long );
 extern void Error(const char *, Integer);
 
 
diff --git a/tcgmsg/tests/test.isend.c b/tcgmsg/tests/test.isend.c
@@ -17,7 +17,7 @@
 #include "evlog.h"
 #include "tcgmsg.h"
 
-extern unsigned char CheckByte();
+unsigned char CheckByte(unsigned char *, long );
 
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ void armci_abort(int code)`
`149`	`149`
`150`	`150`	`/*For now, until no code requires a function pointer to ARMCI_Error`
`151`	`151`	`(used by GA now).*/`
`152`		`-void ARMCI_Error(char *msg, int code)`
	`152`	`+void ARMCI_Error(const char *msg, int code)`
`153`	`153`	`{`
`154`	`154`	`armci_die(msg,code);`
`155`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1179,7 +1179,7 @@ int armci_domain_same_id(armci_domain_t domain, int proc)`
`1179`	`1179`	`}`
`1180`	`1180`
`1181`	`1181`
`1182`		`-void ARMCI_Error(char *msg, int code)`
	`1182`	`+void ARMCI_Error(const char *msg, int code)`
`1183`	`1183`	`{`
`1184`	`1184`	`cmx_error(msg, code);`
`1185`	`1185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -762,7 +762,7 @@ int cmx_finalize()`
`762`	`762`	`}`
`763`	`763`
`764`	`764`
`765`		`-void cmx_error(char *msg, int code)`
	`765`	`+void cmx_error(const char *msg, int code)`
`766`	`766`	`{`
`767`	`767`	`#if DEBUG`
`768`	`768`	`fprintf(stderr, "[%d] Received an Error in Communication: (%d) %s\n",`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ int cmx_initialized()`
`203`	`203`	`}`
`204`	`204`
`205`	`205`
`206`		`-void cmx_error(char *msg, int code)`
	`206`	`+void cmx_error(const char *msg, int code)`
`207`	`207`	`{`
`208`	`208`	`fprintf(stderr,"[%d] Received an Error in Communication: (%d) %s\n",`
`209`	`209`	`l_state.rank, code, msg);`
Original file line number	Diff line number	Diff line change
`@@ -867,7 +867,7 @@ int armci_domain_same_id(armci_domain_t domain, int proc)`
`867`	`867`	`}`
`868`	`868`
`869`	`869`
`870`		`-void ARMCI_Error(char *msg, int code)`
	`870`	`+void ARMCI_Error(const char *msg, int code)`
`871`	`871`	`{`
`872`	`872`	`comex_error(msg, code);`
`873`	`873`	`}`