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

Fixed an issue with variable declaration in Visual Studio-based builds.

Browse Source
This commit is contained in:
Ward Fisher 2014-02-11 15:49:34 -07:00
parent 0627c82758
commit ae902f1909
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) clonedimset3(NCDAPCOMMON* nccomm, NClist* dimset, CDFnode* var)
{ {
NClist* result = NULL; NClist* result = NULL;
int i;
int i;
if(dimset != NULL) { if(dimset != NULL) {
for(i=0;i<nclistlength(dimset);i++) { for(i=0;i<nclistlength(dimset);i++) {
if(result == NULL) CDFnode *dim = NULL;
result = nclistnew(); if(result == NULL)
CDFnode* dim = (CDFnode*)nclistget(dimset,i); result = nclistnew();
dim = (CDFnode*)nclistget(dimset,i);
nclistpush(result,(void*)clonedim(nccomm,dim,var)); nclistpush(result,(void*)clonedim(nccomm,dim,var));
} }
} }
@ -712,9 +717,10 @@ definedimsetall3(NCDAPCOMMON* nccomm/*notused*/, CDFnode* node)
} }
/* append dimsetplus; */ /* append dimsetplus; */
for(i=0;i<nclistlength(node->array.dimsetplus);i++) { for(i=0;i<nclistlength(node->array.dimsetplus);i++) {
CDFnode* clone = NULL;
if(dimsetall == NULL) dimsetall = nclistnew(); if(dimsetall == NULL) dimsetall = nclistnew();
CDFnode* clone = (CDFnode*)nclistget(node->array.dimsetplus,i); clone = (CDFnode*)nclistget(node->array.dimsetplus,i);
nclistpush(dimsetall,(void*)clone); nclistpush(dimsetall,(void*)clone);
} }
node->array.dimsetall = dimsetall; node->array.dimsetall = dimsetall;
#ifdef DEBUG1 #ifdef DEBUG1
@ -741,8 +747,9 @@ fprintf(stderr,"dimsettrans3: node=%s/%d\n",node->ocname,nclistlength(node->arra
} }
/* concat parent dimset0 and dimset;*/ /* concat parent dimset0 and dimset;*/
for(i=0;i<nclistlength(node->array.dimset0);i++) { for(i=0;i<nclistlength(node->array.dimset0);i++) {
CDFnode* clone = NULL;
if(dimsettrans == NULL) dimsettrans = nclistnew(); if(dimsettrans == NULL) dimsettrans = nclistnew();
CDFnode* clone = (CDFnode*)nclistget(node->array.dimset0,i); clone = (CDFnode*)nclistget(node->array.dimset0,i);
nclistpush(dimsettrans,(void*)clone); nclistpush(dimsettrans,(void*)clone);
} }
node->array.dimsettrans = dimsettrans; node->array.dimsettrans = dimsettrans;