Skip to content
Snippets Groups Projects
Commit ac6a9324 authored by Thomas Jahns's avatar Thomas Jahns :cartwheel:
Browse files

Fix implicit conversions.

* Also sizeof (char) == 1 by C language definition.
parent 23e458f1
No related branches found
No related tags found
2 merge requests!91Add alternative code path for huge buffers.,!89Miscellaneous fixes and CDI-PIO improvements
......@@ -1448,7 +1448,7 @@ gridInqXCvalsSerial(grid_t *gridptr, char **xcvals)
const char **gridptr_xcvals = gridptr->vtable->inqXCvalsPtr(gridptr);
if (gridptr_xcvals && size && xcvals)
{
maxclength = gridptr->x.clength;
maxclength = (size_t) gridptr->x.clength;
for (size_t i = 0; i < size; i++) memcpy(xcvals[i], gridptr_xcvals[i], maxclength * sizeof(char));
}
......@@ -1550,8 +1550,8 @@ gridInqYCvalsSerial(grid_t *gridptr, char **ycvals)
const char **gridptr_ycvals = gridptr->vtable->inqYCvalsPtr(gridptr);
if (gridptr_ycvals && size && ycvals)
{
maxclength = gridptr->y.clength;
for (size_t i = 0; i < size; i++) memcpy(ycvals[i], gridptr_ycvals[i], maxclength * sizeof(char));
maxclength = (size_t) gridptr->y.clength;
for (size_t i = 0; i < size; i++) memcpy(ycvals[i], gridptr_ycvals[i], maxclength);
}
return (SizeType) maxclength;
......
......@@ -582,7 +582,7 @@ zaxisDefCvals(int zaxisID, const char **cvals, int clen)
if (cvals && clen)
{
zaxis_t *zaxisptr = zaxis_to_pointer(zaxisID);
const size_t size = zaxisptr->size;
const size_t size = (size_t) zaxisptr->size;
xassert(size);
zaxisptr->clength = clen;
......@@ -590,8 +590,8 @@ zaxisDefCvals(int zaxisID, const char **cvals, int clen)
for (size_t ilev = 0; ilev < size; ++ilev)
{
zaxisptr->cvals[ilev] = (char *) Malloc(clen * sizeof(char));
memcpy(zaxisptr->cvals[ilev], cvals[ilev], clen * sizeof(char));
zaxisptr->cvals[ilev] = (char *) Malloc(clen);
memcpy(zaxisptr->cvals[ilev], cvals[ilev], (size_t)clen);
}
reshSetStatus(zaxisID, &zaxisOps, RESH_DESYNC_IN_USE);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment