From afd6873c92f2fb74427fd804f1f31bbcf71e6c37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= Date: Sun, 27 Oct 2024 00:13:54 +0200 Subject: [PATCH 1/3] Remove extra semicolon after macro which adds a function Extra semicolons are forbidden outside a function. Found by GCC 15 (Wpedantic) --- LAGraph/src/utility/LAGraph_Vector_Print.c | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/LAGraph/src/utility/LAGraph_Vector_Print.c b/LAGraph/src/utility/LAGraph_Vector_Print.c index a1e858297c..28c851e337 100644 --- a/LAGraph/src/utility/LAGraph_Vector_Print.c +++ b/LAGraph/src/utility/LAGraph_Vector_Print.c @@ -85,21 +85,21 @@ int LG_Vector_Print_ ## suffix \ return (GrB_SUCCESS) ; \ } -LG_VECTOR_PRINT (BOOL , bool , GrB_BOOL , "%d" , "%d" ) ; -LG_VECTOR_PRINT (INT8 , int8_t , GrB_INT8 , "%d" , "%d" ) ; -LG_VECTOR_PRINT (INT16 , int16_t , GrB_INT16 , "%d" , "%d" ) ; -LG_VECTOR_PRINT (INT32 , int32_t , GrB_INT32 , "%" PRId32, "%" PRId32 ) ; -LG_VECTOR_PRINT (INT64 , int64_t , GrB_INT64 , "%" PRId64, "%" PRId64 ) ; -LG_VECTOR_PRINT (UINT8 , uint8_t , GrB_UINT8 , "%d" , "%d" ) ; -LG_VECTOR_PRINT (UINT16, uint16_t, GrB_UINT16, "%d" , "%d" ) ; -LG_VECTOR_PRINT (UINT32, uint32_t, GrB_UINT32, "%" PRIu32, "%" PRIu32 ) ; -LG_VECTOR_PRINT (UINT64, uint64_t, GrB_UINT64, "%" PRIu64, "%" PRIu64 ) ; -LG_VECTOR_PRINT (FP32 , float , GrB_FP32 , "%g" , "%0.7g" ) ; -LG_VECTOR_PRINT (FP64 , double , GrB_FP64 , "%g" , "%0.15g") ; +LG_VECTOR_PRINT (BOOL , bool , GrB_BOOL , "%d" , "%d" ) +LG_VECTOR_PRINT (INT8 , int8_t , GrB_INT8 , "%d" , "%d" ) +LG_VECTOR_PRINT (INT16 , int16_t , GrB_INT16 , "%d" , "%d" ) +LG_VECTOR_PRINT (INT32 , int32_t , GrB_INT32 , "%" PRId32, "%" PRId32 ) +LG_VECTOR_PRINT (INT64 , int64_t , GrB_INT64 , "%" PRId64, "%" PRId64 ) +LG_VECTOR_PRINT (UINT8 , uint8_t , GrB_UINT8 , "%d" , "%d" ) +LG_VECTOR_PRINT (UINT16, uint16_t, GrB_UINT16, "%d" , "%d" ) +LG_VECTOR_PRINT (UINT32, uint32_t, GrB_UINT32, "%" PRIu32, "%" PRIu32 ) +LG_VECTOR_PRINT (UINT64, uint64_t, GrB_UINT64, "%" PRIu64, "%" PRIu64 ) +LG_VECTOR_PRINT (FP32 , float , GrB_FP32 , "%g" , "%0.7g" ) +LG_VECTOR_PRINT (FP64 , double , GrB_FP64 , "%g" , "%0.15g") #if 0 // would need to pass in an iscomplex flag to print creal(x) and cimag(x) -LG_VECTOR_PRINT (FC32 , GxB_FC32_t, GxB_FC32, ...) ; -LG_VECTOR_PRINT (FC64 , GxB_FC64_t, GxB_FC64, ...) ; +LG_VECTOR_PRINT (FC32 , GxB_FC32_t, GxB_FC32, ...) +LG_VECTOR_PRINT (FC64 , GxB_FC64_t, GxB_FC64, ...) #endif #undef LG_FREE_WORK From 36f108f08044a350e31f407d1279e5cefac4c376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= Date: Sun, 27 Oct 2024 01:03:44 +0200 Subject: [PATCH 2/3] Declare function with mathing return type enum SPEX_info Found by GCC (Wenum-int-mismatch) --- SPEX/SPEX_Utilities/Source/spex_gmp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPEX/SPEX_Utilities/Source/spex_gmp.h b/SPEX/SPEX_Utilities/Source/spex_gmp.h index 0c8cc7c4c0..5030370117 100644 --- a/SPEX/SPEX_Utilities/Source/spex_gmp.h +++ b/SPEX/SPEX_Utilities/Source/spex_gmp.h @@ -62,7 +62,7 @@ int64_t spex_get_gmp_ntrials (void) ; // uncomment this to print memory debugging info // #define SPEX_GMP_MEMORY_DEBUG -int spex_gmp_initialize (int primary) ; +SPEX_info spex_gmp_initialize (int primary) ; void spex_gmp_finalize (int primary) ; From 2f0d4634b4efb088950ece4c142dcd9ed0d54d01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= Date: Sun, 27 Oct 2024 01:04:18 +0200 Subject: [PATCH 3/3] Remove several unused variables Found by Clang 19 --- CHOLMOD/Check/cholmod_check.c | 1 - CHOLMOD/Cholesky/cholmod_analyze.c | 1 - CHOLMOD/Cholesky/t_cholmod_resymbol_worker.c | 1 - CHOLMOD/Modify/cholmod_rowadd.c | 1 - CHOLMOD/Modify/cholmod_rowdel.c | 1 - SPEX/Python/SPEXpy/Source/spex_python_connect.c | 1 - 6 files changed, 6 deletions(-) diff --git a/CHOLMOD/Check/cholmod_check.c b/CHOLMOD/Check/cholmod_check.c index d84604fc0e..a08776af7f 100644 --- a/CHOLMOD/Check/cholmod_check.c +++ b/CHOLMOD/Check/cholmod_check.c @@ -216,7 +216,6 @@ static int check_common //-------------------------------------------------------------------------- RETURN_IF_NULL_COMMON (FALSE) ; - int init_print = print ; P2 ("%s", "\n") ; diff --git a/CHOLMOD/Cholesky/cholmod_analyze.c b/CHOLMOD/Cholesky/cholmod_analyze.c index 9a0161bb26..19bfb21e5d 100644 --- a/CHOLMOD/Cholesky/cholmod_analyze.c +++ b/CHOLMOD/Cholesky/cholmod_analyze.c @@ -421,7 +421,6 @@ cholmod_factor *CHOLMOD(analyze_p2) //-------------------------------------------------------------------------- n = A->nrow ; - ncol = A->ncol ; //-------------------------------------------------------------------------- // set the default strategy diff --git a/CHOLMOD/Cholesky/t_cholmod_resymbol_worker.c b/CHOLMOD/Cholesky/t_cholmod_resymbol_worker.c index 3b3d07a6c4..2ffc40ae49 100644 --- a/CHOLMOD/Cholesky/t_cholmod_resymbol_worker.c +++ b/CHOLMOD/Cholesky/t_cholmod_resymbol_worker.c @@ -29,7 +29,6 @@ static void TEMPLATE (cholmod_resymbol_worker) Int *Ap = A->p ; Int *Anz = A->nz ; bool apacked = A->packed ; - bool sorted = A->sorted ; int stype = A->stype ; Int *Li = L->i ; diff --git a/CHOLMOD/Modify/cholmod_rowadd.c b/CHOLMOD/Modify/cholmod_rowadd.c index 0b83e9dbcc..9affebfec1 100644 --- a/CHOLMOD/Modify/cholmod_rowadd.c +++ b/CHOLMOD/Modify/cholmod_rowadd.c @@ -136,7 +136,6 @@ int CHOLMOD(rowadd_mark) RETURN_IF_NULL (R, FALSE) ; RETURN_IF_XTYPE_INVALID (L, CHOLMOD_PATTERN, CHOLMOD_REAL, FALSE) ; RETURN_IF_XTYPE_INVALID (R, CHOLMOD_REAL, CHOLMOD_REAL, FALSE) ; - Int n = L->n ; Int k = kadd ; if (kadd >= L->n || k < 0) { diff --git a/CHOLMOD/Modify/cholmod_rowdel.c b/CHOLMOD/Modify/cholmod_rowdel.c index ce10ac1ff3..8b2ed82830 100644 --- a/CHOLMOD/Modify/cholmod_rowdel.c +++ b/CHOLMOD/Modify/cholmod_rowdel.c @@ -122,7 +122,6 @@ int CHOLMOD(rowdel_mark) RETURN_IF_NULL_COMMON (FALSE) ; RETURN_IF_NULL (L, FALSE) ; RETURN_IF_XTYPE_INVALID (L, CHOLMOD_PATTERN, CHOLMOD_REAL, FALSE) ; - Int n = L->n ; Int k = kdel ; if (kdel >= L->n || k < 0) { diff --git a/SPEX/Python/SPEXpy/Source/spex_python_connect.c b/SPEX/Python/SPEXpy/Source/spex_python_connect.c index 05fa12dafa..1bd0000c39 100644 --- a/SPEX/Python/SPEXpy/Source/spex_python_connect.c +++ b/SPEX/Python/SPEXpy/Source/spex_python_connect.c @@ -82,7 +82,6 @@ SPEX_info spex_python SPEX_options option = NULL; SPEX_create_default_options(&option); - SPEX_preorder order_in = ordering; option->order = ordering; //--------------------------------------------------------------------------