Skip to content
GitLab
Menu
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
68b83be2
Commit
68b83be2
authored
Aug 07, 2014
by
Thomas Jahns
🤸
Browse files
Fix multiple int->string conversions and implicit type conversions.
parent
a1f63b00
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/gribapi.c
View file @
68b83be2
...
@@ -17,19 +17,26 @@
...
@@ -17,19 +17,26 @@
#define STRING(x) XSTRING(x)
#define STRING(x) XSTRING(x)
static
char
gribapi_libvers
[
64
]
=
""
;
static
char
gribapi_libvers
[
64
]
=
""
;
#if defined (HAVE_LIBGRIB_API)
static
int
gribapi_libvers_init
;
#endif
const
char
*
gribapiLibraryVersion
(
void
)
const
char
*
gribapiLibraryVersion
(
void
)
{
{
#if defined (HAVE_LIBGRIB_API)
#if defined (HAVE_LIBGRIB_API)
long
version
=
grib_get_api_version
();
if
(
!
gribapi_libvers_init
)
int
major_version
,
minor_version
,
revision_version
;
{
long
version
=
grib_get_api_version
();
int
major_version
,
minor_version
,
revision_version
;
major_version
=
version
/
10000
;
major_version
=
(
int
)(
version
/
10000
L
)
;
minor_version
=
(
version
-
major_version
*
10000
)
/
100
;
minor_version
=
(
int
)
(
version
-
(
long
)
major_version
*
10000
L
)
/
100
;
revision_version
=
(
version
-
major_version
*
10000
-
minor_version
*
100
);
revision_version
=
(
int
)
(
version
-
(
long
)
major_version
*
10000
L
-
minor_version
*
100
);
sprintf
(
gribapi_libvers
,
"%d.%d.%d"
,
sprintf
(
gribapi_libvers
,
"%d.%d.%d"
,
major_version
,
minor_version
,
revision_version
);
major_version
,
minor_version
,
revision_version
);
gribapi_libvers_init
=
1
;
}
#endif
#endif
return
(
gribapi_libvers
);
return
(
gribapi_libvers
);
...
@@ -69,8 +76,8 @@ void gribContainersNew(stream_t * streamptr)
...
@@ -69,8 +76,8 @@ void gribContainersNew(stream_t * streamptr)
streamptr
->
gribContainers
=
(
void
**
)
gribContainers
;
streamptr
->
gribContainers
=
(
void
**
)
gribContainers
;
#else
#else
gribContainer_t
*
gribContainers
;
gribContainer_t
*
gribContainers
gribContainers
=
(
gribContainer_t
*
)
malloc
(
nvars
*
sizeof
(
gribContainer_t
));
=
(
gribContainer_t
*
)
x
malloc
(
(
size_t
)
nvars
*
sizeof
(
gribContainer_t
));
for
(
int
varID
=
0
;
varID
<
nvars
;
++
varID
)
for
(
int
varID
=
0
;
varID
<
nvars
;
++
varID
)
{
{
...
...
Write
Preview
Supports
Markdown
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