From 7e9d8867d4216dfab529ac35b4f3a4084361915a Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Wed, 4 Apr 2018 11:58:40 +0200
Subject: [PATCH] Finish to cleanup whitespace
---
.gitlab-ci-filelist.sh | 2 +-
src/spm_integers.c | 84 +++++++++++++++++++++---------------------
src/z_spm_integer.c | 68 +++++++++++++++++-----------------
3 files changed, 77 insertions(+), 77 deletions(-)
diff --git a/.gitlab-ci-filelist.sh b/.gitlab-ci-filelist.sh
index f28f7319..efdc57aa 100755
--- a/.gitlab-ci-filelist.sh
+++ b/.gitlab-ci-filelist.sh
@@ -14,7 +14,7 @@ git ls-files | grep "\.[ch]" > filelist.txt
find $BUILDDIR -name '*\.[ch]' >> filelist.txt
#echo "wrappers/python/examples/pypastix/enum.py" >> filelist.txt
-# Remove all CMakeFiles generated file
+# Remove all CMakeFiles generated files
sed -i '/CMakeFiles/d' filelist.txt
# Remove installed files
diff --git a/src/spm_integers.c b/src/spm_integers.c
index ef5b1e6a..33d98444 100644
--- a/src/spm_integers.c
+++ b/src/spm_integers.c
@@ -82,11 +82,11 @@ spmIntConvert( spm_int_t n, int *input )
#ifndef DOXYGEN_SHOULD_SKIP_THIS
#define INTSORTNAME spmIntSort1Asc1
#define INTSORTSIZE (sizeof (spm_int_t))
-#define INTSORTSWAP(p,q) do { \
- spm_int_t t; \
- t = *((spm_int_t *) (p)); \
- *((spm_int_t *) (p)) = *((spm_int_t *) (q)); \
- *((spm_int_t *) (q)) = t; \
+#define INTSORTSWAP(p,q) do { \
+ spm_int_t t; \
+ t = *((spm_int_t *) (p)); \
+ *((spm_int_t *) (p)) = *((spm_int_t *) (q)); \
+ *((spm_int_t *) (q)) = t; \
} while (0)
#define INTSORTCMP(p,q) (*((spm_int_t *) (p)) < *((spm_int_t *) (q)))
#include "integer_sort.c"
@@ -118,14 +118,14 @@ spmIntConvert( spm_int_t n, int *input )
#ifndef DOXYGEN_SHOULD_SKIP_THIS
#define INTSORTNAME spmIntSort2Asc1
#define INTSORTSIZE (2 * sizeof (spm_int_t))
-#define INTSORTSWAP(p,q) do { \
- spm_int_t t, u; \
- t = *((spm_int_t *) (p)); \
- u = *((spm_int_t *) (p) + 1); \
- *((spm_int_t *) (p)) = *((spm_int_t *) (q)); \
- *((spm_int_t *) (p) + 1) = *((spm_int_t *) (q) + 1); \
- *((spm_int_t *) (q)) = t; \
- *((spm_int_t *) (q) + 1) = u; \
+#define INTSORTSWAP(p,q) do { \
+ spm_int_t t, u; \
+ t = *((spm_int_t *) (p)); \
+ u = *((spm_int_t *) (p) + 1); \
+ *((spm_int_t *) (p)) = *((spm_int_t *) (q)); \
+ *((spm_int_t *) (p) + 1) = *((spm_int_t *) (q) + 1); \
+ *((spm_int_t *) (q)) = t; \
+ *((spm_int_t *) (q) + 1) = u; \
} while (0)
#define INTSORTCMP(p,q) (*((spm_int_t *) (p)) < *((spm_int_t *) (q)))
#include "integer_sort.c"
@@ -160,17 +160,17 @@ void spmIntSort3Asc1(void *const pbase, const spm_int_t n);
#ifndef DOXYGEN_SHOULD_SKIP_THIS
#define INTSORTNAME spmIntSort3Asc1
#define INTSORTSIZE (3 * sizeof (spm_int_t))
-#define INTSORTSWAP(p,q) do { \
- spm_int_t t, u, v; \
- t = *((spm_int_t *) (p)); \
- u = *((spm_int_t *) (p) + 1); \
- v = *((spm_int_t *) (p) + 2); \
- *((spm_int_t *) (p)) = *((spm_int_t *) (q)); \
- *((spm_int_t *) (p) + 1) = *((spm_int_t *) (q) + 1); \
- *((spm_int_t *) (p) + 2) = *((spm_int_t *) (q) + 2); \
- *((spm_int_t *) (q)) = t; \
- *((spm_int_t *) (q) + 1) = u; \
- *((spm_int_t *) (q) + 2) = v; \
+#define INTSORTSWAP(p,q) do { \
+ spm_int_t t, u, v; \
+ t = *((spm_int_t *) (p)); \
+ u = *((spm_int_t *) (p) + 1); \
+ v = *((spm_int_t *) (p) + 2); \
+ *((spm_int_t *) (p)) = *((spm_int_t *) (q)); \
+ *((spm_int_t *) (p) + 1) = *((spm_int_t *) (q) + 1); \
+ *((spm_int_t *) (p) + 2) = *((spm_int_t *) (q) + 2); \
+ *((spm_int_t *) (q)) = t; \
+ *((spm_int_t *) (q) + 1) = u; \
+ *((spm_int_t *) (q) + 2) = v; \
} while (0)
#define INTSORTCMP(p,q) (*((spm_int_t *) (p)) < *((spm_int_t *) (q)))
#include "integer_sort.c"
@@ -201,14 +201,14 @@ void spmIntSort3Asc1(void *const pbase, const spm_int_t n);
#ifndef DOXYGEN_SHOULD_SKIP_THIS
#define INTSORTNAME spmIntSort2Asc2
#define INTSORTSIZE (2 * sizeof (spm_int_t))
-#define INTSORTSWAP(p,q) do { \
- spm_int_t t, u; \
- t = *((spm_int_t *) (p)); \
- u = *((spm_int_t *) (p) + 1); \
- *((spm_int_t *) (p)) = *((spm_int_t *) (q)); \
- *((spm_int_t *) (p) + 1) = *((spm_int_t *) (q) + 1); \
- *((spm_int_t *) (q)) = t; \
- *((spm_int_t *) (q) + 1) = u; \
+#define INTSORTSWAP(p,q) do { \
+ spm_int_t t, u; \
+ t = *((spm_int_t *) (p)); \
+ u = *((spm_int_t *) (p) + 1); \
+ *((spm_int_t *) (p)) = *((spm_int_t *) (q)); \
+ *((spm_int_t *) (p) + 1) = *((spm_int_t *) (q) + 1); \
+ *((spm_int_t *) (q)) = t; \
+ *((spm_int_t *) (q) + 1) = u; \
} while (0)
#define INTSORTCMP(p,q) ((*((spm_int_t *) (p)) < *((spm_int_t *) (q))) || ((*((spm_int_t *) (p)) == *((spm_int_t *) (q))) && (*((spm_int_t *) (p) + 1) < *((spm_int_t *) (q) + 1))))
#include "integer_sort.c"
@@ -246,14 +246,14 @@ void spmIntMSortIntAsc(void ** const pbase, const spm_int_t n);
#define INTSORTSIZE(x) (sizeof (spm_int_t))
#define INTSORTNTAB 2
#define INTSORTSWAP(p,q) do { \
- spm_int_t t; \
- long disp_p = (((spm_int_t*)p)-((spm_int_t*)base_ptr)); \
- long disp_q = (((spm_int_t*)q)-((spm_int_t*)base_ptr)); \
- spm_int_t * int2ptr = *(pbase+1); \
+ spm_int_t t; \
+ long disp_p = (((spm_int_t*)p)-((spm_int_t*)base_ptr)); \
+ long disp_q = (((spm_int_t*)q)-((spm_int_t*)base_ptr)); \
+ spm_int_t * int2ptr = *(pbase+1); \
/* swap integers */ \
- t = *((spm_int_t *) (p)); \
- *((spm_int_t *) (p)) = *((spm_int_t *) (q)); \
- *((spm_int_t *) (q)) = t; \
+ t = *((spm_int_t *) (p)); \
+ *((spm_int_t *) (p)) = *((spm_int_t *) (q)); \
+ *((spm_int_t *) (q)) = t; \
/* swap on second integer array */ \
t = int2ptr[disp_p]; \
int2ptr[disp_p] = int2ptr[disp_q]; \
@@ -310,9 +310,9 @@ void spmIntMSortSmallIntAsc(void ** const pbase, const spm_int_t n);
t = int2ptr[disp_p]; \
int2ptr[disp_p] = int2ptr[disp_q]; \
int2ptr[disp_q] = t; \
- } while (0)
-#define INTSORTCMP(p,q) ((*((int *) (p)) < *((int *) (q))) || \
- ((*((int *) (p)) == *((int *) (q))) && \
+ } while (0)
+#define INTSORTCMP(p,q) ((*((int *) (p)) < *((int *) (q))) || \
+ ((*((int *) (p)) == *((int *) (q))) && \
((( int *)(*(pbase+1)))[(((int*)p)-((int*)base_ptr))] < \
(( int *)(*(pbase+1)))[(((int*)q)-((int*)base_ptr))])))
#include "integer_sort_mtypes.c"
diff --git a/src/z_spm_integer.c b/src/z_spm_integer.c
index eda3f2c8..f53fe87e 100644
--- a/src/z_spm_integer.c
+++ b/src/z_spm_integer.c
@@ -44,21 +44,21 @@ static size_t intsortsize_if[2] = { sizeof(spm_int_t), sizeof(spm_complex64_t) }
#define INTSORTNAME z_spmIntFltSortAsc
#define INTSORTSIZE(x) (intsortsize_if[x])
#define INTSORTNTAB 2
-#define INTSORTSWAP(p,q) do { \
- spm_int_t t; \
- long disp_p = (((spm_int_t*)p)-((spm_int_t*)base_ptr)); \
- long disp_q = (((spm_int_t*)q)-((spm_int_t*)base_ptr)); \
- spm_complex64_t * floatptr = *(pbase+1); \
- spm_complex64_t f; \
- /* swap integers */ \
- t = *((spm_int_t *) (p)); \
- *((spm_int_t *) (p)) = *((spm_int_t *) (q)); \
- *((spm_int_t *) (q)) = t; \
- /* swap corresponding values */ \
- f = floatptr[disp_p]; \
- floatptr[disp_p] = floatptr[disp_q]; \
- floatptr[disp_q] = f; \
- } while (0)
+#define INTSORTSWAP(p,q) do { \
+ spm_int_t t; \
+ long disp_p = (((spm_int_t*)p)-((spm_int_t*)base_ptr)); \
+ long disp_q = (((spm_int_t*)q)-((spm_int_t*)base_ptr)); \
+ spm_complex64_t * floatptr = *(pbase+1); \
+ spm_complex64_t f; \
+ /* swap integers */ \
+ t = *((spm_int_t *) (p)); \
+ *((spm_int_t *) (p)) = *((spm_int_t *) (q)); \
+ *((spm_int_t *) (q)) = t; \
+ /* swap corresponding values */ \
+ f = floatptr[disp_p]; \
+ floatptr[disp_p] = floatptr[disp_q]; \
+ floatptr[disp_q] = f; \
+ } while (0)
#define INTSORTCMP(p,q) (*((spm_int_t *) (p)) < *((spm_int_t *) (q)))
#include "integer_sort_mtypes.c"
#undef INTSORTNAME
@@ -93,25 +93,25 @@ static size_t intsortsize_iif[3] = { sizeof(spm_int_t), sizeof(spm_int_t), sizeo
#define INTSORTNAME z_spmIntIntFltSortAsc
#define INTSORTSIZE(x) (intsortsize_iif[x])
#define INTSORTNTAB 3
-#define INTSORTSWAP(p,q) do { \
- spm_int_t t; \
- long disp_p = (((spm_int_t*)p)-((spm_int_t*)base_ptr)); \
- long disp_q = (((spm_int_t*)q)-((spm_int_t*)base_ptr)); \
- spm_int_t * intptr = *(pbase+1); \
- spm_complex64_t * fltptr = *(pbase+2); \
- spm_complex64_t f; \
- /* swap integers */ \
- t = *((spm_int_t *) (p)); \
- *((spm_int_t *) (p)) = *((spm_int_t *) (q)); \
- *((spm_int_t *) (q)) = t; \
- /* swap on second integer array */ \
- t = intptr[disp_p]; \
- intptr[disp_p] = intptr[disp_q]; \
- intptr[disp_q] = t; \
- /* swap corresponding values */ \
- f = fltptr[disp_p]; \
- fltptr[disp_p] = fltptr[disp_q]; \
- fltptr[disp_q] = f; \
+#define INTSORTSWAP(p,q) do { \
+ spm_int_t t; \
+ long disp_p = (((spm_int_t*)p)-((spm_int_t*)base_ptr)); \
+ long disp_q = (((spm_int_t*)q)-((spm_int_t*)base_ptr)); \
+ spm_int_t * intptr = *(pbase+1); \
+ spm_complex64_t * fltptr = *(pbase+2); \
+ spm_complex64_t f; \
+ /* swap integers */ \
+ t = *((spm_int_t *) (p)); \
+ *((spm_int_t *) (p)) = *((spm_int_t *) (q)); \
+ *((spm_int_t *) (q)) = t; \
+ /* swap on second integer array */ \
+ t = intptr[disp_p]; \
+ intptr[disp_p] = intptr[disp_q]; \
+ intptr[disp_q] = t; \
+ /* swap corresponding values */ \
+ f = fltptr[disp_p]; \
+ fltptr[disp_p] = fltptr[disp_q]; \
+ fltptr[disp_q] = f; \
} while (0)
static inline int
--
GitLab