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

upgrade new oc files to nclist/ncbytes

Browse Source
This commit is contained in:
Dennis Heimbigner 2017-03-17 17:20:02 -06:00
parent be6e1b65dc
commit 031ae14842
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oc2/occompile.c
View File

@ -61,10 +61,10 @@ occompile(OCstate* state, OCnode* xroot)
#ifdef OCDEBUG
{
OCbytes* buffer = ocbytesnew();
Ncbytes* buffer = ncbytesnew();
ocdumpdatatree(state,data,buffer,0);
fprintf(stderr,"datatree:\n%s",ocbytescontents(buffer));
ocbytesfree(buffer);
fprintf(stderr,"datatree:\n%s",ncbytescontents(buffer));
ncbytesfree(buffer);
}
#endif
return OCTHROW(ocstat);

4
oc2/ocdata.c
View File

@ -14,9 +14,9 @@ static OCerror ocread(OCdata*, XXDR*, char*, size_t, size_t, size_t);
static void
octrace(char* proc, OCstate* state, OCdata* data)
{
OCbytes* buffer = ocbytesnew();
NCbytes* buffer = ncbytesnew();
ocdumpdatapath(state,data,buffer);
fprintf(stderr,"%s: %s\n",proc,ocbytescontents(buffer));
fprintf(stderr,"%s: %s\n",proc,ncbytescontents(buffer));
}
#else

8
oc2/ocnode.c
View File

@ -14,7 +14,7 @@ static OCerror mergeother1(OCnode* root, OCnode* das);
static char* pathtostring(NClist* path, char* separator);
static void computefullname(OCnode* node);
static OCerror mergeother1(OCnode* root, OCnode* das);
static OCerror mergeother(OCnode* ddsroot, OClist* dasnodes);
static OCerror mergeother(OCnode* ddsroot, NClist* dasnodes);
/* Process ocnodes to fix various semantic issues*/
void
@ -415,12 +415,12 @@ mergedods1(OCnode* dds, OCnode* dods)
}
static OCerror
mergeother(OCnode* ddsroot, OClist* dasnodes)
mergeother(OCnode* ddsroot, NClist* dasnodes)
{
OCerror stat = OC_NOERR;
int i;
for(i=0;i<oclistlength(dasnodes);i++) {
OCnode* das = (OCnode*)oclistget(dasnodes,i);
for(i=0;i<nclistlength(dasnodes);i++) {
OCnode* das = (OCnode*)nclistget(dasnodes,i);
if(das == NULL) continue;
if((stat = mergeother1(ddsroot, das))) break;
}

2
oc2/ocnode.h
View File

@ -36,7 +36,7 @@ typedef struct OCattribute {
typedef struct OCattinfo {
int isglobal; /* is this supposed to be a global attribute set?*/
int isdods; /* is this a global DODS_XXX attribute set */
OClist* values; /* oclist<char*>*/
NClist* values; /* oclist<char*>*/
struct OCnode* var; /* containing var else null */
} OCattinfo;