mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-27 07:30:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gh159-walkback' of https://github.com/Unidata/netcdf-c into gh159-walkback

Browse Source
This commit is contained in:
Ward Fisher 2016-01-05 10:47:26 -07:00
commit 91d025d3ac
3 changed files with 5 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/netcdf.h
View File

@ -991,23 +991,6 @@ nc_del_att(int ncid, int varid, const char *name);
/* End _att */
/* Begin {put,get}_att */
#ifdef __CHAR_UNSIGNED__
EXTERNL int
nc_put_att_text(int ncid, int varid, const char *name,
size_t len, const signed char *op);
EXTERNL int
nc_get_att_text(int ncid, int varid, const char *name, signed char *ip);
EXTERNL int
nc_put_att_string(int ncid, int varid, const char *name,
size_t len, const signed char **op);
EXTERNL int
nc_get_att_string(int ncid, int varid, const char *name, signed char **ip);
#else // __CHAR_UNSIGNED__
EXTERNL int
nc_put_att_text(int ncid, int varid, const char *name,
size_t len, const char *op);
@ -1022,9 +1005,7 @@ nc_put_att_string(int ncid, int varid, const char *name,
EXTERNL int
nc_get_att_string(int ncid, int varid, const char *name, char **ip);
#endif //__CHAR_UNSIGNED__
EXTERNL int
EXTERNL int
nc_put_att_uchar(int ncid, int varid, const char *name, nc_type xtype,
size_t len, const unsigned char *op);

12
libdispatch/dattget.c
View File

@ -132,13 +132,8 @@ the length of the attributes.
*/
/*! \{ */
#ifdef __CHAR_UNSIGNED__
int
nc_get_att_text(int ncid, int varid, const char *name, signed char *value)
#else
int
nc_get_att_text(int ncid, int varid, const char *name, char *value)
#endif
{
NC* ncp;
int stat = NC_check_id(ncid, &ncp);
@ -327,13 +322,10 @@ int main(int argc, char ** argv) {
*/
#ifdef __CHAR_UNSIGNED__
int
nc_get_att_string(int ncid, int varid, const char *name, signed char **value)
#else
int
nc_get_att_string(int ncid, int varid, const char *name, char **value)
#endif
{
NC *ncp;
int stat = NC_check_id(ncid, &ncp);

13
libdispatch/dattput.c
View File

@ -45,15 +45,10 @@ apply.
is still in initial define mode.
*/
#ifdef __CHAR_UNSIGNED__
int
nc_put_att_string(int ncid, int varid, const char *name,
size_t len, const signed char** value)
#else
int
nc_put_att_string(int ncid, int varid, const char *name,
size_t len, const char** value)
#endif
{
NC* ncp;
int stat = NC_check_id(ncid, &ncp);
@ -139,13 +134,9 @@ netCDF dataset named foo.nc:
\endcode
*/
#ifdef __CHAR_UNSIGNED__
int nc_put_att_text(int ncid, int varid, const char *name,
size_t len, const signed char *value)
#else
int nc_put_att_text(int ncid, int varid, const char *name,
size_t len, const char *value)
#endif
{
NC* ncp;
int stat = NC_check_id(ncid, &ncp);