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

Reverted from last change.

Browse Source
This commit is contained in:
Ward Fisher 2013-02-20 23:16:05 +00:00
parent d968063d0f
commit c6084cc95e
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libdispatch/dvarget.c
View File

@ -212,13 +212,14 @@ NCDEFAULT_get_vars(int ncid, int varid, const size_t * start,
to read larger chunks at a time.
*/
/* memptr indicates where to store the next value */
char* memptr = value;
odom_init(&odom,rank,mystart,myedges,mystride);
/* walk the odometer to extract values */
while(odom_more(&odom)) {
char* memptr = value;
int localstatus = NC_NOERR;
int localstatus = NC_NOERR;
/* Read a single value */
localstatus = NC_get_vara(ncid,varid,odom.index,nc_sizevector1,memptr,memtype);
/* So it turns out that when get_varm is used, all errors are

5
libdispatch/dvarput.c
View File

@ -220,13 +220,14 @@ NCDEFAULT_put_vars(int ncid, int varid, const size_t * start,
to read larger chunks at a time.
*/
/* memptr indicates where to store the next value */
const char* memptr = value;
odom_init(&odom,rank,mystart,myedges,mystride);
/* walk the odometer to extract values */
while(odom_more(&odom)) {
const char* memptr = value;
int localstatus = NC_NOERR;
int localstatus = NC_NOERR;
/* Write a single value */
localstatus = NC_put_vara(ncid,varid,odom.index,nc_sizevector1,memptr,memtype);
/* So it turns out that when get_varm is used, all errors are

2
libsrc/memio.c
View File

@ -428,7 +428,7 @@ memio_pad_length(ncio* nciop, off_t length)
if(newmem == NULL) return NC_ENOMEM;
/* zero out the extra memory */
memset((void*)((char*)newmem+memio->alloc),0,(newsize - memio->alloc));
memset((void*)(newmem+memio->alloc),0,(newsize - memio->alloc));
#ifdef DEBUG
fprintf(stderr,"realloc: %lu/%lu -> %lu/%lu\n",

3
nc_test4/tst_atts1.c
View File

@ -120,9 +120,8 @@ tst_att_ordering(int cmode)
int
main(int argc, char **argv)
{
#ifndef WIN32
(void) signal(SIGFPE, SIG_IGN);
#endif
signed char schar_in[ATT_LEN], schar_out[ATT_LEN] = {NC_MIN_BYTE, 1, NC_MAX_BYTE};
unsigned char uchar_in[ATT_LEN], uchar_out[ATT_LEN] = {0, 128, NC_MAX_UBYTE};
short short_in[ATT_LEN], short_out[ATT_LEN] = {NC_MIN_SHORT, -128, NC_MAX_SHORT};