Commit 6805d45c authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Fix typo.

parent 0f9e1795
...@@ -4751,7 +4751,7 @@ gridCompareSearch(int id, void *res, void *data) ...@@ -4751,7 +4751,7 @@ gridCompareSearch(int id, void *res, void *data)
} }
/* Add grid (which must be Malloc'ed to vlist if not already found */ /* Add grid (which must be Malloc'ed to vlist if not already found */
struct addIffNewRes cdiVlistAddGridIfNew(int vlistID, grid_t *grid, int mode) struct addIfNewRes cdiVlistAddGridIfNew(int vlistID, grid_t *grid, int mode)
{ {
/* /*
mode: 0 search in vlist and grid table mode: 0 search in vlist and grid table
...@@ -4808,7 +4808,7 @@ struct addIffNewRes cdiVlistAddGridIfNew(int vlistID, grid_t *grid, int mode) ...@@ -4808,7 +4808,7 @@ struct addIffNewRes cdiVlistAddGridIfNew(int vlistID, grid_t *grid, int mode)
vlistptr->ngrids++; vlistptr->ngrids++;
} }
return (struct addIffNewRes){ .Id = gridID, .isNew = !griddefined && !gridglobdefined }; return (struct addIfNewRes){ .Id = gridID, .isNew = !griddefined && !gridglobdefined };
} }
......
...@@ -161,13 +161,13 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize, ...@@ -161,13 +161,13 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize,
int * unpackBufferPos, int originNamespace, void *context, int * unpackBufferPos, int originNamespace, void *context,
int force_id); int force_id);
struct addIffNewRes struct addIfNewRes
{ {
int Id; int Id;
int isNew; int isNew;
}; };
struct addIffNewRes cdiVlistAddGridIfNew(int vlistID, grid_t *grid, int mode); struct addIfNewRes cdiVlistAddGridIfNew(int vlistID, grid_t *grid, int mode);
#endif #endif
/* /*
......
...@@ -2546,7 +2546,7 @@ void cdf_define_all_grids(stream_t *streamptr, int vlistID, ncdim_t *ncdims, int ...@@ -2546,7 +2546,7 @@ void cdf_define_all_grids(stream_t *streamptr, int vlistID, ncdim_t *ncdims, int
int ndims = ncvar->ndims; int ndims = ncvar->ndims;
int *dimtype = ncvar->dimtype; int *dimtype = ncvar->dimtype;
int vdimid = UNDEFID; int vdimid = UNDEFID;
struct addIffNewRes projAdded = { .Id = CDI_UNDEFID, .isNew = 0 }, struct addIfNewRes projAdded = { .Id = CDI_UNDEFID, .isNew = 0 },
gridAdded = { .Id = CDI_UNDEFID, .isNew = 0 }; gridAdded = { .Id = CDI_UNDEFID, .isNew = 0 };
int xdimid = UNDEFID, ydimid = UNDEFID; int xdimid = UNDEFID, ydimid = UNDEFID;
......
...@@ -378,7 +378,7 @@ void cgribexAddRecord(stream_t * streamptr, int param, int *isec1, int *isec2, d ...@@ -378,7 +378,7 @@ void cgribexAddRecord(stream_t * streamptr, int param, int *isec1, int *isec2, d
grid_t *gridptr = (grid_t*) Malloc(sizeof(*gridptr)); grid_t *gridptr = (grid_t*) Malloc(sizeof(*gridptr));
cgribexGetGrid(streamptr, isec2, fsec2, isec4, gridptr, iret); cgribexGetGrid(streamptr, isec2, fsec2, isec4, gridptr, iret);
struct addIffNewRes gridAdded = cdiVlistAddGridIfNew(vlistID, gridptr, 0); struct addIfNewRes gridAdded = cdiVlistAddGridIfNew(vlistID, gridptr, 0);
int gridID = gridAdded.Id; int gridID = gridAdded.Id;
if ( gridAdded.isNew ) if ( gridAdded.isNew )
{ {
......
...@@ -211,7 +211,7 @@ void extAddRecord(stream_t *streamptr, int param, int level, int xysize, ...@@ -211,7 +211,7 @@ void extAddRecord(stream_t *streamptr, int param, int level, int xysize,
cdiGridTypeInit(grid, GRID_GENERIC, xysize); cdiGridTypeInit(grid, GRID_GENERIC, xysize);
grid->x.size = xysize; grid->x.size = xysize;
grid->y.size = 0; grid->y.size = 0;
struct addIffNewRes gridAdded = cdiVlistAddGridIfNew(vlistID, grid, 0); struct addIfNewRes gridAdded = cdiVlistAddGridIfNew(vlistID, grid, 0);
int gridID = gridAdded.Id; int gridID = gridAdded.Id;
if (!gridAdded.isNew) Free(grid); if (!gridAdded.isNew) Free(grid);
/* /*
......
...@@ -462,7 +462,7 @@ void gribapiAddRecord(stream_t * streamptr, int param, grib_handle *gh, ...@@ -462,7 +462,7 @@ void gribapiAddRecord(stream_t * streamptr, int param, grib_handle *gh,
grid_t *grid = (grid_t *)Malloc(sizeof (*grid)); grid_t *grid = (grid_t *)Malloc(sizeof (*grid));
gribapiGetGrid(gh, grid); gribapiGetGrid(gh, grid);
struct addIffNewRes gridAdded = cdiVlistAddGridIfNew(vlistID, grid, 0); struct addIfNewRes gridAdded = cdiVlistAddGridIfNew(vlistID, grid, 0);
int gridID = gridAdded.Id; int gridID = gridAdded.Id;
if (!gridAdded.isNew) Free(grid); if (!gridAdded.isNew) Free(grid);
......
...@@ -715,7 +715,7 @@ void iegAddRecord(stream_t *streamptr, int param, int *pdb, int *gdb, double *vc ...@@ -715,7 +715,7 @@ void iegAddRecord(stream_t *streamptr, int param, int *pdb, int *gdb, double *vc
grid->angle = 0; grid->angle = 0;
} }
struct addIffNewRes gridAdded = cdiVlistAddGridIfNew(vlistID, grid, 0); struct addIfNewRes gridAdded = cdiVlistAddGridIfNew(vlistID, grid, 0);
int gridID = gridAdded.Id; int gridID = gridAdded.Id;
if (!gridAdded.isNew) Free(grid); if (!gridAdded.isNew) Free(grid);
......
...@@ -209,7 +209,7 @@ void srv_add_record(stream_t *streamptr, int param, int level, int xsize, int ys ...@@ -209,7 +209,7 @@ void srv_add_record(stream_t *streamptr, int param, int level, int xsize, int ys
cdiGridTypeInit(grid, GRID_GENERIC, xsize*ysize); cdiGridTypeInit(grid, GRID_GENERIC, xsize*ysize);
grid->x.size = xsize; grid->x.size = xsize;
grid->y.size = ysize; grid->y.size = ysize;
struct addIffNewRes gridAdded = cdiVlistAddGridIfNew(vlistID, grid, 0); struct addIfNewRes gridAdded = cdiVlistAddGridIfNew(vlistID, grid, 0);
int gridID = gridAdded.Id; int gridID = gridAdded.Id;
if (!gridAdded.isNew) Free(grid); if (!gridAdded.isNew) Free(grid);
/* /*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment