From 69b427bf350bb066ef1ff083f8f61c0dfdb14ac9 Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Wed, 21 Oct 2020 17:05:05 -0700 Subject: [PATCH] remove unnecessary casts from parameters to memcpy These implicitly coerce to void* so a cast is not required. --- lib/sfio/sfflsbuf.c | 2 +- lib/sfio/sfmode.c | 7 +++---- lib/sfio/sfungetc.c | 2 +- lib/sparse/SparseMatrix.c | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/sfio/sfflsbuf.c b/lib/sfio/sfflsbuf.c index e7e81456e..7c72a1e8d 100644 --- a/lib/sfio/sfflsbuf.c +++ b/lib/sfio/sfflsbuf.c @@ -80,7 +80,7 @@ int _sfflsbuf(Sfio_t * f, int c) isall = SFISALL(f, isall); if ((w = SFWR(f, data, n, f->disc)) > 0) { if ((n -= w) > 0) /* save unwritten data, then resume */ - memcpy((char *) f->data, (char *) data + w, n); + memcpy(f->data, (char *) data + w, n); f->next = f->data + n; if (c < 0 && (!isall || n == 0)) break; diff --git a/lib/sfio/sfmode.c b/lib/sfio/sfmode.c index 0cc883ee1..85fc83b1b 100644 --- a/lib/sfio/sfmode.c +++ b/lib/sfio/sfmode.c @@ -109,8 +109,7 @@ int _sfsetpool(Sfio_t * f) goto done; /* move old array to new one */ - memcpy((void *) array, (void *) p->sf, - p->n_sf * sizeof(Sfio_t *)); + memcpy(array, p->sf, p->n_sf * sizeof(Sfio_t *)); if (p->sf != p->array) free(p->sf); @@ -262,13 +261,13 @@ static int _sfpmode(Sfio_t * f, int type) } } if (p->ndata > 0) - memcpy((void *) p->rdata, (void *) f->next, p->ndata); + memcpy(p->rdata, f->next, p->ndata); f->endb = f->data; } else { /* restore read data */ if (p->ndata > f->size) /* may lose data!!! */ p->ndata = f->size; if (p->ndata > 0) { - memcpy((void *) f->data, (void *) p->rdata, p->ndata); + memcpy(f->data, p->rdata, p->ndata); f->endb = f->data + p->ndata; p->ndata = 0; } diff --git a/lib/sfio/sfungetc.c b/lib/sfio/sfungetc.c index add8a1962..31f79d105 100644 --- a/lib/sfio/sfungetc.c +++ b/lib/sfio/sfungetc.c @@ -78,7 +78,7 @@ int sfungetc(Sfio_t * f, int c) } f->flags |= SF_MALLOC; if (f->data) - memcpy((char *) (data + 16), (char *) f->data, f->size); + memcpy(data + 16, f->data, f->size); f->size += 16; f->data = data; f->next = data + 16; diff --git a/lib/sparse/SparseMatrix.c b/lib/sparse/SparseMatrix.c index ac68b36a4..19fe5f770 100644 --- a/lib/sparse/SparseMatrix.c +++ b/lib/sparse/SparseMatrix.c @@ -2988,7 +2988,7 @@ SparseMatrix SparseMatrix_get_augmented(SparseMatrix A){ assert(A->size != 0 && nz > 0); val = MALLOC(A->size*2*((size_t)nz)); memcpy(val, A->a, A->size*((size_t)nz)); - memcpy((void*)(((char*) val) + ((size_t)nz)*A->size), A->a, A->size*((size_t)nz)); + memcpy(((char*) val) + ((size_t)nz)*A->size, A->a, A->size*((size_t)nz)); } nz = 0; -- 2.40.0