Commit dcb5034d authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Renamed cdiZaxisInqString to cdiZaxisInqKeyStr.

parent 102c70ad
...@@ -989,8 +989,8 @@ void zaxisInqUUID(int zaxisID, unsigned char uuid[CDI_UUID_SIZE]); ...@@ -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 // cdiZaxisDefKeyStr: Define a CDI Z-axis string value from a key
int cdiZaxisDefKeyStr(int zaxisID, int key, int size, const char *mesg); int cdiZaxisDefKeyStr(int zaxisID, int key, int size, const char *mesg);
// cdiZaxisInqString: Get a CDI Z-axis string value from a key // cdiZaxisInqKeyStr: Get a CDI Z-axis string value from a key
int cdiZaxisInqString(int zaxisID, int key, int size, char *mesg); int cdiZaxisInqKeyStr(int zaxisID, int key, int size, char *mesg);
/* zaxisDefName: Define the name of a Z-axis */ /* zaxisDefName: Define the name of a Z-axis */
void zaxisDefName(int zaxisID, const char *name_optional); void zaxisDefName(int zaxisID, const char *name_optional);
......
...@@ -421,7 +421,7 @@ FCALLSCSUB2 (zaxisInqUUID, ZAXISINQUUID, zaxisinquuid, INT, PVOID) ...@@ -421,7 +421,7 @@ FCALLSCSUB2 (zaxisInqUUID, ZAXISINQUUID, zaxisinquuid, INT, PVOID)
/* CDI zaxis string key values */ /* CDI zaxis string key values */
FCALLSCFUN4 (INT, cdiZaxisDefKeyStr, CDIZAXISDEFSTRING, cdizaxisdefstring, INT, INT, INT, STRING) 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 (zaxisDefName, ZAXISDEFNAME, zaxisdefname, INT, STRING)
FCALLSCSUB2 (zaxisInqName, ZAXISINQNAME, zaxisinqname, INT, PSTRING) FCALLSCSUB2 (zaxisInqName, ZAXISINQNAME, zaxisinqname, INT, PSTRING)
FCALLSCSUB2 (zaxisDefLongname, ZAXISDEFLONGNAME, zaxisdeflongname, INT, STRING) FCALLSCSUB2 (zaxisDefLongname, ZAXISDEFLONGNAME, zaxisdeflongname, INT, STRING)
......
...@@ -1819,7 +1819,7 @@ void cdfDefZaxis(stream_t *streamptr, int zaxisID) ...@@ -1819,7 +1819,7 @@ void cdfDefZaxis(stream_t *streamptr, int zaxisID)
char dimname[CDI_MAX_NAME+3]; char dimname[CDI_MAX_NAME+3];
dimname[0] = 0; 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 ( dimname[0] == 0 ) strcpy(dimname, axisname);
if ( type == ZAXIS_REFERENCE ) cdfDefZaxisUUID(streamptr, zaxisID); if ( type == ZAXIS_REFERENCE ) cdfDefZaxisUUID(streamptr, zaxisID);
......
...@@ -421,10 +421,10 @@ int cdiZaxisDefKeyStr(int zaxisID, int key, int size, const char *mesg) ...@@ -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 @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 @Parameter
@Item zaxisID Z-axis ID, from a previous call to @fref{zaxisCreate}. @Item zaxisID Z-axis ID, from a previous call to @fref{zaxisCreate}.
@Item key The key to be searched. @Item key The key to be searched.
...@@ -435,14 +435,14 @@ int cdiZaxisDefKeyStr(int zaxisID, int key, int size, const char *mesg) ...@@ -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}. is given by the predefined constant @func{CDI_MAX_NAME}.
@Description @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 @Result
@func{cdiZaxisInqString} returns 0 if OK and integer value on error. @func{cdiZaxisInqKeyStr} returns 0 if OK and integer value on error.
@EndFunction @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; if ( size < 1 || mesg == NULL ) return -1;
......
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