Fix missing wrapper conversion.

src/grb_write.c

@@ -312,7 +312,7 @@ grbCopyRecord(stream_t *streamptr2, stream_t *streamptr1)
 
           size_t gridsize = gridInqSize(gridID);
           if (vlistNumber(vlistID) != CDI_REAL) gridsize *= 2;
-          double *data = (double *) malloc(gridsize * sizeof(double));
+          double *data = (double *) Malloc(gridsize * sizeof(double));
 
           if (cdiDebugExt >= 20) Message(" processing varID %d; levelID %d", varID, levelID);
 

src/pio_dbuffer.c

@@ -54,8 +54,7 @@ cdiPioDbufferInit(struct dBuffer *db, size_t bufSize)
   db->buffer = (unsigned char *) buf;
 #else
   db->size = bufSize;
-  db->buffer = (unsigned char *) malloc(bufSize);
-  assert(db->buffer);
+  db->buffer = (unsigned char *) Malloc(bufSize);
 #endif
 }
 

src/stream_gribapi.c

@@ -2949,7 +2949,7 @@ convertDataScanningMode(int scanModeIN, int scanModeOUT, double *data, size_t gr
           return;
         }
     }
-  double *dataCopy = (double *) malloc(gridsize * sizeof(double));
+  double *dataCopy = (double *) Malloc(gridsize * sizeof(double));
   memcpy((void *) dataCopy, (void *) data, gridsize * sizeof(double));
 
   if (scanModeIN

tests/simple_model_helper.c

@@ -232,7 +232,7 @@ int
 PPM_prime_factorization_32(uint32_t n, uint32_t **factors)
 {
   if (n <= 1) return 0;
-  uint32_t *restrict pfactors = realloc(*factors, 32 * sizeof(pfactors[0]));
+  uint32_t *restrict pfactors = Realloc(*factors, 32 * sizeof(pfactors[0]));
   size_t numFactors = 0;
   uint32_t unfactored = n;
   while (!(unfactored & 1))

tests/stream_cksum.c

@@ -59,7 +59,7 @@ cksum_stream(const char *fname, size_t *table_len)
           break;
         }
       checksum_state = (uint32_t *) Calloc((size_t) nvars, sizeof(checksum_state[0]));
-      varDesc = (struct var_desc_t *) malloc((size_t) nvars * sizeof(varDesc[0]));
+      varDesc = (struct var_desc_t *) Malloc((size_t) nvars * sizeof(varDesc[0]));
 
       for (int varIdx = 0; varIdx < nvars; ++varIdx)
         {
@@ -137,7 +137,7 @@ cksum_stream(const char *fname, size_t *table_len)
               = (size_t) varDesc[varIdx].x * (size_t) varDesc[varIdx].y * (size_t) varDesc[varIdx].z * sizeof(buf[0]);
           if (var_size_max_chars < varDesc[varIdx].chars) var_size_max_chars = varDesc[varIdx].chars;
         }
-      buf = (double *) malloc(var_size_max_chars);
+      buf = (double *) Malloc(var_size_max_chars);
 
       if (nvars == -1) break;
 
@@ -169,7 +169,7 @@ cksum_stream(const char *fname, size_t *table_len)
           ++tsID;
         }
 
-      file_vars = (struct cksum_table *) malloc((size_t) nvars * sizeof(file_vars[0]));
+      file_vars = (struct cksum_table *) Malloc((size_t) nvars * sizeof(file_vars[0]));
       for (int varIdx = 0; varIdx < nvars; ++varIdx)
         {
           file_vars[varIdx].code = varDesc[varIdx].code;

tests/test_cdf_read.c

@@ -7,6 +7,7 @@
 #include <stdio.h>
 
 #include "cdi.h"
+#include "dmemory.h"
 
 static void printAtts(int vlistID);
 
@@ -41,7 +42,7 @@ main(int argc, const char **argv)
           SizeType nmiss;
           if (memSize > bufSize)
             {
-              double *temp = (double *) realloc(buf, memSize);
+              double *temp = (double *) Realloc(buf, memSize);
               if (!temp)
                 {
                   perror("read buffer reallocation failed");
@@ -66,7 +67,7 @@ printAtts(int vlistID)
   static const char globDesc[] = "global", varDescPrefix[] = "variable ";
   size_t digitsPerInt = 9;
   size_t bufSize = digitsPerInt + sizeof(varDescPrefix);
-  void *restrict buf = malloc(bufSize);
+  void *restrict buf = Malloc(bufSize);
   if (!buf)
     {
       perror("attribute buffer resize failed");
@@ -103,7 +104,7 @@ printAtts(int vlistID)
           size_t attSize = elemSize * ((size_t) attLen + 1);
           if (attSize > bufSize)
             {
-              if (!(buf = realloc(buf, attSize)))
+              if (!(buf = Realloc(buf, attSize)))
                 {
                   perror("attribute buffer resize failed");
                   exit(EXIT_FAILURE);

tests/test_grib.c

@@ -31,7 +31,7 @@ main()
   SizeType nmiss;
 
   size_t datasize = (size_t) nlon * (size_t) nlat;
-  data = (double *) malloc(datasize * sizeof(double));
+  data = (double *) Malloc(datasize * sizeof(double));
   memset(data, 0, datasize * sizeof(double));
 
   gridID = gridCreate(GRID_GAUSSIAN, (int) datasize);
@@ -88,7 +88,7 @@ main()
       if (gridsize * varNlevel > datasize) datasize = gridsize * varNlevel;
     }
 
-  data = (double *) realloc(data, datasize * sizeof(double));
+  data = (double *) Realloc(data, datasize * sizeof(double));
   memset(data, 0, datasize * sizeof(double));
 
   taxisID = vlistInqTaxis(vlistID);

tests/test_resource_copy.c

@@ -214,7 +214,7 @@ modelRun(MPI_Comm comm)
   vlistDestroy(temp.id2);
 
   reshPackBufferCreate(&sendBuffer, &bufferSize, &comm);
-  recvBuffer = (char *) malloc((size_t) bufferSize);
+  recvBuffer = (char *) Malloc((size_t) bufferSize);
 #ifdef USE_MPI
   xmpi(MPI_Sendrecv(sendBuffer, bufferSize, MPI_PACKED, 0, 0, recvBuffer, bufferSize, MPI_PACKED, 0, 0, MPI_COMM_SELF,
                     MPI_STATUS_IGNORE));