reintegrated cdi-conversion_c++

app/cdi.c

@@ -57,7 +57,7 @@ static
 void version(void)
 {
   int   filetypes[] = {FILETYPE_SRV, FILETYPE_EXT, FILETYPE_IEG, FILETYPE_GRB, FILETYPE_GRB2, FILETYPE_NC, FILETYPE_NC2, FILETYPE_NC4, FILETYPE_NC4C};
-  char *typenames[] = {        "srv",        "ext",        "ieg",        "grb",        "grb2",        "nc",        "nc2",        "nc4",        "nc4c"};
+   const char *typenames[] = {        "srv",        "ext",        "ieg",        "grb",        "grb2",        "nc",        "nc2",        "nc4",        "nc4c"};
 
   fprintf(stderr, "CDI version 1.8\n");
 #if defined (COMPILER)

examples/pio/collectData.c

@@ -39,7 +39,7 @@ static void modelRun(MPI_Comm commModel)
     maxlev      = 5 };
 
   static int nlev[nVars]    = {1,1,5,5,2};
-  static char * name        = "example";
+  const static char * name        = "example";
 
   int gridID, zaxisID[nVars], taxisID;
   int vlistID, varID[nVars], streamID, tsID, tfID = 0;

src/cdi.h

@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 /*
-#if defined(__cplusplus)
+#ifdef __cplusplus
 extern "C" {
 #endif
 */
@@ -1103,8 +1103,8 @@ const char *institutInqLongnamePtr(int instID);
 /* Model routines */
 
 int     modelDef(int instID, int modelgribID, const char *name);
-int     modelInq(int instID, int modelgribID, char *name);
-int     modelInqInstitut(int modelID);
+int     modelInq(int instID, int modelgribID, const char *name);
+int     modelInqInstitut(int modelID) ;
 int     modelInqGribID(int modelID);
 const char *modelInqNamePtr(int modelID);
 
@@ -1186,7 +1186,6 @@ int     vlistInqVarSubtype(int vlistID, int varID);
 void gribapiLibraryVersion(int *major_version, int *minor_version, int *revision_version);
 
 
-
 /*
 #if defined (__cplusplus)
 }

src/cdi_int.c

@@ -74,7 +74,7 @@ int cdiSortName = 0;
 int cdiHaveMissval = 0;
 
 
-static long cdiGetenvInt(char *envName)
+static long cdiGetenvInt(const char *envName)
 {
   char *envString;
   long envValue = -1;

src/cdi_int.h

@@ -327,7 +327,7 @@ int     streamInqFileID(int streamID);
 void    gridDefHasDims(int gridID, int hasdims);
 int     gridInqHasDims(int gridID);
 const char *gridNamePtr(int gridtype);
-char   *zaxisNamePtr(int leveltype);
+const char   *zaxisNamePtr(int leveltype);
 int     zaxisInqLevelID(int zaxisID, double level);
 
 void    streamCheckID(const char *caller, int streamID);

src/cdi_util.c

@@ -90,9 +90,9 @@ void cdiParamToString(int param, char *paramstr, int maxlen)
 }
 
 
-char *cdiUnitNamePtr(int cdi_unit)
+const char *cdiUnitNamePtr(int cdi_unit)
 {
-  char *cdiUnits[] = {
+  const char *cdiUnits[] = {
     /*  0 */  "undefined",
     /*  1 */  "Pa",
     /*  2 */  "hPa",
@@ -102,7 +102,7 @@ char *cdiUnitNamePtr(int cdi_unit)
     /*  6 */  "m",
   };
   enum { numUnits = (int) (sizeof(cdiUnits)/sizeof(char *)) };
-  char *name = ( cdi_unit > 0 && cdi_unit < numUnits ) ?
+  const char *name = ( cdi_unit > 0 && cdi_unit < numUnits ) ?
     cdiUnits[cdi_unit] : NULL;
   return name;
 }

src/extralib.c

@@ -58,7 +58,7 @@ void extDebug(int debug)
 static void extLibInit()
 {
   char *envString;
-  char *envName = "EXT_PRECISION";
+  const char *envName = "EXT_PRECISION";
 
 
   envString = getenv(envName);

src/file.c

@@ -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
@@ -1206,8 +1206,8 @@ int fileClose_serial(int fileID)
 {
   char *name;
   int ret;
-  char *fbtname[] = {"unknown", "standard", "mmap"};
-  char *ftname[] = {"unknown", "open", "fopen"};
+  const char *fbtname[] = {"unknown", "standard", "mmap"};
+  const char *ftname[] = {"unknown", "open", "fopen"};
   bfile_t *fileptr = file_to_pointer(fileID);
   double rout = 0;
 

src/gaussgrid.c

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <config.h>
 #include <math.h>
 #include <float.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+
 #include "dmemory.h"
 
 #ifndef  M_PI

src/gribapi.c

@@ -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 )
         {

src/gribapi_utilities.c

@@ -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 *)xmalloc(length);
+    char* result = (char *)malloc(length);
     if(!grib_get_string(gribHandle, key, result, &length))
-    result = (char *)xrealloc(result, length);
+    result = (char *)realloc(result, length);
 
     else
       {
@@ -48,20 +48,20 @@ 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)
     {
       if (length <= 1024UL * 1024UL)
         {
           length *= 2;
-          result = xrealloc(result, length);
+          result = realloc(result, length);
         }
       else
         break;
     }
   if (!rc)
-    result = xrealloc(result, length);
+    result = realloc(result, length);
   else
     {
       free(result);
@@ -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;
 }

src/grid.c

@@ -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++ )
@@ -1213,7 +1213,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);
@@ -1278,7 +1278,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!");
 
@@ -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 *)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!");
 
@@ -1401,7 +1401,7 @@ void gridDefXvals(int gridID, const double *xvals)
 
   if (gridptr->xvals && CDI_Debug)
     Warning("values already defined!");
-  gridptr->xvals = (double *)xrealloc(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 *)xrealloc(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 *)xmalloc((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 *)xmalloc((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 *)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);
@@ -2448,7 +2448,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);
@@ -2533,7 +2533,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);
@@ -2642,7 +2642,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));
     }
 
@@ -2650,7 +2650,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));
     }
 
@@ -2658,7 +2658,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));
     }
 
@@ -2667,7 +2667,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));
     }
 
@@ -2676,7 +2676,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));
     }
 
@@ -2684,7 +2684,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));
     }
 
@@ -2692,7 +2692,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));
     }
 
@@ -2700,7 +2700,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));
     }
 
@@ -2752,19 +2752,19 @@ void gridCompress(int gridID)
 	  gridptr->ysize = (int)gridsize;
 
 	  if ( gridptr->xvals )
-	    gridptr->xvals = (double *)xrealloc(gridptr->xvals, gridsize*sizeof(double));
+	    gridptr->xvals = (double *)realloc(gridptr->xvals, gridsize*sizeof(double));
 
 	  if ( gridptr->yvals )
-	    gridptr->yvals = (double *)xrealloc(gridptr->yvals, gridsize*sizeof(double));
+	    gridptr->yvals = (double *)realloc(gridptr->yvals, gridsize*sizeof(double));
 
 	  if ( gridptr->area )
-	    gridptr->area  = (double *)xrealloc(gridptr->area, gridsize*sizeof(double));
+	    gridptr->area  = (double *)realloc(gridptr->area, gridsize*sizeof(double));
 
 	  if ( gridptr->xbounds )
-	    gridptr->xbounds = (double *)xrealloc(gridptr->xbounds, nv*gridsize*sizeof(double));
+	    gridptr->xbounds = (double *)realloc(gridptr->xbounds, nv*gridsize*sizeof(double));
 
 	  if ( gridptr->ybounds )
-	    gridptr->ybounds = (double *)xrealloc(gridptr->ybounds, nv*gridsize*sizeof(double));
+	    gridptr->ybounds = (double *)realloc(gridptr->ybounds, nv*gridsize*sizeof(double));
 
 	  free(gridptr->mask_gme);