Commit 56f4cc59 authored by Thomas Jahns's avatar Thomas Jahns 🤸
Browse files

Rename and document resource handle states.

parent d6620b3b
......@@ -568,7 +568,7 @@ void gridDefXname(int gridID, const char *xname)
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning ("%s", "Operation not executed." );
return;
......@@ -600,7 +600,7 @@ void gridDefXlongname(int gridID, const char *xlongname)
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning ("%s", "Operation not executed." );
return;
......@@ -630,7 +630,7 @@ void gridDefXunits(int gridID, const char *xunits)
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed." );
return;
......@@ -662,7 +662,7 @@ void gridDefYname(int gridID, const char *yname)
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -694,7 +694,7 @@ void gridDefYlongname(int gridID, const char *ylongname)
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -726,7 +726,7 @@ void gridDefYunits(int gridID, const char *yunits)
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -1063,7 +1063,7 @@ void gridDefTrunc(int gridID, int trunc)
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -1094,7 +1094,7 @@ void gridDefXsize(int gridID, int xsize)
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -1135,7 +1135,7 @@ void gridDefPrec(int gridID, int prec)
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -1214,7 +1214,7 @@ void gridDefYsize(int gridID, int ysize)
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -1287,7 +1287,7 @@ void gridDefNP(int gridID, int np)
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning ("%s", "Operation not executed." );
return;
......@@ -1342,7 +1342,7 @@ void gridDefRowlon(int gridID, int nrowlon, const int *rowlon)
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -1411,7 +1411,7 @@ void gridDefMask(int gridID, const int *mask)
long size, i;
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -1474,7 +1474,7 @@ void gridDefMaskGME(int gridID, const int *mask)
long size, i;
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -1565,7 +1565,7 @@ void gridDefXvals(int gridID, const double *xvals)
long size;
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -1658,7 +1658,7 @@ void gridDefYvals(int gridID, const double *yvals)
long size;
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -1842,7 +1842,7 @@ void gridDefXpole(int gridID, double xpole)
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -1894,7 +1894,7 @@ void gridDefYpole(int gridID, double ypole)
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -1946,7 +1946,7 @@ void gridDefAngle(int gridID, double angle)
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -1995,7 +1995,7 @@ void gridDefGMEnd(int gridID, int nd)
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -2043,7 +2043,7 @@ void gridDefGMEni(int gridID, int ni)
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -2091,7 +2091,7 @@ void gridDefGMEni2(int gridID, int ni2)
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -2128,7 +2128,7 @@ void gridDefGMEni3(int gridID, int ni3)
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -3108,7 +3108,7 @@ void gridDefArea(int gridID, const double *area)
long size;
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -3179,7 +3179,7 @@ void gridDefNvertex(int gridID, int nvertex)
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -3224,7 +3224,7 @@ void gridDefXbounds(int gridID, const double *xbounds)
long nvertex;
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning ("%s", "Operation not executed.");
return;
......@@ -3339,7 +3339,7 @@ void gridDefYbounds(int gridID, const double *ybounds)
long nvertex;
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -3901,7 +3901,7 @@ void gridDefLCC(int gridID, double originLon, double originLat, double lonParY,
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -3987,7 +3987,7 @@ void gridDefLcc2(int gridID, double earth_radius, double lon_0, double lat_0, do
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -4042,7 +4042,7 @@ void gridDefLaea(int gridID, double earth_radius, double lon_0, double lat_0)
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -4094,7 +4094,7 @@ void gridDefComplexPacking(int gridID, int lcomplex)
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -4140,7 +4140,7 @@ void gridDefNumber(int gridID, const int number)
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -4197,7 +4197,7 @@ void gridDefPosition(int gridID, int position)
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -4254,7 +4254,7 @@ void gridDefReference(int gridID, const char *reference)
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -4329,7 +4329,7 @@ void gridDefUUID(int gridID, const char *uuid)
{
grid_t *gridptr;
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
if ( reshGetStatus ( gridID, &gridOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......
......@@ -91,7 +91,7 @@ void instituteDefaultEntries ( void )
/* (void) institutDef( 0, 0, "IPSL", "IPSL (Institut Pierre Simon Laplace, Paris, France)"); */
for ( i = 0; i < n ; i++ )
reshSetStatus(resH[i], &instituteOps, SUSPENDED);
reshSetStatus(resH[i], &instituteOps, RESH_PRE_ASSIGNED);
}
static
......
......@@ -104,7 +104,7 @@ void modelDefaultEntries ( void )
resH[9] = modelDef(instID, 80, "T62L28MRF");
for ( i = 0; i < 10 ; i++ )
reshSetStatus(resH[i], &modelOps, SUSPENDED);
reshSetStatus(resH[i], &modelOps, RESH_PRE_ASSIGNED);
}
static
......
......@@ -82,7 +82,7 @@ listInitResources(int nsp)
p[i].next = i + 1;
p[i].ops = NULL;
p[i].val = NULL;
p[i].status = RESH_UNDEFID;
p[i].status = RESH_UNUSED;
}
p[resHList[nsp].size-1].next = -1;
......@@ -197,7 +197,7 @@ void listSizeExtend()
resHList[nsp].resources[i].next = i + 1;
resHList[nsp].resources[i].ops = NULL;
resHList[nsp].resources[i].val = NULL;
resHList[nsp].resources[i].status = RESH_UNDEFID;
resHList[nsp].resources[i].status = RESH_UNUSED;
}
resHList[nsp].resources[newListSize-1].next = resHList[nsp].freeHead;
......@@ -227,7 +227,7 @@ int reshPut ( void *p, resOps *ops )
newListElem->next = -1;
newListElem->val = p;
newListElem->ops = ops;
newListElem->status = ASSIGNED;
newListElem->status = RESH_ASSIGNED;
LIST_UNLOCK();
......@@ -258,7 +258,7 @@ void reshRemove ( cdiResH resH, resOps * ops )
resHList[nsp].resources[nspT.idx].next = resHList[nsp].freeHead;
resHList[nsp].resources[nspT.idx].ops = NULL;
resHList[nsp].resources[nspT.idx].val = NULL;
resHList[nsp].resources[nspT.idx].status = RESH_UNDEFID;
resHList[nsp].resources[nspT.idx].status = RESH_UNUSED;
resHList[nsp].freeHead = nspT.idx;
LIST_UNLOCK();
......@@ -435,7 +435,7 @@ static int getPackBufferSize(void *context)
/* pack resources, type marker and seperator marker */
for ( i = 0; i < resHList[nsp].size; i++ )
if ( resHList[nsp].resources[i].val )
if ( resHList[nsp].resources[i].status == ASSIGNED )
if ( resHList[nsp].resources[i].status == RESH_ASSIGNED )
{
curr = resHList[nsp].resources + i;
xassert ( curr->ops );
......@@ -482,7 +482,7 @@ void reshPackBufferCreate(char **packBuffer, int *packBufferSize, void *context)
for ( i = 0; i < resHList[nsp].size; i++ )
if ( resHList[nsp].resources[i].val )
if ( resHList[nsp].resources[i].status == ASSIGNED )
if ( resHList[nsp].resources[i].status == RESH_ASSIGNED )
{
curr = resHList[nsp].resources + i;
xassert ( curr->ops );
......@@ -498,7 +498,7 @@ void reshPackBufferCreate(char **packBuffer, int *packBufferSize, void *context)
serializePack(&sep, 1, DATATYPE_INT, pB, pBSize, &packBufferPos, context);
curr->status = CLOSED;
curr->status = RESH_CLOSED;
}
LIST_UNLOCK();
......
......@@ -33,7 +33,12 @@ typedef struct {
valTxCodeFunc valTxCode;
}resOps;
enum { RESH_UNDEFID, ASSIGNED, SUSPENDED, CLOSED };
enum {
RESH_UNUSED, /* resource holds no value */
RESH_ASSIGNED, /* resource is user-assigned */
RESH_PRE_ASSIGNED, /* resource is pre-assigned by library */
RESH_CLOSED, /* resource is marked immutable */
};
void reshListCreate(int namespaceID);
void reshListDestruct(int namespaceID);
......
......@@ -449,7 +449,7 @@ void streamDefByteorder(int streamID, int byteorder)
stream_check_ptr(__func__, streamptr);
if ( reshGetStatus ( streamID, &streamOps ) == CLOSED )
if ( reshGetStatus ( streamID, &streamOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -2231,7 +2231,7 @@ void streamDefCompType(int streamID, int comptype)
{
stream_t *streamptr;
if ( reshGetStatus ( streamID, &streamOps ) == CLOSED )
if ( reshGetStatus ( streamID, &streamOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -2249,7 +2249,7 @@ void streamDefCompLevel(int streamID, int complevel)
{
stream_t *streamptr;
if ( reshGetStatus ( streamID, &streamOps ) == CLOSED )
if ( reshGetStatus ( streamID, &streamOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......
......@@ -295,7 +295,7 @@ void taxisDefType(int taxisID, int type)
{
taxis_t *taxisptr;
if ( reshGetStatus ( taxisID, &taxisOps ) == CLOSED )
if ( reshGetStatus ( taxisID, &taxisOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed." );
return;
......@@ -376,7 +376,7 @@ void taxisDefRdate(int taxisID, int rdate)
{
taxis_t *taxisptr;
if ( reshGetStatus ( taxisID, &taxisOps ) == CLOSED )
if ( reshGetStatus ( taxisID, &taxisOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -407,7 +407,7 @@ void taxisDefRtime(int taxisID, int rtime)
{
taxis_t *taxisptr;
if ( reshGetStatus ( taxisID, &taxisOps ) == CLOSED )
if ( reshGetStatus ( taxisID, &taxisOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -438,7 +438,7 @@ void taxisDefFdate(int taxisID, int fdate)
{
taxis_t *taxisptr;
if ( reshGetStatus ( taxisID, &taxisOps ) == CLOSED )
if ( reshGetStatus ( taxisID, &taxisOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -469,7 +469,7 @@ void taxisDefFtime(int taxisID, int ftime)
{
taxis_t *taxisptr;
if ( reshGetStatus ( taxisID, &taxisOps ) == CLOSED )
if ( reshGetStatus ( taxisID, &taxisOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -502,7 +502,7 @@ void taxisDefCalendar(int taxisID, int calendar)
{
taxis_t *taxisptr;
if ( reshGetStatus ( taxisID, &taxisOps ) == CLOSED )
if ( reshGetStatus ( taxisID, &taxisOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -520,7 +520,7 @@ void taxisDefTunit(int taxisID, int unit)
{
taxis_t *taxisptr;
if ( reshGetStatus ( taxisID, &taxisOps ) == CLOSED )
if ( reshGetStatus ( taxisID, &taxisOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -538,7 +538,7 @@ void taxisDefNumavg(int taxisID, int numavg)
{
taxis_t *taxisptr;
if ( reshGetStatus ( taxisID, &taxisOps ) == CLOSED )
if ( reshGetStatus ( taxisID, &taxisOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -583,7 +583,7 @@ void taxisDeleteBounds(int taxisID)
{
taxis_t *taxisptr;
if ( reshGetStatus ( taxisID, &taxisOps ) == CLOSED )
if ( reshGetStatus ( taxisID, &taxisOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -672,7 +672,7 @@ void taxisDefVdateBounds(int taxisID, int vdate_lb, int vdate_ub)
{
taxis_t *taxisptr;
if ( reshGetStatus ( taxisID, &taxisOps ) == CLOSED )
if ( reshGetStatus ( taxisID, &taxisOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......@@ -733,7 +733,7 @@ void taxisDefVtimeBounds(int taxisID, int vtime_lb, int vtime_ub)
{
taxis_t *taxisptr;
if ( reshGetStatus ( taxisID, &taxisOps ) == CLOSED )
if ( reshGetStatus ( taxisID, &taxisOps ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed.");
return;
......
......@@ -1129,7 +1129,7 @@ void vlistDefNtsteps(int vlistID, int nts)
vlist_check_ptr(__func__, vlistptr);
if ( reshGetStatus ( vlistID, &vlist_ops ) == CLOSED )
if ( reshGetStatus ( vlistID, &vlist_ops ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed." );
return;
......@@ -1277,7 +1277,7 @@ void vlistDefTaxis(int vlistID, int taxisID)
vlist_check_ptr(__func__, vlistptr);
if ( reshGetStatus ( vlistID, &vlist_ops ) == CLOSED )
if ( reshGetStatus ( vlistID, &vlist_ops ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed." );
return;
......@@ -1322,7 +1322,7 @@ void vlistDefTable(int vlistID, int tableID)
vlist_check_ptr(__func__, vlistptr);
if ( reshGetStatus ( vlistID, &vlist_ops ) == CLOSED )
if ( reshGetStatus ( vlistID, &vlist_ops ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed." );
return;
......@@ -1352,7 +1352,7 @@ void vlistDefInstitut(int vlistID, int instID)
vlist_check_ptr(__func__, vlistptr);
if ( reshGetStatus ( vlistID, &vlist_ops ) == CLOSED )
if ( reshGetStatus ( vlistID, &vlist_ops ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed." );
return;
......@@ -1398,7 +1398,7 @@ void vlistDefModel(int vlistID, int modelID)
vlist_check_ptr(__func__, vlistptr);
if ( reshGetStatus ( vlistID, &vlist_ops ) == CLOSED )
if ( reshGetStatus ( vlistID, &vlist_ops ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed." );
return;
......@@ -1502,7 +1502,7 @@ void vlistChangeGridIndex(int vlistID, int index, int gridID)
vlist_check_ptr(__func__, vlistptr);
if ( reshGetStatus ( vlistID, &vlist_ops ) == CLOSED )
if ( reshGetStatus ( vlistID, &vlist_ops ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed." );
return;
......@@ -1528,7 +1528,7 @@ void vlistChangeGrid(int vlistID, int gridID1, int gridID2)
vlist_check_ptr(__func__, vlistptr);
if ( reshGetStatus ( vlistID, &vlist_ops ) == CLOSED )
if ( reshGetStatus ( vlistID, &vlist_ops ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed." );
return;
......@@ -1595,7 +1595,7 @@ void vlistChangeZaxisIndex(int vlistID, int index, int zaxisID)
vlist_check_ptr(__func__, vlistptr);
if ( reshGetStatus ( vlistID, &vlist_ops ) == CLOSED )
if ( reshGetStatus ( vlistID, &vlist_ops ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed." );
return;
......@@ -1635,7 +1635,7 @@ void vlistChangeZaxis(int vlistID, int zaxisID1, int zaxisID2)
vlist_check_ptr(__func__, vlistptr);
if ( reshGetStatus ( vlistID, &vlist_ops ) == CLOSED )
if ( reshGetStatus ( vlistID, &vlist_ops ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed." );
return;
......
......@@ -204,7 +204,7 @@ int vlistDefVar(int vlistID, int gridID, int zaxisID, int tsteptype)
vlist_t *vlistptr;
vlistptr = vlist_to_pointer(vlistID);
if ( reshGetStatus ( vlistID, &vlist_ops ) == CLOSED )
if ( reshGetStatus ( vlistID, &vlist_ops ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed." );
return CDI_UNDEFID;
......@@ -293,7 +293,7 @@ void vlistDefVarParam(int vlistID, int varID, int param)
vlistCheckVarID(__func__, vlistID, varID);
if ( reshGetStatus ( vlistID, &vlist_ops ) == CLOSED )
if ( reshGetStatus ( vlistID, &vlist_ops ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed." );
return;
......@@ -326,7 +326,7 @@ void vlistDefVarCode(int vlistID, int varID, int code)
vlistCheckVarID(__func__, vlistID, varID);
if ( reshGetStatus ( vlistID, &vlist_ops ) == CLOSED )
if ( reshGetStatus ( vlistID, &vlist_ops ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed." );
return;
......@@ -840,7 +840,7 @@ void vlistDefVarDatatype(int vlistID, int varID, int datatype)
vlistCheckVarID(__func__, vlistID, varID);
if ( reshGetStatus ( vlistID, &vlist_ops ) == CLOSED )
if ( reshGetStatus ( vlistID, &vlist_ops ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed." );
return;
......@@ -867,7 +867,7 @@ void vlistDefVarInstitut(int vlistID, int varID, int instID)
vlistptr = vlist_to_pointer(vlistID);
if ( reshGetStatus ( vlistID, &vlist_ops ) == CLOSED )
if ( reshGetStatus ( vlistID, &vlist_ops ) == RESH_CLOSED )
{
Warning("%s", "Operation not executed." );
return;
......@@ -891,7 +891,7 @@ void vlistDefVarModel(int vlistID, int varID, int modelID)
{
vlist_t *vlistptr;