Commit 7d1f319a authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

zaxisInqUUID: changed return value from char* to void

parent a6056d18
......@@ -6,6 +6,7 @@
2014-02-03 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* gridInqUUID: changed return value from char* to void
* zaxisInqUUID: changed return value from char* to void
2014-01-31 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
......
......@@ -1013,7 +1013,7 @@ The function {\tt gridInqUUID} returns the UUID to an unstructured grid.
\subsubsection*{Usage}
\begin{verbatim}
char *gridInqUUID(int gridID, char *uuid);
void gridInqUUID(int gridID, char *uuid);
\end{verbatim}
\hspace*{4mm}\begin{minipage}[]{15cm}
......@@ -1026,4 +1026,4 @@ Grid ID, from a previous call to {\htmlref{\tt gridCreate}{gridCreate}} or {\htm
\subsubsection*{Result}
{\tt gridInqUUID} returns the UUID to an unstructured grid.
{\tt gridInqUUID} returns the UUID to an unstructured grid to the parameter uuid.
......@@ -1321,7 +1321,7 @@ Get the type of a Z-axis.
\section*{\tt \htmlref{zaxisInqUUID}{zaxisInqUUID}}
\begin{verbatim}
char *zaxisInqUUID (int zaxisID, char *uuid_cbuf);
void zaxisInqUUID (int zaxisID, char *uuid_cbuf);
\end{verbatim}
Get the UUID of a generalized Z-axis.
......
......@@ -398,7 +398,7 @@ gridInqUUID
\fi
}
\begin{verbatim}
char *gridInqUUID(int gridID, char *uuid);
void gridInqUUID(int gridID, char *uuid);
\end{verbatim}
Get the UUID to an unstructured grid
......
......@@ -1013,7 +1013,7 @@ The function {\tt gridInqUUID} returns the UUID to an unstructured grid.
\subsubsection*{Usage}
\begin{verbatim}
char *gridInqUUID(INTEGER gridID, CHARACTER*(*) uuid)
SUBROUTINE gridInqUUID(INTEGER gridID, CHARACTER*(*) uuid)
\end{verbatim}
\hspace*{4mm}\begin{minipage}[]{15cm}
......@@ -1026,4 +1026,4 @@ Grid ID, from a previous call to {\htmlref{\tt gridCreate}{gridCreate}} or {\htm
\subsubsection*{Result}
{\tt gridInqUUID} returns the UUID to an unstructured grid.
{\tt gridInqUUID} returns the UUID to an unstructured grid to the parameter uuid.
......@@ -1341,7 +1341,7 @@ Get the type of a Z-axis.
\section*{\tt \htmlref{zaxisInqUUID}{zaxisInqUUID}}
\begin{verbatim}
CHARACTER(80) FUNCTION zaxisInqUUID (INTEGER zaxisID, CHARACTER*(*) uuid_cbuf)
SUBROUTINE zaxisInqUUID (INTEGER zaxisID, CHARACTER*(*) uuid_cbuf)
\end{verbatim}
Get the UUID of a generalized Z-axis.
......
......@@ -398,7 +398,7 @@ gridInqUUID
\fi
}
\begin{verbatim}
char *gridInqUUID(INTEGER gridID, CHARACTER*(*) uuid)
SUBROUTINE gridInqUUID(INTEGER gridID, CHARACTER*(*) uuid)
\end{verbatim}
Get the UUID to an unstructured grid
......
......@@ -831,7 +831,7 @@ int zaxisInqNumber(int gridID);
void zaxisDefUUID(int zaxisID, const char *uuid_cbuf);
/* zaxisInqUUID: Get the UUID of a generalized Z-axis */
char *zaxisInqUUID(int zaxisID, char *uuid_cbuf);
void zaxisInqUUID(int zaxisID, char *uuid_cbuf);
/* zaxisDefName: Define the name of a Z-axis */
void zaxisDefName(int zaxisID, const char *name);
......
......@@ -1849,7 +1849,7 @@
! CHARACTER*(*) uuid_cbuf)
EXTERNAL zaxisDefUUID
CHARACTER(80) zaxisInqUUID
! zaxisInqUUID
! (INTEGER zaxisID,
! CHARACTER*(*) uuid_cbuf)
EXTERNAL zaxisInqUUID
......
......@@ -391,7 +391,7 @@ FCALLSCFUN1 (INT, zaxisInqNlevRef, ZAXISINQNLEVREF, zaxisinqnlevref, INT)
FCALLSCSUB2 (zaxisDefNumber, ZAXISDEFNUMBER, zaxisdefnumber, INT, INT)
FCALLSCFUN1 (INT, zaxisInqNumber, ZAXISINQNUMBER, zaxisinqnumber, INT)
FCALLSCSUB2 (zaxisDefUUID, ZAXISDEFUUID, zaxisdefuuid, INT, PPSTRING)
FCALLSCFUN2 (STRING, zaxisInqUUID, ZAXISINQUUID, zaxisinquuid, INT, PPSTRING)
FCALLSCSUB2 (zaxisInqUUID, ZAXISINQUUID, zaxisinquuid, INT, PPSTRING)
FCALLSCSUB2 (zaxisDefName, ZAXISDEFNAME, zaxisdefname, INT, STRING)
FCALLSCSUB2 (zaxisDefLongname, ZAXISDEFLONGNAME, zaxisdeflongname, INT, STRING)
FCALLSCSUB2 (zaxisDefUnits, ZAXISDEFUNITS, zaxisdefunits, INT, STRING)
......
......@@ -4363,10 +4363,10 @@ void gridDefUUID(int gridID, const char *uuid)
@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 to the parameter uuid.
The function @func{gridInqUUID} returns the UUID to an unstructured grid.
@Result
@func{gridInqUUID} returns the UUID to an unstructured grid.
@func{gridInqUUID} returns the UUID to an unstructured grid to the parameter uuid.
@EndFunction
*/
void gridInqUUID(int gridID, char *uuid)
......
......@@ -2383,11 +2383,11 @@ module mo_cdi
end interface
interface
character(c_char) function zaxisInqUUID(zaxisID,uuid_cbuf) bind(c,name='zaxisInqUUID')
subroutine zaxisInqUUID(zaxisID,uuid_cbuf) bind(c,name='zaxisInqUUID')
import :: c_int,c_char
integer(c_int), value :: zaxisID
character(c_char), dimension(*) :: uuid_cbuf
end function zaxisInqUUID
end subroutine zaxisInqUUID
end interface
interface
......
......@@ -2897,7 +2897,8 @@ void gribapiDefLevel(int editionNumber, grib_handle *gh, int param, int zaxisID,
GRIB_CHECK(grib_set_long(gh, "nlev", zaxisInqNlevRef(zaxisID)), 0);
GRIB_CHECK(grib_set_long(gh, "numberOfVGridUsed", number), 0);
len = 16;
if (grib_set_bytes(gh, "uuidOfVGrid", (unsigned char *) zaxisInqUUID(zaxisID, uuid), &len) != 0)
zaxisInqUUID(zaxisID, uuid);
if (grib_set_bytes(gh, "uuidOfVGrid", (unsigned char *) uuid, &len) != 0)
Warning("Can't write UUID!");
GRIB_CHECK(grib_set_long(gh, "topLevel", (long) dlevel1), 0);
GRIB_CHECK(grib_set_long(gh, "bottomLevel", (long) dlevel2), 0);
......@@ -2915,7 +2916,8 @@ void gribapiDefLevel(int editionNumber, grib_handle *gh, int param, int zaxisID,
GRIB_CHECK(grib_set_long(gh, "nlev", zaxisInqNlevRef(zaxisID)), 0);
GRIB_CHECK(grib_set_long(gh, "numberOfVGridUsed", number), 0);
len = 16;
if (grib_set_bytes(gh, "uuidOfVGrid", (unsigned char *) zaxisInqUUID(zaxisID, uuid), &len) != 0)
zaxisInqUUID(zaxisID, uuid);
if (grib_set_bytes(gh, "uuidOfVGrid", (unsigned char *) uuid, &len) != 0)
Warning("Can't write UUID!");
GRIB_CHECK(grib_set_double(gh, "level", level), 0);
}
......
......@@ -812,7 +812,7 @@ void zaxisDefUUID(int zaxisID, const char *uuid)
@Function zaxisInqUUID
@Title Get the uuid to a generalized Z-axis
@Prototype char *zaxisInqUUID(int zaxisID, char *uuid)
@Prototype void zaxisInqUUID(int zaxisID, char *uuid)
@Parameter
@Item zaxisID Z-axis ID, from a previous call to @fref{zaxisCreate} or @fref{vlistInqVarZaxis}.
......@@ -820,10 +820,10 @@ void zaxisDefUUID(int zaxisID, const char *uuid)
The function @func{zaxisInqUUID} returns the UUID to a generalized Z-axis.
@Result
@func{zaxisInqUUID} returns the UUID to a generalized Z-axis.
@func{zaxisInqUUID} returns the UUID to a generalized Z-axis to the parameter uuid.
@EndFunction
*/
char *zaxisInqUUID(int zaxisID, char *uuid)
void zaxisInqUUID(int zaxisID, char *uuid)
{
zaxis_t *zaxisptr;
......@@ -832,8 +832,6 @@ char *zaxisInqUUID(int zaxisID, char *uuid)
zaxis_check_ptr(zaxisID, zaxisptr);
memcpy(uuid, zaxisptr->uuid, 16);
return (uuid);
}
/*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment