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
a6056d18
Commit
a6056d18
authored
Feb 03, 2014
by
Uwe Schulzweida
Browse files
gridInqUUID: changed return value from char* to void
parent
63dc52a4
Changes
9
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
a6056d18
...
...
@@ -3,6 +3,10 @@
* Version 1.6.3 released
* using CGRIBEX library version 1.6.3
2014-02-03 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* gridInqUUID: changed return value from char* to void
2014-01-31 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* stream_cdf: added cdfDefZaxisUUID() [patch: Florian Prill]
...
...
doc/tex/c_quick_ref.tex
View file @
a6056d18
...
...
@@ -295,7 +295,7 @@ Get the type of a Grid.
\section*
{
\tt
\htmlref
{
gridInqUUID
}{
gridInqUUID
}}
\begin{verbatim}
char *
gridInqUUID (int gridID, char *uuid
_
cbuf);
void
gridInqUUID (int gridID, char *uuid
_
cbuf);
\end{verbatim}
Get the UUID of an unstructured grid.
...
...
doc/tex/f_quick_ref.tex
View file @
a6056d18
...
...
@@ -295,7 +295,7 @@ Get the type of a Grid.
\section*
{
\tt
\htmlref
{
gridInqUUID
}{
gridInqUUID
}}
\begin{verbatim}
CHARACTER(80) FUNCTION
gridInqUUID (INTEGER gridID, CHARACTER*(*) uuid
_
cbuf)
SUBROUTINE
gridInqUUID (INTEGER gridID, CHARACTER*(*) uuid
_
cbuf)
\end{verbatim}
Get the UUID of an unstructured grid.
...
...
src/cdi.h
View file @
a6056d18
...
...
@@ -735,7 +735,7 @@ int gridInqReference(int gridID, char *reference);
void
gridDefUUID
(
int
gridID
,
const
char
*
uuid_cbuf
);
/* gridInqUUID: Get the UUID of an unstructured grid */
char
*
gridInqUUID
(
int
gridID
,
char
*
uuid_cbuf
);
void
gridInqUUID
(
int
gridID
,
char
*
uuid_cbuf
);
/* Lambert Conformal Conic grid (GRIB version) */
...
...
src/cdi.inc
View file @
a6056d18
...
...
@@ -1627,7 +1627,7 @@
!
CHARACTER
*
(
*
)
uuid_cbuf
)
EXTERNAL
gridDefUUID
CHARACTER
(
80
)
gridInqUUID
!
gridInqUUID
!
(
INTEGER
gridID
,
!
CHARACTER
*
(
*
)
uuid_cbuf
)
EXTERNAL
gridInqUUID
...
...
src/cdiFortran.c
View file @
a6056d18
...
...
@@ -341,7 +341,7 @@ FCALLSCFUN1 (INT, gridInqPosition, GRIDINQPOSITION, gridinqposition, INT)
FCALLSCSUB2
(
gridDefReference
,
GRIDDEFREFERENCE
,
griddefreference
,
INT
,
STRING
)
FCALLSCFUN2
(
INT
,
gridInqReference
,
GRIDINQREFERENCE
,
gridinqreference
,
INT
,
PSTRING
)
FCALLSCSUB2
(
gridDefUUID
,
GRIDDEFUUID
,
griddefuuid
,
INT
,
PPSTRING
)
FCALLSC
FUN2
(
STRING
,
gridInqUUID
,
GRIDINQUUID
,
gridinquuid
,
INT
,
PPSTRING
)
FCALLSC
SUB2
(
gridInqUUID
,
GRIDINQUUID
,
gridinquuid
,
INT
,
PPSTRING
)
/* Lambert Conformal Conic grid (GRIB version) */
...
...
src/grid.c
View file @
a6056d18
...
...
@@ -4358,18 +4358,18 @@ void gridDefUUID(int gridID, const char *uuid)
@Function gridInqUUID
@Title Get the UUID to an unstructured grid
@Prototype
char *
gridInqUUID(int gridID, char *uuid)
@Prototype
void
gridInqUUID(int gridID, char *uuid)
@Parameter
@Item gridID Grid ID, from a previous call to @fref{gridCreate} or @fref{vlistInqVarGrid}.
@Description
The function @func{gridInqUUID} returns the UUID to an unstructured grid.
The function @func{gridInqUUID} returns the UUID to an unstructured grid
to the parameter uuid
.
@Result
@func{gridInqUUID} returns the UUID to an unstructured grid.
@EndFunction
*/
char
*
gridInqUUID
(
int
gridID
,
char
*
uuid
)
void
gridInqUUID
(
int
gridID
,
char
*
uuid
)
{
grid_t
*
gridptr
;
...
...
@@ -4378,8 +4378,6 @@ char *gridInqUUID(int gridID, char *uuid)
grid_check_ptr
(
gridID
,
gridptr
);
memcpy
(
uuid
,
gridptr
->
uuid
,
16
);
return
(
uuid
);
}
...
...
src/mo_cdi.f90
View file @
a6056d18
...
...
@@ -2059,11 +2059,11 @@ module mo_cdi
end
interface
interface
character
(
c_char
)
function
gridInqUUID
(
gridID
,
uuid_cbuf
)
bind
(
c
,
name
=
'gridInqUUID'
)
subroutine
gridInqUUID
(
gridID
,
uuid_cbuf
)
bind
(
c
,
name
=
'gridInqUUID'
)
import
::
c_int
,
c_char
integer
(
c_int
),
value
::
gridID
character
(
c_char
),
dimension
(
*
)
::
uuid_cbuf
end
function
gridInqUUID
end
subroutine
gridInqUUID
end
interface
interface
...
...
src/stream_gribapi.c
View file @
a6056d18
...
...
@@ -2601,7 +2601,8 @@ void gribapiDefGrid(int editionNumber, grib_handle *gh, int gridID, int ljpeg, i
GRIB_CHECK
(
grib_set_long
(
gh
,
"numberOfGridUsed"
,
number
),
0
);
GRIB_CHECK
(
grib_set_long
(
gh
,
"numberOfGridInReference"
,
position
),
0
);
len
=
16
;
if
(
grib_set_bytes
(
gh
,
"uuidOfHGrid"
,
(
unsigned
char
*
)
gridInqUUID
(
gridID
,
uuid
),
&
len
)
!=
0
)
gridInqUUID
(
gridID
,
uuid
);
if
(
grib_set_bytes
(
gh
,
"uuidOfHGrid"
,
(
unsigned
char
*
)
uuid
,
&
len
)
!=
0
)
Warning
(
"Can't write UUID!"
);
}
...
...
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