Skip to content
GitLab
Commit d8a1dfbe authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

replace malloc/realloc by Malloc/Realloc from dmemory.h

parent e3726a37
Hide whitespace changes
Inline Side-by-side
src/file.c
View file @ d8a1dfbe
......@@ -190,7 +190,7 @@ void file_list_new(void)
{
assert(_fileList == NULL);
_fileList = (filePtrToIdx *)malloc((size_t)_file_max * sizeof (filePtrToIdx));
_fileList = (filePtrToIdx *) Malloc((size_t)_file_max * sizeof (filePtrToIdx));
}
static
......
src/gribapi.c
View file @ d8a1dfbe
......@@ -88,7 +88,7 @@ void gribContainersNew(stream_t * streamptr)
streamptr->gribContainers = (void **) gribContainers;
#else
gribContainer_t *gribContainers
= (gribContainer_t *)malloc((size_t)nvars*sizeof(gribContainer_t));
= (gribContainer_t *) Malloc((size_t)nvars*sizeof(gribContainer_t));
for ( int varID = 0; varID < nvars; ++varID )
{
......
src/gribapi_utilities.c
View file @ d8a1dfbe
......@@ -32,9 +32,9 @@ char* gribCopyString(grib_handle* gribHandle, const char* key)
#ifdef HAVE_GRIB_GET_LENGTH
if(!grib_get_length(gribHandle, key, &length))
{
char* result = (char *)malloc(length);
char* result = (char *) Malloc(length);
if(!grib_get_string(gribHandle, key, result, &length))
result = (char *)realloc(result, length);
result = (char *) Realloc(result, length);
else
{
......@@ -48,7 +48,7 @@ char* gribCopyString(grib_handle* gribHandle, const char* key)
* this unlikely in grib_api versions
* not providing grib_get_length */
int rc;
result = (char *)malloc(length);
result = (char *) Malloc(length);
while ((rc = grib_get_string(gribHandle, key, result, &length))
== GRIB_BUFFER_TOO_SMALL || rc == GRIB_ARRAY_TOO_SMALL)
{
......@@ -80,7 +80,7 @@ bool gribCheckString(grib_handle* gribHandle, const char* key, const char* expec
size_t length;
if(grib_get_length(gribHandle, key, &length)) return false;
if(length != expectedLength) return false;
char *value = (char *)malloc(length);
char *value = (char *) Malloc(length);
if(grib_get_string(gribHandle, key, value, &length)) return false;
int rc = !strcmp(value, expectedValue);
Free(value);
......@@ -259,7 +259,7 @@ static int addToDate(struct tm* me, long long amount, long unit)
static char* makeDateString(struct tm* me)
{
char *result
= (char *)malloc( 4+1+ 2+1+ 2+1+ 2+1+ 2+1+ 2+ 4+ 1);
= (char *) Malloc( 4+1+ 2+1+ 2+1+ 2+1+ 2+1+ 2+ 4+ 1);
sprintf(result, "%04d-%02d-%02dT%02d:%02d:%02d.000", me->tm_year + 1900, me->tm_mon + 1, me->tm_mday, me->tm_hour, me->tm_min, me->tm_sec);
return result;
}
......
src/grid.c
View file @ d8a1dfbe
......@@ -233,7 +233,7 @@ void gridGenXvals(int xsize, double xfirst, double xlast, double xinc, double *x
static
void calc_gaussgrid(double *yvals, int ysize, double yfirst, double ylast)
{
double *restrict yw = (double *)malloc((size_t)ysize * sizeof(double));
double *restrict yw = (double *) Malloc((size_t)ysize * sizeof(double));
gaussaw(yvals, yw, (size_t)ysize);
Free(yw);
for (int i = 0; i < ysize; i++ )
......@@ -273,7 +273,7 @@ void gridGenYvals(int gridtype, int ysize, double yfirst, double ylast, double y
/* printf("%g %g %g %g %g %d\n", ylast, yfirst, ylast-yfirst,yinc, 180/yinc, ny); */
if ( ny > ysize && ny < 4096 )
{
ytmp = (double *)malloc((size_t)ny * sizeof (double));
ytmp = (double *) Malloc((size_t)ny * sizeof (double));
calc_gaussgrid(ytmp, ny, yfirst, ylast);
int i;
for ( i = 0; i < (ny-ysize); i++ )
......@@ -1213,7 +1213,7 @@ void gridDefRowlon(int gridID, int nrowlon, const int rowlon[])
{
grid_t *gridptr = gridID2Ptr(gridID);
gridptr->rowlon = (int *)malloc((size_t)nrowlon * sizeof(int));
gridptr->rowlon = (int *) Malloc((size_t)nrowlon * sizeof(int));
gridptr->nrowlon = nrowlon;
memcpy(gridptr->rowlon, rowlon, (size_t)nrowlon * sizeof(int));
reshSetStatus(gridID, &gridOps, RESH_DESYNC_IN_USE);
......@@ -1278,7 +1278,7 @@ void gridDefMask(int gridID, const int *mask)
else
{
if ( gridptr->mask == NULL )
gridptr->mask = (mask_t *)malloc((size_t)size*sizeof(mask_t));
gridptr->mask = (mask_t *) Malloc((size_t)size*sizeof(mask_t));
else if ( CDI_Debug )
Warning("grid mask already defined!");
......@@ -1317,7 +1317,7 @@ void gridDefMaskGME(int gridID, const int *mask)
Error("Size undefined for gridID = %d", gridID);
if ( gridptr->mask_gme == NULL )
gridptr->mask_gme = (mask_t *)malloc((size_t)size * sizeof (mask_t));
gridptr->mask_gme = (mask_t *) Malloc((size_t)size * sizeof (mask_t));
else if ( CDI_Debug )
Warning("mask already defined!");
......@@ -1401,7 +1401,7 @@ void gridDefXvals(int gridID, const double *xvals)
if (gridptr->xvals && CDI_Debug)
Warning("values already defined!");
gridptr->xvals = (double *)realloc(gridptr->xvals,
gridptr->xvals = (double *) Realloc(gridptr->xvals,
(size_t)size * sizeof(double));
memcpy(gridptr->xvals, xvals, (size_t)size * sizeof (double));
reshSetStatus(gridID, &gridOps, RESH_DESYNC_IN_USE);
......@@ -1476,7 +1476,7 @@ void gridDefYvals(int gridID, const double *yvals)
if (gridptr->yvals && CDI_Debug)
Warning("Values already defined!");
gridptr->yvals = (double *)realloc(gridptr->yvals, (size_t)size * sizeof (double));
gridptr->yvals = (double *) Realloc(gridptr->yvals, (size_t)size * sizeof (double));
memcpy(gridptr->yvals, yvals, (size_t)size * sizeof (double));
reshSetStatus(gridID, &gridOps, RESH_DESYNC_IN_USE);
}
......@@ -1997,7 +1997,7 @@ int compareXYvals(int gridID, long xsize, long ysize, double *xvals0, double *yv
if ( !differ && xsize == gridInqXvals(gridID, NULL) )
{
double *xvals = (double *)malloc((size_t)xsize * sizeof (double));
double *xvals = (double *) Malloc((size_t)xsize * sizeof (double));
gridInqXvals(gridID, xvals);
......@@ -2013,7 +2013,7 @@ int compareXYvals(int gridID, long xsize, long ysize, double *xvals0, double *yv
if ( !differ && ysize == gridInqYvals(gridID, NULL) )
{
double *yvals = (double *)malloc((size_t)ysize * sizeof (double));
double *yvals = (double *) Malloc((size_t)ysize * sizeof (double));
gridInqYvals(gridID, yvals);
......@@ -2430,7 +2430,7 @@ int gridGenerate(const grid_t *grid)
else if ( grid->xdef == 2 )
{
double *xvals
= (double *)malloc((size_t)grid->xsize * sizeof (double));
= (double *) Malloc((size_t)grid->xsize * sizeof (double));
gridGenXvals(grid->xsize, grid->xfirst, grid->xlast, grid->xinc, xvals);
gridDefXvals(gridID, xvals);
Free(xvals);
......@@ -2448,7 +2448,7 @@ int gridGenerate(const grid_t *grid)
else if ( grid->ydef == 2 )
{
double *yvals
= (double *)malloc((size_t)grid->ysize * sizeof (double));
= (double *) Malloc((size_t)grid->ysize * sizeof (double));
gridGenYvals(grid->type, grid->ysize, grid->yfirst, grid->ylast, grid->yinc, yvals);
gridDefYvals(gridID, yvals);
Free(yvals);
......@@ -2533,7 +2533,7 @@ int gridGenerate(const grid_t *grid)
else if ( grid->ydef == 2 )
{
double *yvals
= (double *)malloc((size_t)grid->ysize * sizeof (double));
= (double *) Malloc((size_t)grid->ysize * sizeof (double));
gridGenYvals(grid->type, grid->ysize, grid->yfirst, grid->ylast, grid->yinc, yvals);
gridDefYvals(gridID, yvals);
Free(yvals);
......@@ -2642,7 +2642,7 @@ int gridDuplicate(int gridID)
int irregular = gridtype == GRID_CURVILINEAR || gridtype == GRID_UNSTRUCTURED;
if ( nrowlon )
{
gridptrnew->rowlon = (int *)malloc(nrowlon * sizeof (int));
gridptrnew->rowlon = (int *) Malloc(nrowlon * sizeof (int));
memcpy(gridptrnew->rowlon, gridptr->rowlon, nrowlon * sizeof(int));
}
......@@ -2650,7 +2650,7 @@ int gridDuplicate(int gridID)
{
size_t size = (size_t)(irregular ? gridsize : gridptr->xsize);
gridptrnew->xvals = (double *)malloc(size * sizeof (double));
gridptrnew->xvals = (double *) Malloc(size * sizeof (double));
memcpy(gridptrnew->xvals, gridptr->xvals, size * sizeof (double));
}
......@@ -2658,7 +2658,7 @@ int gridDuplicate(int gridID)
{
size_t size = (size_t)(irregular ? gridsize : gridptr->ysize);
gridptrnew->yvals = (double *)malloc(size * sizeof (double));
gridptrnew->yvals = (double *) Malloc(size * sizeof (double));
memcpy(gridptrnew->yvals, gridptr->yvals, size * sizeof (double));
}
......@@ -2667,7 +2667,7 @@ int gridDuplicate(int gridID)
size_t size = (size_t)(irregular ? gridsize : gridptr->xsize)
* (size_t)gridptr->nvertex;
gridptrnew->xbounds = (double *)malloc(size * sizeof (double));
gridptrnew->xbounds = (double *) Malloc(size * sizeof (double));
memcpy(gridptrnew->xbounds, gridptr->xbounds, size * sizeof (double));
}
......@@ -2676,7 +2676,7 @@ int gridDuplicate(int gridID)
size_t size = (size_t)(irregular ? gridsize : gridptr->ysize)
* (size_t)gridptr->nvertex;
gridptrnew->ybounds = (double *)malloc(size * sizeof (double));
gridptrnew->ybounds = (double *) Malloc(size * sizeof (double));
memcpy(gridptrnew->ybounds, gridptr->ybounds, size * sizeof (double));
}
......@@ -2684,7 +2684,7 @@ int gridDuplicate(int gridID)
{
size_t size = (size_t)gridsize;
gridptrnew->area = (double *)malloc(size * sizeof (double));
gridptrnew->area = (double *) Malloc(size * sizeof (double));
memcpy(gridptrnew->area, gridptr->area, size * sizeof (double));
}
......@@ -2692,7 +2692,7 @@ int gridDuplicate(int gridID)
{
size_t size = (size_t)gridsize;
gridptrnew->mask = (mask_t *)malloc(size * sizeof(mask_t));
gridptrnew->mask = (mask_t *) Malloc(size * sizeof(mask_t));
memcpy(gridptrnew->mask, gridptr->mask, size * sizeof (mask_t));
}
......@@ -2700,7 +2700,7 @@ int gridDuplicate(int gridID)
{
size_t size = (size_t)gridsize;
gridptrnew->mask_gme = (mask_t *)malloc(size * sizeof (mask_t));
gridptrnew->mask_gme = (mask_t *) Malloc(size * sizeof (mask_t));
memcpy(gridptrnew->mask_gme, gridptr->mask_gme, size * sizeof(mask_t));
}
......@@ -2752,19 +2752,19 @@ void gridCompress(int gridID)
gridptr->ysize = (int)gridsize;
if ( gridptr->xvals )
gridptr->xvals = (double *)realloc(gridptr->xvals, gridsize*sizeof(double));
gridptr->xvals = (double *) Realloc(gridptr->xvals, gridsize*sizeof(double));
if ( gridptr->yvals )
gridptr->yvals = (double *)realloc(gridptr->yvals, gridsize*sizeof(double));
gridptr->yvals = (double *) Realloc(gridptr->yvals, gridsize*sizeof(double));
if ( gridptr->area )
gridptr->area = (double *)realloc(gridptr->area, gridsize*sizeof(double));
gridptr->area = (double *) Realloc(gridptr->area, gridsize*sizeof(double));
if ( gridptr->xbounds )
gridptr->xbounds = (double *)realloc(gridptr->xbounds, nv*gridsize*sizeof(double));
gridptr->xbounds = (double *) Realloc(gridptr->xbounds, nv*gridsize*sizeof(double));
if ( gridptr->ybounds )
gridptr->ybounds = (double *)realloc(gridptr->ybounds, nv*gridsize*sizeof(double));
gridptr->ybounds = (double *) Realloc(gridptr->ybounds, nv*gridsize*sizeof(double));
Free(gridptr->mask_gme);
gridptr->mask_gme = NULL;
......@@ -2786,7 +2786,7 @@ void gridDefArea(int gridID, const double *area)
Error("size undefined for gridID = %d", gridID);
if ( gridptr->area == NULL )
gridptr->area = (double *)malloc(size*sizeof(double));
gridptr->area = (double *) Malloc(size*sizeof(double));
else if ( CDI_Debug )
Warning("values already defined!");
......@@ -2874,7 +2874,7 @@ void gridDefXbounds(int gridID, const double *xbounds)
Error("size undefined for gridID = %d", gridID);
if (gridptr->xbounds == NULL)
gridptr->xbounds = (double *)malloc(size * sizeof (double));
gridptr->xbounds = (double *) Malloc(size * sizeof (double));
else if ( CDI_Debug )
Warning("values already defined!");
......@@ -2961,7 +2961,7 @@ void gridDefYbounds(int gridID, const double *ybounds)
Error("size undefined for gridID = %d", gridID);
if ( gridptr->ybounds == NULL )
gridptr->ybounds = (double *)malloc(size * sizeof (double));
gridptr->ybounds = (double *) Malloc(size * sizeof (double));
else if ( CDI_Debug )
Warning("values already defined!");
......@@ -3265,7 +3265,7 @@ void gridPrintKernel(grid_t * gridptr, int index, int opt, FILE *fp)
int *rowlon;
nbyte0 = fprintf(fp, "rowlon = ");
nbyte = nbyte0;
rowlon = (int *)malloc((size_t)ysize*sizeof(int));
rowlon = (int *) Malloc((size_t)ysize*sizeof(int));
gridInqRowlon(gridID, rowlon);
for ( i = 0; i < ysize; i++ )
{
......@@ -4066,7 +4066,7 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize,
if (memberMask & gridHasRowLonFlag)
{
xassert(gridP->nrowlon);
gridP->rowlon = (int *)malloc((size_t)gridP->nrowlon * sizeof (int));
gridP->rowlon = (int *) Malloc((size_t)gridP->nrowlon * sizeof (int));
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
gridP->rowlon, gridP->nrowlon , DATATYPE_INT, context);
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
......@@ -4114,7 +4114,7 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize,
{
size = irregular ? gridP->size : gridP->xsize;
gridP->xvals = (double *)malloc((size_t)size * sizeof (double));
gridP->xvals = (double *) Malloc((size_t)size * sizeof (double));
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
gridP->xvals, size, DATATYPE_FLT64, context);
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
......@@ -4126,7 +4126,7 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize,
{
size = irregular ? gridP->size : gridP->ysize;
gridP->yvals = (double *)malloc((size_t)size * sizeof (double));
gridP->yvals = (double *) Malloc((size_t)size * sizeof (double));
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
gridP->yvals, size, DATATYPE_FLT64, context);
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
......@@ -4138,7 +4138,7 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize,
{
size = gridP->size;
xassert(size);
gridP->area = (double *)malloc((size_t)size * sizeof (double));
gridP->area = (double *) Malloc((size_t)size * sizeof (double));
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
gridP->area, size, DATATYPE_FLT64, context);
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
......@@ -4151,7 +4151,7 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize,
size = gridP->nvertex * (irregular ? gridP->size : gridP->xsize);
xassert(size);
gridP->xbounds = (double *)malloc((size_t)size * sizeof (double));
gridP->xbounds = (double *) Malloc((size_t)size * sizeof (double));
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
gridP->xbounds, size, DATATYPE_FLT64, context);
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
......@@ -4164,7 +4164,7 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize,
size = gridP->nvertex * (irregular ? gridP->size : gridP->ysize);
xassert(size);
gridP->ybounds = (double *)malloc((size_t)size * sizeof (double));
gridP->ybounds = (double *) Malloc((size_t)size * sizeof (double));
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
gridP->ybounds, size, DATATYPE_FLT64, context);
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
......@@ -4184,7 +4184,7 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize,
int referenceSize;
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
&referenceSize, 1, DATATYPE_INT, context);
gridP->reference = (char *)malloc((size_t)referenceSize);
gridP->reference = (char *) Malloc((size_t)referenceSize);
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
gridP->reference, referenceSize, DATATYPE_TXT, context);
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
......@@ -4195,7 +4195,7 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize,
if (memberMask & gridHasMaskFlag)
{
xassert((size = gridP->size));
gridP->mask = (mask_t *)malloc((size_t)size * sizeof (mask_t));
gridP->mask = (mask_t *) Malloc((size_t)size * sizeof (mask_t));
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
gridP->mask, gridP->size, DATATYPE_UCHAR, context);
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
......@@ -4206,7 +4206,7 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize,
if (memberMask & gridHasGMEMaskFlag)
{
xassert((size = gridP->size));
gridP->mask_gme = (mask_t *)malloc((size_t)size * sizeof (mask_t));
gridP->mask_gme = (mask_t *) Malloc((size_t)size * sizeof (mask_t));
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
gridP->mask_gme, gridP->size, DATATYPE_UCHAR, context);
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
......
src/input_file.c
View file @ d8a1dfbe
......@@ -73,7 +73,7 @@ CdiInputFile* cdiInputFile_make(const char* path)
}
else
{
result = (CdiInputFile *)malloc(sizeof(*result));
result = (CdiInputFile *) Malloc(sizeof(*result));
if(!cdiInputFile_condestruct(result, path))
{
//An error occured during construction, avoid a memory leak.
......@@ -87,7 +87,7 @@ CdiInputFile* cdiInputFile_make(const char* path)
{
openFileListSize *= 2;
if(openFileListSize < 16) openFileListSize = 16;
openFileList = (CdiInputFile **)realloc(openFileList, openFileListSize);
openFileList = (CdiInputFile **) Realloc(openFileList, openFileListSize);
}
xassert(openFileCount < openFileListSize);
openFileList[openFileCount++] = result;
......
src/institution.c
View file @ d8a1dfbe
......@@ -151,7 +151,7 @@ findInstitute(int id, void *res, void *data)
int institutInq(int center, int subcenter, const char *name, const char *longname)
{
institute_t * ip_ref = (institute_t *)malloc(sizeof (*ip_ref));
institute_t * ip_ref = (institute_t *) Malloc(sizeof (*ip_ref));
ip_ref->self = UNDEFID;
ip_ref->used = 0;
ip_ref->center = center;
......@@ -333,7 +333,7 @@ int instituteUnpack(void *buf, int size, int *position, int originNamespace,
int instituteID;
char *name, *longname;
serializeUnpack(buf, size, position, tempbuf, institute_nints, DATATYPE_INT, context);
name = (char *)malloc((size_t)tempbuf[3] + (size_t)tempbuf[4]);
name = (char *) Malloc((size_t)tempbuf[3] + (size_t)tempbuf[4]);
longname = name + tempbuf[3];
serializeUnpack(buf, size, position, name, tempbuf[3], DATATYPE_TXT, context);
serializeUnpack(buf, size, position, longname, tempbuf[4], DATATYPE_TXT, context);
......
src/iterator.c
View file @ d8a1dfbe
......@@ -301,7 +301,7 @@ char* cdiIterator_serialize(CdiIterator* me)
const char *ftypeStr = fileType2String(me->filetype),
*advStr = me->isAdvanced ? kAdvancedString : kUnadvancedString;
char* result = (char *)malloc(strlen(ftypeStr) + 1 + strlen(advStr) + 1
char* result = (char *) Malloc(strlen(ftypeStr) + 1 + strlen(advStr) + 1
+ strlen(subclassDescription) + 1);
sprintf(result, "%s %s %s", ftypeStr, advStr, subclassDescription);
Free(subclassDescription);
......
src/iterator_fallback.c
View file @ d8a1dfbe
......@@ -30,7 +30,7 @@ static CdiFallbackIterator *cdiFallbackIterator_condestruct(CdiFallbackIterator
{
if(me) goto destruct;
me = (CdiFallbackIterator *)malloc(sizeof(*me));
me = (CdiFallbackIterator *) Malloc(sizeof(*me));
baseIterConstruct(&me->super, filetype);
me->streamId = streamOpenRead(path);
......@@ -106,7 +106,7 @@ char *cdiFallbackIterator_serialize(CdiIterator *super)
CdiFallbackIterator *me = (CdiFallbackIterator*)super;
char *escapedPath = cdiEscapeSpaces(me->path);
char *result = (char *)malloc(strlen(escapedPath)
char *result = (char *) Malloc(strlen(escapedPath)
+ 5 * (3 * sizeof (int) * CHAR_BIT / 8 + 1) + 1);
sprintf(result, "%s %d %d %d %d %d", escapedPath, me->variableCount, me->curVariable, me->curLevelCount, me->curLevel, me->curTimestep);
Free(escapedPath);
......@@ -115,7 +115,7 @@ char *cdiFallbackIterator_serialize(CdiIterator *super)
CdiFallbackIterator *cdiFallbackIterator_deserialize(const char *description)
{
CdiFallbackIterator *me = (CdiFallbackIterator *)malloc(sizeof(*me));
CdiFallbackIterator *me = (CdiFallbackIterator *) Malloc(sizeof(*me));
if(!me) goto fail;
description = baseIter_constructFromString(&me->super, description);
......@@ -203,7 +203,7 @@ char *cdiFallbackIterator_inqTime(CdiIterator *super, bool getEndTime)
cdiDecodeDate(date, &year, &month, &day);
cdiDecodeTime(time, &hour, &minute, &second);
char *result
= (char *)malloc( 4+1 +2+1 +2+1 +2+1 +2+1 +2+4+1);
= (char *) Malloc( 4+1 +2+1 +2+1 +2+1 +2+1 +2+4+1);
sprintf(result, "%04d-%02d-%02dT%02d:%02d:%02d.000", year, month, day, hour, minute, second);
return result;
}
......
src/iterator_grib.c
View file @ d8a1dfbe
......@@ -46,7 +46,7 @@ static CdiGribIterator *cdiGribIterator_condestruct(CdiGribIterator *me, const c
{
#define super() (&me->super)
if(me) goto destruct;
me = (CdiGribIterator *)malloc(sizeof(*me));
me = (CdiGribIterator *) Malloc(sizeof(*me));
baseIterConstruct(super(), filetype);
me->file = cdiInputFile_make(path);
......@@ -88,7 +88,7 @@ CdiGribIterator *cdiGribIterator_makeClone(CdiIterator *super)
CdiGribIterator *me = (CdiGribIterator*)super;
//Allocate memory and copy data. (operations that may fail)
CdiGribIterator* result = (struct CdiGribIterator *)malloc(sizeof(*result));
CdiGribIterator* result = (struct CdiGribIterator *) Malloc(sizeof(*result));
if(!result) goto fail;
result->file = me->file;
......@@ -100,7 +100,7 @@ CdiGribIterator *cdiGribIterator_makeClone(CdiIterator *super)
if(me->gribBuffer)
{
result->gribBuffer = (unsigned char *)malloc(me->bufferSize);
result->gribBuffer = (unsigned char *) Malloc(me->bufferSize);
if(!result->gribBuffer) goto freeResult;
memcpy(result->gribBuffer, me->gribBuffer, me->curRecordSize);
}
......@@ -141,7 +141,7 @@ char *cdiGribIterator_serialize(CdiIterator *super)
const char* path = cdiInputFile_getPath(me->file);
char* escapedPath = cdiEscapeSpaces(path);
char* result = (char *)malloc(strlen(escapedPath) + 3 * sizeof(int) * CHAR_BIT/8);
char* result = (char *) Malloc(strlen(escapedPath) + 3 * sizeof(int) * CHAR_BIT/8);
sprintf(result, "%s %zu", escapedPath, me->fileOffset);
Free(escapedPath);
return result;
......@@ -151,7 +151,7 @@ char *cdiGribIterator_serialize(CdiIterator *super)
CdiGribIterator *cdiGribIterator_deserialize(const char *description)
{
char* path;
CdiGribIterator* me = (CdiGribIterator *)malloc(sizeof(*me));
CdiGribIterator* me = (CdiGribIterator *) Malloc(sizeof(*me));
if(!me) goto fail;
description = baseIter_constructFromString(&me->super, description);
......@@ -196,7 +196,7 @@ static void cdiGribIterator_ensureBuffer(CdiGribIterator *me, size_t requiredSiz
{
me->bufferSize *= 2;
if(me->bufferSize < requiredSize) me->bufferSize = requiredSize;
me->gribBuffer = (unsigned char *)realloc(me->gribBuffer, me->bufferSize);
me->gribBuffer = (unsigned char *) Realloc(me->gribBuffer, me->bufferSize);
}
}
......@@ -549,7 +549,7 @@ void cdiGribIterator_readFieldF(CdiIterator *super, float *buffer, size_t *nmiss
CdiGribIterator *me = (CdiGribIterator*)super;
size_t valueCount = gribGetArraySize(me->gribHandle, "values");
double* temp = (double *)malloc(valueCount*sizeof(*temp));
double* temp = (double *) Malloc(valueCount*sizeof(*temp));
cdiGribIterator_readField(super, temp, nmiss);
for(size_t i = valueCount; i--; ) buffer[i] = (float)temp[i];
Free(temp);
......
src/model.c
View file @ d8a1dfbe
......@@ -326,7 +326,7 @@ modelUnpack(void *buf, int size, int *position, int originNamespace, void *conte
serializeUnpack(buf, size, position, tempbuf, model_nints, DATATYPE_INT, context);
if (tempbuf[3] != 0)
{
name = (char *)malloc((size_t)tempbuf[3]);
name = (char *) Malloc((size_t)tempbuf[3]);
serializeUnpack(buf, size, position,
name, tempbuf[3], DATATYPE_TXT, context);
}
......
src/namespace.c
View file @ d8a1dfbe
......@@ -162,7 +162,7 @@ namespaceNew()
{
/* make room for additional namespace */
struct Namespace *newNameSpaces
= (struct Namespace *)malloc(((size_t)namespacesSize + 1) * sizeof (namespaces[0]));
= (struct Namespace *) Malloc(((size_t)namespacesSize + 1) * sizeof (namespaces[0]));
memcpy(newNameSpaces, namespaces, sizeof (namespaces[0]));
namespaces = newNameSpaces;
++namespacesSize;
......@@ -173,7 +173,7 @@ namespaceNew()
/* make room for additional namespace */
newNamespaceID = (int)namespacesSize;
namespaces
= (struct Namespace *)realloc(namespaces, ((size_t)namespacesSize + 1) * sizeof (namespaces[0]));
= (struct Namespace *) Realloc(namespaces, ((size_t)namespacesSize + 1) * sizeof (namespaces[0]));
++namespacesSize;
}
else /* implicit: namespacesSize >= NUM_NAMESPACES */
......
src/pio_comm.c
View file @ d8a1dfbe
......@@ -507,7 +507,7 @@ void commRecvNodeMap ( void )
xdebug ( "info->nProcsColl=%d", info->nProcsColl );
info->nodeMap = (int *)malloc((size_t)info->nProcsColl
info->nodeMap = (int *) Malloc((size_t)info->nProcsColl
* sizeof (info->nodeMap[0]));
xmpi ( MPI_Recv ( info->nodeMap, info->nProcsColl, MPI_INTEGER,
......@@ -547,7 +547,7 @@ void commEvalPhysNodes ( void )
size = info->nProcsIO * sizeNodeInfo;
nodeInfo = (nodeInfo_t *)malloc((size_t)size * sizeof (int));
nodeInfo = (nodeInfo_t *) Malloc((size_t)size * sizeof (int));
if ( info->rankGlob == info->root )
{
......@@ -587,7 +587,7 @@ void commEvalPhysNodes ( void )
xassert ( info->nProcsColl <= info->nProcsModel );
info->procsCollMap = (int *)malloc((size_t)info->nProcsColl
info->procsCollMap = (int *) Malloc((size_t)info->nProcsColl
* sizeof (info->procsCollMap[0]));
// define nodeSizes
......@@ -603,11 +603,11 @@ void commEvalPhysNodes ( void )
}
// define nodeMap
info->nodeMap = (int *)malloc((size_t)info->nProcsColl
info->nodeMap = (int *) Malloc((size_t)info->nProcsColl
* sizeof (info->nodeMap[0]));
// helpers
p1 = (int **)malloc((size_t)info->nodeInfo.nNodes * sizeof (p1[0]));
p2 = (int **)malloc((size_t)info->nodeInfo.nNodes * sizeof (p2[0]));
p1 = (int **) Malloc((size_t)info->nodeInfo.nNodes * sizeof (p1[0]));
p2 = (int **) Malloc((size_t)info->nodeInfo.nNodes * sizeof (p2[0]));
idx = 0;
for ( i = 0; i < info->nodeInfo.nNodes; i++ )
{
......@@ -689,7 +689,7 @@ void commDefCommsIO ( void )
info->nProcsModel != CDI_UNDEFID &&
info->commGlob != MPI_COMM_NULL );
info->commsIO = (MPI_Comm *)malloc((size_t)info->nProcsColl
info->commsIO = (MPI_Comm *) Malloc((size_t)info->nProcsColl
* sizeof (info->commsIO[0]));
for ( collID = 0; collID < info->nProcsColl; collID++ )
info->commsIO[collID] = MPI_COMM_NULL;
......@@ -697,7 +697,7 @@ void commDefCommsIO ( void )
strncpy ( name, "COMMSIO_", 8 );
name[MAXCOMMIONAME - 1] = '\0';
ranks = (int *)malloc(((size_t)info->nProcsModel + 1) * sizeof (ranks[0]));
ranks = (int *) Malloc(((size_t)info->nProcsModel + 1) * sizeof (ranks[0]));
for ( i = 0; i < info->nProcsModel; i++ )
ranks[i] = i;