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

Merge branch 'master' of http://github.com/Unidata/netcdf-c

Browse Source
This commit is contained in:
Russ Rew 2014-02-16 11:55:19 -07:00
commit 601fb445d6
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libdap2/cdf3.c
View File

@ -659,12 +659,17 @@ static NClist*
clonedimset3(NCDAPCOMMON* nccomm, NClist* dimset, CDFnode* var)
{
NClist* result = NULL;
int i;
int i;
if(dimset != NULL) {
for(i=0;i<nclistlength(dimset);i++) {
if(result == NULL)
result = nclistnew();
CDFnode* dim = (CDFnode*)nclistget(dimset,i);
CDFnode *dim = NULL;
if(result == NULL)
result = nclistnew();
dim = (CDFnode*)nclistget(dimset,i);
nclistpush(result,(void*)clonedim(nccomm,dim,var));
}
}
@ -712,9 +717,10 @@ definedimsetall3(NCDAPCOMMON* nccomm/*notused*/, CDFnode* node)
}
/* append dimsetplus; */
for(i=0;i<nclistlength(node->array.dimsetplus);i++) {
CDFnode* clone = NULL;
if(dimsetall == NULL) dimsetall = nclistnew();
CDFnode* clone = (CDFnode*)nclistget(node->array.dimsetplus,i);
nclistpush(dimsetall,(void*)clone);
clone = (CDFnode*)nclistget(node->array.dimsetplus,i);
nclistpush(dimsetall,(void*)clone);
}
node->array.dimsetall = dimsetall;
#ifdef DEBUG1
@ -741,8 +747,9 @@ fprintf(stderr,"dimsettrans3: node=%s/%d\n",node->ocname,nclistlength(node->arra
}
/* concat parent dimset0 and dimset;*/
for(i=0;i<nclistlength(node->array.dimset0);i++) {
CDFnode* clone = NULL;
if(dimsettrans == NULL) dimsettrans = nclistnew();
CDFnode* clone = (CDFnode*)nclistget(node->array.dimset0,i);
clone = (CDFnode*)nclistget(node->array.dimset0,i);
nclistpush(dimsettrans,(void*)clone);
}
node->array.dimsettrans = dimsettrans;