mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-01-18 15:55:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Walking back some of the changes to see if they were necessary (hard to tell), which should hopefully fix netcdf-cxx4 compatibility.

Browse Source
This commit is contained in:
Ward Fisher 2016-01-04 14:49:47 -07:00
parent e17dfb4581
commit c616b53358
4 changed files with 53 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
include/netcdf.h
View File

@ -991,7 +991,7 @@ 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);
@ -1000,6 +1000,31 @@ 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);
EXTERNL int
nc_get_att_text(int ncid, int varid, const char *name, char *ip);
EXTERNL int
nc_put_att_string(int ncid, int varid, const char *name,
size_t len, const char **op);
EXTERNL int
nc_get_att_string(int ncid, int varid, const char *name, char **ip);
#endif //__CHAR_UNSIGNED__
EXTERNL int
nc_put_att_uchar(int ncid, int varid, const char *name, nc_type xtype,
size_t len, const unsigned char *op);
@ -1077,12 +1102,6 @@ EXTERNL int
nc_get_att_ulonglong(int ncid, int varid, const char *name,
unsigned long long *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);
/* End {put,get}_att */
/* Begin _var */
@ -1131,7 +1150,7 @@ EXTERNL int
nc_put_var1_text(int ncid, int varid, const size_t *indexp, const char *op);
EXTERNL int
nc_get_var1_text(int ncid, int varid, const size_t *indexp, signed char *ip);
nc_get_var1_text(int ncid, int varid, const size_t *indexp, char *ip);
EXTERNL int
nc_put_var1_uchar(int ncid, int varid, const size_t *indexp,

11
libdispatch/dattget.c
View File

@ -131,8 +131,14 @@ the length of the attributes.
\endcode
*/
/*! \{ */
#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);
@ -321,8 +327,13 @@ 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);

16
libdispatch/dattput.c
View File

@ -44,9 +44,16 @@ apply.
\returns ::NC_ELATEFILL Fill values must be written while the file
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);
@ -131,9 +138,14 @@ netCDF dataset named foo.nc:
if (status != NC_NOERR) handle_error(status);
\endcode
*/
int
nc_put_att_text(int ncid, int varid, const char *name,
#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);

2
libdispatch/dvarget.c
View File

@ -825,7 +825,7 @@ nc_get_var1(int ncid, int varid, const size_t *indexp, void *ip)
}
int
nc_get_var1_text(int ncid, int varid, const size_t *indexp, signed char *ip)
nc_get_var1_text(int ncid, int varid, const size_t *indexp, char *ip)
{
NC* ncp;
int stat = NC_check_id(ncid, &ncp);