Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
libcdi
Commits
6805d45c
Commit
6805d45c
authored
Jul 16, 2016
by
Uwe Schulzweida
Browse files
Fix typo.
parent
0f9e1795
Changes
8
Hide whitespace changes
Inline
Side-by-side
src/grid.c
View file @
6805d45c
...
...
@@ -4751,7 +4751,7 @@ gridCompareSearch(int id, void *res, void *data)
}
/* Add grid (which must be Malloc'ed to vlist if not already found */
struct
addIf
f
NewRes
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
...
...
@@ -4808,7 +4808,7 @@ struct addIffNewRes cdiVlistAddGridIfNew(int vlistID, grid_t *grid, int mode)
vlistptr
->
ngrids
++
;
}
return
(
struct
addIf
f
NewRes
){
.
Id
=
gridID
,
.
isNew
=
!
griddefined
&&
!
gridglobdefined
};
return
(
struct
addIfNewRes
){
.
Id
=
gridID
,
.
isNew
=
!
griddefined
&&
!
gridglobdefined
};
}
...
...
src/grid.h
View file @
6805d45c
...
...
@@ -161,13 +161,13 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize,
int
*
unpackBufferPos
,
int
originNamespace
,
void
*
context
,
int
force_id
);
struct
addIf
f
NewRes
struct
addIfNewRes
{
int
Id
;
int
isNew
;
};
struct
addIf
f
NewRes
cdiVlistAddGridIfNew
(
int
vlistID
,
grid_t
*
grid
,
int
mode
);
struct
addIfNewRes
cdiVlistAddGridIfNew
(
int
vlistID
,
grid_t
*
grid
,
int
mode
);
#endif
/*
...
...
src/stream_cdf_i.c
View file @
6805d45c
...
...
@@ -2546,7 +2546,7 @@ void cdf_define_all_grids(stream_t *streamptr, int vlistID, ncdim_t *ncdims, int
int
ndims
=
ncvar
->
ndims
;
int
*
dimtype
=
ncvar
->
dimtype
;
int
vdimid
=
UNDEFID
;
struct
addIf
f
NewRes
projAdded
=
{
.
Id
=
CDI_UNDEFID
,
.
isNew
=
0
},
struct
addIfNewRes
projAdded
=
{
.
Id
=
CDI_UNDEFID
,
.
isNew
=
0
},
gridAdded
=
{
.
Id
=
CDI_UNDEFID
,
.
isNew
=
0
};
int
xdimid
=
UNDEFID
,
ydimid
=
UNDEFID
;
...
...
src/stream_cgribex.c
View file @
6805d45c
...
...
@@ -378,7 +378,7 @@ void cgribexAddRecord(stream_t * streamptr, int param, int *isec1, int *isec2, d
grid_t
*
gridptr
=
(
grid_t
*
)
Malloc
(
sizeof
(
*
gridptr
));
cgribexGetGrid
(
streamptr
,
isec2
,
fsec2
,
isec4
,
gridptr
,
iret
);
struct
addIf
f
NewRes
gridAdded
=
cdiVlistAddGridIfNew
(
vlistID
,
gridptr
,
0
);
struct
addIfNewRes
gridAdded
=
cdiVlistAddGridIfNew
(
vlistID
,
gridptr
,
0
);
int
gridID
=
gridAdded
.
Id
;
if
(
gridAdded
.
isNew
)
{
...
...
src/stream_ext.c
View file @
6805d45c
...
...
@@ -211,7 +211,7 @@ void extAddRecord(stream_t *streamptr, int param, int level, int xysize,
cdiGridTypeInit
(
grid
,
GRID_GENERIC
,
xysize
);
grid
->
x
.
size
=
xysize
;
grid
->
y
.
size
=
0
;
struct
addIf
f
NewRes
gridAdded
=
cdiVlistAddGridIfNew
(
vlistID
,
grid
,
0
);
struct
addIfNewRes
gridAdded
=
cdiVlistAddGridIfNew
(
vlistID
,
grid
,
0
);
int
gridID
=
gridAdded
.
Id
;
if
(
!
gridAdded
.
isNew
)
Free
(
grid
);
/*
...
...
src/stream_gribapi.c
View file @
6805d45c
...
...
@@ -462,7 +462,7 @@ void gribapiAddRecord(stream_t * streamptr, int param, grib_handle *gh,
grid_t
*
grid
=
(
grid_t
*
)
Malloc
(
sizeof
(
*
grid
));
gribapiGetGrid
(
gh
,
grid
);
struct
addIf
f
NewRes
gridAdded
=
cdiVlistAddGridIfNew
(
vlistID
,
grid
,
0
);
struct
addIfNewRes
gridAdded
=
cdiVlistAddGridIfNew
(
vlistID
,
grid
,
0
);
int
gridID
=
gridAdded
.
Id
;
if
(
!
gridAdded
.
isNew
)
Free
(
grid
);
...
...
src/stream_ieg.c
View file @
6805d45c
...
...
@@ -715,7 +715,7 @@ void iegAddRecord(stream_t *streamptr, int param, int *pdb, int *gdb, double *vc
grid
->
angle
=
0
;
}
struct
addIf
f
NewRes
gridAdded
=
cdiVlistAddGridIfNew
(
vlistID
,
grid
,
0
);
struct
addIfNewRes
gridAdded
=
cdiVlistAddGridIfNew
(
vlistID
,
grid
,
0
);
int
gridID
=
gridAdded
.
Id
;
if
(
!
gridAdded
.
isNew
)
Free
(
grid
);
...
...
src/stream_srv.c
View file @
6805d45c
...
...
@@ -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
);
grid
->
x
.
size
=
xsize
;
grid
->
y
.
size
=
ysize
;
struct
addIf
f
NewRes
gridAdded
=
cdiVlistAddGridIfNew
(
vlistID
,
grid
,
0
);
struct
addIfNewRes
gridAdded
=
cdiVlistAddGridIfNew
(
vlistID
,
grid
,
0
);
int
gridID
=
gridAdded
.
Id
;
if
(
!
gridAdded
.
isNew
)
Free
(
grid
);
/*
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment