Commit cfa0d54c authored by Oliver Heidmann's avatar Oliver Heidmann
Browse files

merged cdi-conversion_c++ into trunk

parents 307d4929 ed06b81f
......@@ -190,7 +190,7 @@ void file_list_new(void)
{
assert(_fileList == NULL);
_fileList = (filePtrToIdx *)xmalloc((size_t)_file_max * sizeof (filePtrToIdx));
_fileList = (filePtrToIdx *)malloc((size_t)_file_max * sizeof (filePtrToIdx));
}
static
......
......@@ -88,7 +88,7 @@ void gribContainersNew(stream_t * streamptr)
streamptr->gribContainers = (void **) gribContainers;
#else
gribContainer_t *gribContainers
= (gribContainer_t *)xmalloc((size_t)nvars*sizeof(gribContainer_t));
= (gribContainer_t *)malloc((size_t)nvars*sizeof(gribContainer_t));
for ( int varID = 0; varID < nvars; ++varID )
{
......
......@@ -32,7 +32,7 @@ char* gribCopyString(grib_handle* gribHandle, const char* key)
#ifdef HAVE_GRIB_GET_LENGTH
if(!grib_get_length(gribHandle, key, &length))
{
char* result = (char *)xmalloc(length);
char* result = (char *)malloc(length);
if(!grib_get_string(gribHandle, key, result, &length))
result = (char *)xrealloc(result, length);
......@@ -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 *)xmalloc(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 *)xmalloc(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 *)xmalloc( 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;
}
......
......@@ -169,7 +169,7 @@ void grid_free(grid_t *gridptr)
static grid_t *
gridNewEntry(cdiResH resH)
{
grid_t *gridptr = (grid_t*) xmalloc(sizeof(grid_t));
grid_t *gridptr = (grid_t*) malloc(sizeof(grid_t));
grid_init(gridptr);
if (resH == CDI_UNDEFID)
gridptr->self = reshPut(gridptr, &gridOps);
......@@ -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 *)xmalloc((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 *)xmalloc((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++ )
......@@ -1214,7 +1214,7 @@ void gridDefRowlon(int gridID, int nrowlon, const int rowlon[])
{
grid_t *gridptr = gridID2Ptr(gridID);
gridptr->rowlon = (int *)xmalloc((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);
......@@ -1279,7 +1279,7 @@ void gridDefMask(int gridID, const int *mask)
else
{
if ( gridptr->mask == NULL )
gridptr->mask = (mask_t *)xmalloc((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!");
......@@ -1318,7 +1318,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 *)xmalloc((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!");
......@@ -2004,7 +2004,7 @@ int compareXYvals(int gridID, long xsize, long ysize, double *xvals0, double *yv
if ( !differ && xsize == gridInqXvals(gridID, NULL) )
{
double *xvals = (double *)xmalloc((size_t)xsize * sizeof (double));
double *xvals = (double *)malloc((size_t)xsize * sizeof (double));
gridInqXvals(gridID, xvals);
......@@ -2020,7 +2020,7 @@ int compareXYvals(int gridID, long xsize, long ysize, double *xvals0, double *yv
if ( !differ && ysize == gridInqYvals(gridID, NULL) )
{
double *yvals = (double *)xmalloc((size_t)ysize * sizeof (double));
double *yvals = (double *)malloc((size_t)ysize * sizeof (double));
gridInqYvals(gridID, yvals);
......@@ -2437,7 +2437,7 @@ int gridGenerate(const grid_t *grid)
else if ( grid->xdef == 2 )
{
double *xvals
= (double *)xmalloc((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);
......@@ -2455,7 +2455,7 @@ int gridGenerate(const grid_t *grid)
else if ( grid->ydef == 2 )
{
double *yvals
= (double *)xmalloc((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);
......@@ -2540,7 +2540,7 @@ int gridGenerate(const grid_t *grid)
else if ( grid->ydef == 2 )
{
double *yvals
= (double *)xmalloc((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);
......@@ -2649,7 +2649,7 @@ int gridDuplicate(int gridID)
int irregular = gridtype == GRID_CURVILINEAR || gridtype == GRID_UNSTRUCTURED;
if ( nrowlon )
{
gridptrnew->rowlon = (int *)xmalloc(nrowlon * sizeof (int));
gridptrnew->rowlon = (int *)malloc(nrowlon * sizeof (int));
memcpy(gridptrnew->rowlon, gridptr->rowlon, nrowlon * sizeof(int));
}
......@@ -2657,7 +2657,7 @@ int gridDuplicate(int gridID)
{
size_t size = (size_t)(irregular ? gridsize : gridptr->xsize);
gridptrnew->xvals = (double *)xmalloc(size * sizeof (double));
gridptrnew->xvals = (double *)malloc(size * sizeof (double));
memcpy(gridptrnew->xvals, gridptr->xvals, size * sizeof (double));
}
......@@ -2665,7 +2665,7 @@ int gridDuplicate(int gridID)
{
size_t size = (size_t)(irregular ? gridsize : gridptr->ysize);
gridptrnew->yvals = (double *)xmalloc(size * sizeof (double));
gridptrnew->yvals = (double *)malloc(size * sizeof (double));
memcpy(gridptrnew->yvals, gridptr->yvals, size * sizeof (double));
}
......@@ -2674,7 +2674,7 @@ int gridDuplicate(int gridID)
size_t size = (size_t)(irregular ? gridsize : gridptr->xsize)
* (size_t)gridptr->nvertex;
gridptrnew->xbounds = (double *)xmalloc(size * sizeof (double));
gridptrnew->xbounds = (double *)malloc(size * sizeof (double));
memcpy(gridptrnew->xbounds, gridptr->xbounds, size * sizeof (double));
}
......@@ -2683,7 +2683,7 @@ int gridDuplicate(int gridID)
size_t size = (size_t)(irregular ? gridsize : gridptr->ysize)
* (size_t)gridptr->nvertex;
gridptrnew->ybounds = (double *)xmalloc(size * sizeof (double));
gridptrnew->ybounds = (double *)malloc(size * sizeof (double));
memcpy(gridptrnew->ybounds, gridptr->ybounds, size * sizeof (double));
}
......@@ -2691,7 +2691,7 @@ int gridDuplicate(int gridID)
{
size_t size = (size_t)gridsize;
gridptrnew->area = (double *)xmalloc(size * sizeof (double));
gridptrnew->area = (double *)malloc(size * sizeof (double));
memcpy(gridptrnew->area, gridptr->area, size * sizeof (double));
}
......@@ -2699,7 +2699,7 @@ int gridDuplicate(int gridID)
{
size_t size = (size_t)gridsize;
gridptrnew->mask = (mask_t *)xmalloc(size * sizeof(mask_t));
gridptrnew->mask = (mask_t *)malloc(size * sizeof(mask_t));
memcpy(gridptrnew->mask, gridptr->mask, size * sizeof (mask_t));
}
......@@ -2707,7 +2707,7 @@ int gridDuplicate(int gridID)
{
size_t size = (size_t)gridsize;
gridptrnew->mask_gme = (mask_t *)xmalloc(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));
}
......@@ -2793,7 +2793,7 @@ void gridDefArea(int gridID, const double *area)
Error("size undefined for gridID = %d", gridID);
if ( gridptr->area == NULL )
gridptr->area = (double *)xmalloc(size*sizeof(double));
gridptr->area = (double *)malloc(size*sizeof(double));
else if ( CDI_Debug )
Warning("values already defined!");
......@@ -2881,7 +2881,7 @@ void gridDefXbounds(int gridID, const double *xbounds)
Error("size undefined for gridID = %d", gridID);
if (gridptr->xbounds == NULL)
gridptr->xbounds = (double *)xmalloc(size * sizeof (double));
gridptr->xbounds = (double *)malloc(size * sizeof (double));
else if ( CDI_Debug )
Warning("values already defined!");
......@@ -2968,7 +2968,7 @@ void gridDefYbounds(int gridID, const double *ybounds)
Error("size undefined for gridID = %d", gridID);
if ( gridptr->ybounds == NULL )
gridptr->ybounds = (double *)xmalloc(size * sizeof (double));
gridptr->ybounds = (double *)malloc(size * sizeof (double));
else if ( CDI_Debug )
Warning("values already defined!");
......@@ -3272,7 +3272,7 @@ void gridPrintKernel(grid_t * gridptr, int index, int opt, FILE *fp)
int *rowlon;
nbyte0 = fprintf(fp, "rowlon = ");
nbyte = nbyte0;
rowlon = (int *)xmalloc((size_t)ysize*sizeof(int));
rowlon = (int *)malloc((size_t)ysize*sizeof(int));
gridInqRowlon(gridID, rowlon);
for ( i = 0; i < ysize; i++ )
{
......@@ -4073,7 +4073,7 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize,
if (memberMask & gridHasRowLonFlag)
{
xassert(gridP->nrowlon);
gridP->rowlon = (int *)xmalloc((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,
......@@ -4121,7 +4121,7 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize,
{
size = irregular ? gridP->size : gridP->xsize;
gridP->xvals = (double *)xmalloc((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,
......@@ -4133,7 +4133,7 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize,
{
size = irregular ? gridP->size : gridP->ysize;
gridP->yvals = (double *)xmalloc((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,
......@@ -4145,7 +4145,7 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize,
{
size = gridP->size;
xassert(size);
gridP->area = (double *)xmalloc((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,
......@@ -4158,7 +4158,7 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize,
size = gridP->nvertex * (irregular ? gridP->size : gridP->xsize);
xassert(size);
gridP->xbounds = (double *)xmalloc((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,
......@@ -4171,7 +4171,7 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize,
size = gridP->nvertex * (irregular ? gridP->size : gridP->ysize);
xassert(size);
gridP->ybounds = (double *)xmalloc((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,
......@@ -4191,7 +4191,7 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize,
int referenceSize;
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
&referenceSize, 1, DATATYPE_INT, context);
gridP->reference = (char *)xmalloc((size_t)referenceSize);
gridP->reference = (char *)malloc((size_t)referenceSize);
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
gridP->reference, referenceSize, DATATYPE_TXT, context);
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
......@@ -4202,7 +4202,7 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize,
if (memberMask & gridHasMaskFlag)
{
xassert((size = gridP->size));
gridP->mask = (mask_t *)xmalloc((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,
......@@ -4213,7 +4213,7 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize,
if (memberMask & gridHasGMEMaskFlag)
{
xassert((size = gridP->size));
gridP->mask_gme = (mask_t *)xmalloc((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,
......
......@@ -73,7 +73,7 @@ CdiInputFile* cdiInputFile_make(const char* path)
}
else
{
result = (CdiInputFile *)xmalloc(sizeof(*result));
result = (CdiInputFile *)malloc(sizeof(*result));
if(!cdiInputFile_condestruct(result, path))
{
//An error occured during construction, avoid a memory leak.
......
......@@ -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 *)xmalloc(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;
......@@ -171,7 +171,7 @@ static
institute_t *instituteNewEntry(cdiResH resH, int center, int subcenter,
const char *name, const char *longname)
{
institute_t *instituteptr = (institute_t*) xmalloc(sizeof(institute_t));
institute_t *instituteptr = (institute_t*) malloc(sizeof(institute_t));
instituteDefaultValue(instituteptr);
if (resH == CDI_UNDEFID)
instituteptr->self = reshPut(instituteptr, &instituteOps);
......@@ -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 *)xmalloc((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);
......
......@@ -301,7 +301,7 @@ char* cdiIterator_serialize(CdiIterator* me)
const char *ftypeStr = fileType2String(me->filetype),
*advStr = me->isAdvanced ? kAdvancedString : kUnadvancedString;
char* result = (char *)xmalloc(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);
......
......@@ -30,7 +30,7 @@ static CdiFallbackIterator *cdiFallbackIterator_condestruct(CdiFallbackIterator
{
if(me) goto destruct;
me = (CdiFallbackIterator *)xmalloc(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 *)xmalloc(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 *)xmalloc(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 *)xmalloc( 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;
}
......
......@@ -46,7 +46,7 @@ static CdiGribIterator *cdiGribIterator_condestruct(CdiGribIterator *me, const c
{
#define super() (&me->super)
if(me) goto destruct;
me = (CdiGribIterator *)xmalloc(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 *)xmalloc(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 *)xmalloc(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 = (char *)cdiInputFile_getPath(me->file);
char* escapedPath = (char *)cdiEscapeSpaces(path);
char* result = (char *)xmalloc(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 *)xmalloc(sizeof(*me));
CdiGribIterator* me = (CdiGribIterator *)malloc(sizeof(*me));
if(!me) goto fail;
description = baseIter_constructFromString(&me->super, description);
......
......@@ -67,7 +67,7 @@ modelNewEntry(cdiResH resH, int instID, int modelgribID, const char *name)
{
model_t *modelptr;
modelptr = (model_t *) xmalloc(sizeof(model_t));
modelptr = (model_t *) malloc(sizeof(model_t));
modelDefaultValue ( modelptr );
if (resH == CDI_UNDEFID)
modelptr->self = reshPut(modelptr, &modelOps);
......@@ -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 *)xmalloc((size_t)tempbuf[3]);
name = (char *)malloc((size_t)tempbuf[3]);
serializeUnpack(buf, size, position,
name, tempbuf[3], DATATYPE_TXT, context);
}
......
......@@ -162,7 +162,7 @@ namespaceNew()
{
/* make room for additional namespace */
struct Namespace *newNameSpaces
= (struct Namespace *)xmalloc(((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;
......
......@@ -382,7 +382,7 @@ void commDefCommNode ( void )
size = info->sizePio;
myHost = (char*) xmalloc(MPI_MAX_PROCESSOR_NAME);
myHost = (char*) malloc(MPI_MAX_PROCESSOR_NAME);
{
int len;
xmpi ( MPI_Get_processor_name ( myHost, &len ));
......@@ -391,8 +391,8 @@ void commDefCommNode ( void )
info->hostname[len] = '\0';
}
allHosts = xmalloc((size_t)size * MPI_MAX_PROCESSOR_NAME);
sortedHosts = xmalloc((size_t)size * sizeof (sortedHosts[0]));
allHosts = malloc((size_t)size * MPI_MAX_PROCESSOR_NAME);
sortedHosts = malloc((size_t)size * sizeof (sortedHosts[0]));
for (int i = 0; i < size; ++i)
sortedHosts[i] = allHosts[i];
......@@ -507,7 +507,7 @@ void commRecvNodeMap ( void )
xdebug ( "info->nProcsColl=%d", info->nProcsColl );
info->nodeMap = (int *)xmalloc((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 *)xmalloc((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 *)xmalloc((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 *)xmalloc((size_t)info->nProcsColl
info->nodeMap = (int *)malloc((size_t)info->nProcsColl
* sizeof (info->nodeMap[0]));
// helpers
p1 = (int **)xmalloc((size_t)info->nodeInfo.nNodes * sizeof (p1[0]));
p2 = (int **)xmalloc((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 *)xmalloc((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 *)xmalloc(((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;
......
......@@ -178,7 +178,7 @@ varMapGen(int *vSizes, int *sSizes, int *varMapping,
weightsStreams[i] += * ( vSizes + offset++ );
}
double *w = (double *)xmalloc((size_t)nNodes * sizeof ( double ));
double *w = (double *)malloc((size_t)nNodes * sizeof ( double ));
for ( j = 0; j < nNodes; j++ )
nPEs += * ( nodeSizes + j );
......@@ -195,9 +195,9 @@ varMapGen(int *vSizes, int *sSizes, int *varMapping,
if ( * ( streamMapping + j ) == i )
nVarsNode += * ( sSizes + j );
weightsVarsNode = xmalloc((size_t)nVarsNode * sizeof (int));
varMappingNode = xmalloc((size_t)nVarsNode * sizeof ( int ));
w = xmalloc((size_t)nodeSizes[i] * sizeof (double));
weightsVarsNode = malloc((size_t)nVarsNode * sizeof (int));
varMappingNode = malloc((size_t)nVarsNode * sizeof ( int ));
w = malloc((size_t)nodeSizes[i] * sizeof (double));
offset = 0;
offsetN = 0;
......@@ -258,9 +258,9 @@ varsMapNDeco(int nNodes, int *nodeSizes)
unsigned nStreams = reshCountType(&streamOps);
resHs = xmalloc(nStreams * sizeof (resHs[0]));
streamSizes = xmalloc(nStreams * sizeof (streamSizes[0]));
collectsData = xmalloc((size_t)nProcsColl * sizeof (collectsData[0]));
resHs = malloc(nStreams * sizeof (resHs[0]));
streamSizes = malloc(nStreams * sizeof (streamSizes[0]));
collectsData = malloc((size_t)nProcsColl * sizeof (collectsData[0]));
cdiStreamGetIndexList(nStreams, resHs);
for (unsigned i = 0; i < nStreams; i++ )
......@@ -268,7 +268,7 @@ varsMapNDeco(int nNodes, int *nodeSizes)
nVars = sum_int((size_t)nStreams, streamSizes);
varSizes = xcalloc((size_t)nVars, sizeof (varSizes[0]));
varMapping = xmalloc((size_t)nVars * sizeof (varMapping[0]));