From 78fbe02761103da30d3ed4ad1667e12683754921 Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Mon, 23 Apr 2018 17:32:39 +0200
Subject: [PATCH] Add missing declaration and fix indentation in some places
---
include/spm.h | 2 ++
src/common.h | 1 -
src/spm_integers.c | 3 ---
src/z_spm.h | 6 +++---
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/include/spm.h b/include/spm.h
index 58a9689d..dc66ea3d 100644
--- a/include/spm.h
+++ b/include/spm.h
@@ -132,6 +132,8 @@ void spmIntSort1Asc1( void * const pbase, const spm_int_t n );
void spmIntSort2Asc1( void * const pbase, const spm_int_t n );
void spmIntSort2Asc2( void * const pbase, const spm_int_t n );
+void spmIntMSortIntAsc(void ** const pbase, const spm_int_t n);
+
/**
* @}
* @name SPM IO subroutines
diff --git a/src/common.h b/src/common.h
index 76c22ea7..896a9905 100644
--- a/src/common.h
+++ b/src/common.h
@@ -111,6 +111,5 @@ spm_cleanenv( char *str ) {
#endif
-
#endif /* _spm_common_h_ */
diff --git a/src/spm_integers.c b/src/spm_integers.c
index 33d98444..573da54f 100644
--- a/src/spm_integers.c
+++ b/src/spm_integers.c
@@ -238,9 +238,6 @@ void spmIntSort3Asc1(void *const pbase, const spm_int_t n);
*
*******************************************************************************
*/
-/* Declare here for now, because unused */
-void spmIntMSortIntAsc(void ** const pbase, const spm_int_t n);
-
#ifndef DOXYGEN_SHOULD_SKIP_THIS
#define INTSORTNAME spmIntMSortIntAsc
#define INTSORTSIZE(x) (sizeof (spm_int_t))
diff --git a/src/z_spm.h b/src/z_spm.h
index 27254c73..d00989fb 100644
--- a/src/z_spm.h
+++ b/src/z_spm.h
@@ -52,7 +52,7 @@ double z_spmNorm( int ntype, const spmatrix_t *spm );
/**
* Extra routines
*/
-void z_spmSort( spmatrix_t *spm );
+void z_spmSort( spmatrix_t *spm );
spm_int_t z_spmMergeDuplicate( spmatrix_t *spm );
spm_int_t z_spmSymmetrize( spmatrix_t *spm );
@@ -66,8 +66,8 @@ void z_spmDensePrint( FILE *f, spm_int_t m, spm_int_t n, const spm_complex64_t *
void z_spmPrint( FILE *f, const spmatrix_t *spm );
spmatrix_t *z_spmExpand(const spmatrix_t *spm);
-void z_spmDofExtend(spmatrix_t *spm);
-void z_spmScal( const double alpha, spmatrix_t *spm );
+void z_spmDofExtend(spmatrix_t *spm);
+void z_spmScal( const double alpha, spmatrix_t *spm );
#endif /* _z_spm_h_ */
--
GitLab