Renamed cdiZaxisInqString to cdiZaxisInqKeyStr.

src/cdi.h

@@ -989,8 +989,8 @@ void    zaxisInqUUID(int zaxisID, unsigned char uuid[CDI_UUID_SIZE]);
 //      cdiZaxisDefKeyStr: Define a CDI Z-axis string value from a key
 int     cdiZaxisDefKeyStr(int zaxisID, int key, int size, const char *mesg);
 
-//      cdiZaxisInqString: Get a CDI Z-axis string value from a key
-int     cdiZaxisInqString(int zaxisID, int key, int size, char *mesg);
+//      cdiZaxisInqKeyStr: Get a CDI Z-axis string value from a key
+int     cdiZaxisInqKeyStr(int zaxisID, int key, int size, char *mesg);
 
 /*      zaxisDefName: Define the name of a Z-axis */
 void    zaxisDefName(int zaxisID, const char *name_optional);

src/cdiFortran.c

@@ -421,7 +421,7 @@ FCALLSCSUB2 (zaxisInqUUID, ZAXISINQUUID, zaxisinquuid, INT, PVOID)
 /*  CDI zaxis string key values  */
 
 FCALLSCFUN4 (INT, cdiZaxisDefKeyStr, CDIZAXISDEFSTRING, cdizaxisdefstring, INT, INT, INT, STRING)
-FCALLSCFUN4 (INT, cdiZaxisInqString, CDIZAXISINQSTRING, cdizaxisinqstring, INT, INT, INT, PSTRING)
+FCALLSCFUN4 (INT, cdiZaxisInqKeyStr, CDIZAXISINQSTRING, cdizaxisinqstring, INT, INT, INT, PSTRING)
 FCALLSCSUB2 (zaxisDefName, ZAXISDEFNAME, zaxisdefname, INT, STRING)
 FCALLSCSUB2 (zaxisInqName, ZAXISINQNAME, zaxisinqname, INT, PSTRING)
 FCALLSCSUB2 (zaxisDefLongname, ZAXISDEFLONGNAME, zaxisdeflongname, INT, STRING)

src/stream_cdf_o.c

@@ -1819,7 +1819,7 @@ void cdfDefZaxis(stream_t *streamptr, int zaxisID)
 
       char dimname[CDI_MAX_NAME+3];
       dimname[0] = 0;
-      //cdiZaxisInqString(zaxisID, CDI_ZAXIS_DIMNAME, CDI_MAX_NAME, dimname);
+      //cdiZaxisInqKeyStr(zaxisID, CDI_ZAXIS_DIMNAME, CDI_MAX_NAME, dimname);
       if ( dimname[0] == 0 ) strcpy(dimname, axisname);
 
       if ( type == ZAXIS_REFERENCE ) cdfDefZaxisUUID(streamptr, zaxisID);

src/zaxis.c

@@ -421,10 +421,10 @@ int cdiZaxisDefKeyStr(int zaxisID, int key, int size, const char *mesg)
 }
 
 /*
-@Function  cdiZaxisInqString
+@Function  cdiZaxisInqKeyStr
 @Title     Get a CDI Z-axis string value from a key
 
-@Prototype int cdiZaxisInqString(int zaxisID, int key, int size, char *mesg)
+@Prototype int cdiZaxisInqKeyStr(int zaxisID, int key, int size, char *mesg)
 @Parameter
     @Item  zaxisID  Z-axis ID, from a previous call to @fref{zaxisCreate}.
     @Item  key      The key to be searched.
@@ -435,14 +435,14 @@ int cdiZaxisDefKeyStr(int zaxisID, int key, int size, const char *mesg)
                     is given by the predefined constant @func{CDI_MAX_NAME}.
 
 @Description
-The function @func{cdiZaxisInqString} return a CDI Z-axis string value from a key.
+The function @func{cdiZaxisInqKeyStr} return a CDI Z-axis string value from a key.
 
 @Result
-@func{cdiZaxisInqString} returns 0 if OK and integer value on error.
+@func{cdiZaxisInqKeyStr} returns 0 if OK and integer value on error.
 
 @EndFunction
 */
-int cdiZaxisInqString(int zaxisID, int key, int size, char *mesg)
+int cdiZaxisInqKeyStr(int zaxisID, int key, int size, char *mesg)
 {
   if ( size < 1 || mesg == NULL ) return -1;