Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
libcdi
Commits
db8f0a4d
Commit
db8f0a4d
authored
Aug 07, 2014
by
Thomas Jahns
🤸
Browse files
Fix implicit type conversions in grid{Def|Inq}{Rowlon|Mask}.
parent
68b83be2
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/grid.c
View file @
db8f0a4d
...
...
@@ -1266,9 +1266,9 @@ void gridDefRowlon(int gridID, int nrowlon, const int *rowlon)
grid_check_ptr
(
gridID
,
gridptr
);
gridptr
->
rowlon
=
(
int
*
)
xmalloc
(
nrowlon
*
sizeof
(
int
));
gridptr
->
rowlon
=
(
int
*
)
xmalloc
(
(
size_t
)
nrowlon
*
sizeof
(
int
));
gridptr
->
nrowlon
=
nrowlon
;
memcpy
(
gridptr
->
rowlon
,
rowlon
,
nrowlon
*
sizeof
(
int
));
memcpy
(
gridptr
->
rowlon
,
rowlon
,
(
size_t
)
nrowlon
*
sizeof
(
int
));
reshSetStatus
(
gridID
,
&
gridOps
,
RESH_DESYNC_IN_USE
);
}
...
...
@@ -1290,24 +1290,23 @@ void gridInqRowlon(int gridID, int *rowlon)
if
(
gridptr
->
rowlon
==
0
)
Error
(
"undefined pointer!"
);
memcpy
(
rowlon
,
gridptr
->
rowlon
,
gridptr
->
nrowlon
*
sizeof
(
int
));
memcpy
(
rowlon
,
gridptr
->
rowlon
,
(
size_t
)
gridptr
->
nrowlon
*
sizeof
(
int
));
}
int
gridInqMask
(
int
gridID
,
int
*
mask
)
{
long
size
,
i
;
grid_t
*
gridptr
=
(
grid_t
*
)
reshGetVal
(
gridID
,
&
gridOps
);
grid_check_ptr
(
gridID
,
gridptr
);
size
=
gridptr
->
size
;
long
size
=
gridptr
->
size
;
if
(
CDI_Debug
&&
size
==
0
)
Warning
(
"Size undefined for gridID = %d"
,
gridID
);
if
(
mask
&&
gridptr
->
mask
)
for
(
i
=
0
;
i
<
size
;
++
i
)
if
(
mask
&&
gridptr
->
mask
)
for
(
long
i
=
0
;
i
<
size
;
++
i
)
mask
[
i
]
=
gridptr
->
mask
[
i
];
if
(
gridptr
->
mask
==
NULL
)
size
=
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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