Skip to content

refactor: replace obsolescent K&R syntax #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 12, 2021
Merged

refactor: replace obsolescent K&R syntax #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
682 changes: 69 additions & 613 deletions BLACS/TESTING/Cbt.c
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion PBLAS/SRC/PTOOLS/PB_Cctypeset.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "../PBblacs.h"
#include "../PBblas.h"

PBTYP_T * PB_Cctypeset()
PBTYP_T * PB_Cctypeset(void)
{
/*
* Purpose
Expand Down
2 changes: 1 addition & 1 deletion PBLAS/SRC/PTOOLS/PB_Cdtypeset.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "../PBblacs.h"
#include "../PBblas.h"

PBTYP_T * PB_Cdtypeset()
PBTYP_T * PB_Cdtypeset(void)
{
/*
* Purpose
Expand Down
2 changes: 1 addition & 1 deletion PBLAS/SRC/PTOOLS/PB_Citypeset.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "../PBblacs.h"
#include "../PBblas.h"

PBTYP_T * PB_Citypeset()
PBTYP_T * PB_Citypeset(void)
{
/*
* Purpose
Expand Down
2 changes: 1 addition & 1 deletion PBLAS/SRC/PTOOLS/PB_Cstypeset.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "../PBblacs.h"
#include "../PBblas.h"

PBTYP_T * PB_Cstypeset()
PBTYP_T * PB_Cstypeset(void)
{
/*
* Purpose
Expand Down
2 changes: 1 addition & 1 deletion PBLAS/SRC/PTOOLS/PB_Cztypeset.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "../PBblacs.h"
#include "../PBblas.h"

PBTYP_T * PB_Cztypeset()
PBTYP_T * PB_Cztypeset(void)
{
/*
* Purpose
Expand Down
2 changes: 1 addition & 1 deletion PBLAS/SRC/PTOOLS/PB_freebuf_.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "../PBblacs.h"
#include "../PBblas.h"

void PB_freebuf_()
void PB_freebuf_(void)
{
/*
* Purpose
Expand Down
42 changes: 10 additions & 32 deletions REDIST/SRC/pcgemr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,23 +244,16 @@ extern void Cpcgemr2d();
#include <assert.h>
#define DESCLEN 9
void
fortran_mr2d(m, n, A, ia, ja, desc_A,
B, ib, jb, desc_B)
Int *ia, *ib, *ja, *jb, *m, *n;
Int desc_A[DESCLEN], desc_B[DESCLEN];
complex *A, *B;
fortran_mr2d(Int *m, Int *n, complex *A, Int *ia, Int *ja, Int desc_A[DESCLEN],
complex *B, Int *ib, Int *jb, Int desc_B[DESCLEN])
{
Cpcgemr2do(*m, *n, A, *ia, *ja, (MDESC *) desc_A,
B, *ib, *jb, (MDESC *) desc_B);
return;
}
void
fortran_mr2dnew(m, n, A, ia, ja, desc_A,
B, ib, jb, desc_B, gcontext)
Int *ia, *ib, *ja, *jb, *m, *n;
Int desc_A[DESCLEN], desc_B[DESCLEN];
complex *A, *B;
Int *gcontext;
fortran_mr2dnew(Int *m, Int *n, complex *A, Int *ia, Int *ja, Int desc_A[DESCLEN],
complex *B, Int *ib, Int *jb, Int desc_B[DESCLEN], Int *gcontext)
{
Cpcgemr2d(*m, *n, A, *ia, *ja, (MDESC *) desc_A,
B, *ib, *jb, (MDESC *) desc_B, *gcontext);
Expand Down Expand Up @@ -572,9 +565,7 @@ Cpcgemr2d(m, n,
free(param);
}/* distrib */
static2 void
init_chenille(mypnum, nprocs, n0, proc0, n1, proc1, psend, precv, myrang)
Int nprocs, mypnum, n0, n1;
Int *proc0, *proc1, **psend, **precv, *myrang;
init_chenille(Int mypnum, Int nprocs, Int n0, Int *proc0, Int n1, Int *proc1, Int **psend, Int **precv, Int *myrang)
{
Int ns, nr, i, tot;
Int *sender, *recver, *g0, *g1;
Expand Down Expand Up @@ -645,11 +636,7 @@ Int _m,_n,_lda,_ldb; \
} \
}
static2 Int
block2buff(vi, vinb, hi, hinb, ptra, ma, buff)
Int hinb, vinb;
IDESC *hi, *vi;
MDESC *ma;
complex *buff, *ptra;
block2buff(IDESC *vi, Int vinb, IDESC *hi, Int hinb, complex *ptra, MDESC *ma, complex *buff)
{
Int h, v, sizebuff;
complex *ptr2;
Expand All @@ -667,11 +654,7 @@ block2buff(vi, vinb, hi, hinb, ptra, ma, buff)
return sizebuff;
}
static2 void
buff2block(vi, vinb, hi, hinb, buff, ptrb, mb)
Int hinb, vinb;
IDESC *hi, *vi;
MDESC *mb;
complex *buff, *ptrb;
buff2block(IDESC *vi, Int vinb, IDESC *hi, Int hinb, complex *buff, complex *ptrb, MDESC *mb)
{
Int h, v, sizebuff;
complex *ptr2;
Expand All @@ -688,9 +671,7 @@ buff2block(vi, vinb, hi, hinb, buff, ptrb, mb)
}
}
static2 Int
inter_len(hinb, hi, vinb, vi)
Int hinb, vinb;
IDESC *hi, *vi;
inter_len(Int hinb, IDESC *hi, Int vinb, IDESC *vi)
{
Int hlen, vlen, h, v;
hlen = 0;
Expand All @@ -702,9 +683,7 @@ inter_len(hinb, hi, vinb, vi)
return hlen * vlen;
}
void
Clacpy(m, n, a, lda, b, ldb)
complex *a, *b;
Int m, n, lda, ldb;
Clacpy(Int m, Int n, complex *a, Int lda, complex *b, Int ldb)
{
Int i, j;
lda -= m;
Expand All @@ -718,8 +697,7 @@ Clacpy(m, n, a, lda, b, ldb)
}
}
static2 void
gridreshape(ctxtp)
Int *ctxtp;
gridreshape(Int *ctxtp)
{
Int ori, final; /* original context, and new context created, with
* line form */
Expand Down
7 changes: 2 additions & 5 deletions REDIST/SRC/pcgemr2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,7 @@ extern void Cpcgemr2d();
/************************************************************************/
/* Set the memory space with the malloc function */
void
setmemory(adpointer, blocksize)
complex **adpointer;
Int blocksize;
setmemory(complex **adpointer, Int blocksize)
{
assert(blocksize >= 0);
if (blocksize == 0) {
Expand All @@ -128,8 +126,7 @@ setmemory(adpointer, blocksize)
/******************************************************************/
/* Free the memory space after the malloc */
void
freememory(ptrtobefreed)
complex *ptrtobefreed;
freememory(complex *ptrtobefreed)
{
if (ptrtobefreed == NULL)
return;
Expand Down
28 changes: 7 additions & 21 deletions REDIST/SRC/pctrmr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,25 +259,16 @@ extern void Cpctrmr2d();
#include <assert.h>
#define DESCLEN 9
void
fortran_mr2d(uplo, diag, m, n, A, ia, ja, desc_A,
B, ib, jb, desc_B)
char *uplo, *diag;
Int *ia, *ib, *ja, *jb, *m, *n;
Int desc_A[DESCLEN], desc_B[DESCLEN];
complex *A, *B;
fortran_mr2d(char *uplo, char *diag, Int *m, Int *n, complex *A, Int *ia, Int *ja, Int desc_A[DESCLEN],
complex *B, Int *ib, Int *jb, Int desc_B[DESCLEN])
{
Cpctrmr2do(uplo, diag, *m, *n, A, *ia, *ja, (MDESC *) desc_A,
B, *ib, *jb, (MDESC *) desc_B);
return;
}
void
fortran_mr2dnew(uplo, diag, m, n, A, ia, ja, desc_A,
B, ib, jb, desc_B, gcontext)
char *uplo, *diag;
Int *ia, *ib, *ja, *jb, *m, *n;
Int desc_A[DESCLEN], desc_B[DESCLEN];
complex *A, *B;
Int *gcontext;
fortran_mr2dnew(char *uplo, char *diag, Int *m, Int *n, complex *A, Int *ia, Int *ja, Int desc_A[DESCLEN],
complex *B, Int *ib, Int *jb, Int desc_B[DESCLEN], Int *gcontext)
{
Cpctrmr2d(uplo, diag, *m, *n, A, *ia, *ja, (MDESC *) desc_A,
B, *ib, *jb, (MDESC *) desc_B, *gcontext);
Expand Down Expand Up @@ -596,9 +587,7 @@ Cpctrmr2d(uplo, diag, m, n,
free(param);
}/* distrib */
static2 void
init_chenille(mypnum, nprocs, n0, proc0, n1, proc1, psend, precv, myrang)
Int nprocs, mypnum, n0, n1;
Int *proc0, *proc1, **psend, **precv, *myrang;
init_chenille(Int mypnum, Int nprocs, Int n0, Int *proc0, Int n1, Int *proc1, Int **psend, Int **precv, Int *myrang)
{
Int ns, nr, i, tot;
Int *sender, *recver, *g0, *g1;
Expand Down Expand Up @@ -652,9 +641,7 @@ init_chenille(mypnum, nprocs, n0, proc0, n1, proc1, psend, precv, myrang)
}
}
void
Clacpy(m, n, a, lda, b, ldb)
complex *a, *b;
Int m, n, lda, ldb;
Clacpy(Int m, Int n, complex *a, Int lda, complex *b, Int ldb)
{
Int i, j;
lda -= m;
Expand All @@ -668,8 +655,7 @@ Clacpy(m, n, a, lda, b, ldb)
}
}
static2 void
gridreshape(ctxtp)
Int *ctxtp;
gridreshape(Int *ctxtp)
{
Int ori, final; /* original context, and new context created, with
* line form */
Expand Down
7 changes: 2 additions & 5 deletions REDIST/SRC/pctrmr2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,7 @@ extern void Cpctrmr2d();
/************************************************************************/
/* Set the memory space with the malloc function */
void
setmemory(adpointer, blocksize)
complex **adpointer;
Int blocksize;
setmemory(complex **adpointer, Int blocksize)
{
assert(blocksize >= 0);
if (blocksize == 0) {
Expand All @@ -128,8 +126,7 @@ setmemory(adpointer, blocksize)
/******************************************************************/
/* Free the memory space after the malloc */
void
freememory(ptrtobefreed)
complex *ptrtobefreed;
freememory(complex *ptrtobefreed)
{
if (ptrtobefreed == NULL)
return;
Expand Down
26 changes: 7 additions & 19 deletions REDIST/SRC/pdgemr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,23 +241,16 @@ extern void Cpdgemr2d();
#include <assert.h>
#define DESCLEN 9
void
fortran_mr2d(m, n, A, ia, ja, desc_A,
B, ib, jb, desc_B)
Int *ia, *ib, *ja, *jb, *m, *n;
Int desc_A[DESCLEN], desc_B[DESCLEN];
double *A, *B;
fortran_mr2d(Int *m, Int *n, double *A, Int *ia, Int *ja, Int desc_A[DESCLEN],
double *B, Int *ib, Int *jb, Int desc_B[DESCLEN])
{
Cpdgemr2do(*m, *n, A, *ia, *ja, (MDESC *) desc_A,
B, *ib, *jb, (MDESC *) desc_B);
return;
}
void
fortran_mr2dnew(m, n, A, ia, ja, desc_A,
B, ib, jb, desc_B, gcontext)
Int *ia, *ib, *ja, *jb, *m, *n;
Int desc_A[DESCLEN], desc_B[DESCLEN];
double *A, *B;
Int *gcontext;
fortran_mr2dnew(Int *m, Int *n, double *A, Int *ia, Int *ja, Int desc_A[DESCLEN],
double *B, Int *ib, Int *jb, Int desc_B[DESCLEN], Int *gcontext)
{
Cpdgemr2d(*m, *n, A, *ia, *ja, (MDESC *) desc_A,
B, *ib, *jb, (MDESC *) desc_B, *gcontext);
Expand Down Expand Up @@ -685,9 +678,7 @@ buff2block(vi, vinb, hi, hinb, buff, ptrb, mb)
}
}
static2 Int
inter_len(hinb, hi, vinb, vi)
Int hinb, vinb;
IDESC *hi, *vi;
inter_len(Int hinb, IDESC *hi, Int vinb, IDESC *vi)
{
Int hlen, vlen, h, v;
hlen = 0;
Expand All @@ -699,9 +690,7 @@ inter_len(hinb, hi, vinb, vi)
return hlen * vlen;
}
void
Clacpy(m, n, a, lda, b, ldb)
double *a, *b;
Int m, n, lda, ldb;
Clacpy(Int m, Int n, double *a, Int lda, double *b, Int ldb)
{
Int i, j;
lda -= m;
Expand All @@ -715,8 +704,7 @@ Clacpy(m, n, a, lda, b, ldb)
}
}
static2 void
gridreshape(ctxtp)
Int *ctxtp;
gridreshape(Int *ctxtp)
{
Int ori, final; /* original context, and new context created, with
* line form */
Expand Down
7 changes: 2 additions & 5 deletions REDIST/SRC/pdgemr2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,7 @@ extern void Cpdgemr2d();
/************************************************************************/
/* Set the memory space with the malloc function */
void
setmemory(adpointer, blocksize)
double **adpointer;
Int blocksize;
setmemory(double **adpointer, Int blocksize)
{
assert(blocksize >= 0);
if (blocksize == 0) {
Expand All @@ -125,8 +123,7 @@ setmemory(adpointer, blocksize)
/******************************************************************/
/* Free the memory space after the malloc */
void
freememory(ptrtobefreed)
double *ptrtobefreed;
freememory(double *ptrtobefreed)
{
if (ptrtobefreed == NULL)
return;
Expand Down
28 changes: 7 additions & 21 deletions REDIST/SRC/pdtrmr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,25 +256,16 @@ extern void Cpdtrmr2d();
#include <assert.h>
#define DESCLEN 9
void
fortran_mr2d(uplo, diag, m, n, A, ia, ja, desc_A,
B, ib, jb, desc_B)
char *uplo, *diag;
Int *ia, *ib, *ja, *jb, *m, *n;
Int desc_A[DESCLEN], desc_B[DESCLEN];
double *A, *B;
fortran_mr2d(char *uplo, char *diag, Int *m, Int *n, double *A, Int *ia, Int *ja, Int desc_A[DESCLEN],
double *B, Int *ib, Int *jb, Int desc_B[DESCLEN])
{
Cpdtrmr2do(uplo, diag, *m, *n, A, *ia, *ja, (MDESC *) desc_A,
B, *ib, *jb, (MDESC *) desc_B);
return;
}
void
fortran_mr2dnew(uplo, diag, m, n, A, ia, ja, desc_A,
B, ib, jb, desc_B, gcontext)
char *uplo, *diag;
Int *ia, *ib, *ja, *jb, *m, *n;
Int desc_A[DESCLEN], desc_B[DESCLEN];
double *A, *B;
Int *gcontext;
fortran_mr2dnew(char *uplo, char *diag, Int *m, Int *n, double *A, Int *ia, Int *ja, Int desc_A[DESCLEN],
double *B, Int *ib, Int *jb, Int desc_B[DESCLEN], Int *gcontext)
{
Cpdtrmr2d(uplo, diag, *m, *n, A, *ia, *ja, (MDESC *) desc_A,
B, *ib, *jb, (MDESC *) desc_B, *gcontext);
Expand Down Expand Up @@ -593,9 +584,7 @@ Cpdtrmr2d(uplo, diag, m, n,
free(param);
}/* distrib */
static2 void
init_chenille(mypnum, nprocs, n0, proc0, n1, proc1, psend, precv, myrang)
Int nprocs, mypnum, n0, n1;
Int *proc0, *proc1, **psend, **precv, *myrang;
init_chenille(Int mypnum, Int nprocs, Int n0, Int *proc0, Int n1, Int *proc1, Int **psend, Int **precv, Int *myrang)
{
Int ns, nr, i, tot;
Int *sender, *recver, *g0, *g1;
Expand Down Expand Up @@ -649,9 +638,7 @@ init_chenille(mypnum, nprocs, n0, proc0, n1, proc1, psend, precv, myrang)
}
}
void
Clacpy(m, n, a, lda, b, ldb)
double *a, *b;
Int m, n, lda, ldb;
Clacpy(Int m, Int n, double *a, Int lda, double *b, Int ldb)
{
Int i, j;
lda -= m;
Expand All @@ -665,8 +652,7 @@ Clacpy(m, n, a, lda, b, ldb)
}
}
static2 void
gridreshape(ctxtp)
Int *ctxtp;
gridreshape(Int *ctxtp)
{
Int ori, final; /* original context, and new context created, with
* line form */
Expand Down
Loading