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

Fix ncdump bug displaying NC_USHORT attribute values as NC_SHORT in netCDF-4 files. Add test for fix.

Browse Source
This commit is contained in:
Russ Rew 2011-06-24 04:51:11 +00:00
parent b3b7861756
commit 3a7556a306
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ncdump/ncdump.c
View File

@ -457,7 +457,7 @@ pr_att_valgs(
break;
case NC_USHORT:
us = ((unsigned short *) vals)[iel];
printf ("%hdUS%s", us, delim);
printf ("%uUS%s", us, delim);
break;
case NC_UINT:
ui = ((unsigned int *) vals)[iel];

1
ncdump/ref_tst_solar_2.cdl
View File

@ -4,4 +4,5 @@ types:
// global attributes:
unimaginatively_named_vlen_type :equally_unimaginatively_named_attribute_YAWN = {-99}, {-99, -99} ;
:for_testing_unsigned_short_attribute_bug = 0US, 32768US, 65535US ;
}

6
ncdump/tst_create_files.c
View File

@ -184,13 +184,14 @@ main(int argc, char **argv)
SUMMARIZE_ERR;
printf("*** creating file with VLEN %s...", FILE_NAME_2);
#define ATT_NAME2 "equally_unimaginatively_named_attribute_YAWN"
#define ATT_NAME3 "for_testing_unsigned_short_attribute_bug"
{
int ncid;
int i, j;
nc_type typeid;
nc_vlen_t data[DIM_LEN];
int *phoney;
unsigned short us_att[ATT_LEN] = {0, 32768, 65535};
/* Create phoney data. */
for (i=0; i<DIM_LEN; i++)
@ -209,6 +210,9 @@ main(int argc, char **argv)
if (nc_def_vlen(ncid, VLEN_TYPE_NAME, NC_INT, &typeid)) ERR;
if (nc_put_att(ncid, NC_GLOBAL, ATT_NAME2, typeid, DIM_LEN, data)) ERR;
/* Test fix of ncdump bug displaying unsigned short attributes */
if (nc_put_att(ncid, NC_GLOBAL, ATT_NAME3, NC_USHORT, ATT_LEN, us_att)) ERR;
if (nc_close(ncid)) ERR;
/* Free the memory used in our phoney data. */