Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 7e9d8867 authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

Finish to cleanup whitespace

parent b5767493
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.gitlab-ci-filelist.sh
+ 1
− 1
View file @ 7e9d8867
......@@ -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
......
src/spm_integers.c
+ 42
− 42
View file @ 7e9d8867
......@@ -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"
......
src/z_spm_integer.c
+ 34
− 34
View file @ 7e9d8867
......@@ -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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment