gridInqUUID: changed return value from char* to void

ChangeLog

@@ -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

@@ -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

@@ -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

@@ -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

@@ -1627,7 +1627,7 @@
 !                                     CHARACTER*(*)   uuid_cbuf)
       EXTERNAL        gridDefUUID
 
-      CHARACTER(80)   gridInqUUID
+!                     gridInqUUID
 !                                    (INTEGER         gridID,
 !                                     CHARACTER*(*)   uuid_cbuf)
       EXTERNAL        gridInqUUID

src/cdiFortran.c

@@ -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)
-FCALLSCFUN2 (STRING, gridInqUUID, GRIDINQUUID, gridinquuid, INT, PPSTRING)
+FCALLSCSUB2 (gridInqUUID, GRIDINQUUID, gridinquuid, INT, PPSTRING)
 
 /*  Lambert Conformal Conic grid (GRIB version)  */
 

src/grid.c

@@ -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

@@ -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

@@ -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!");
 	  }