Skip to content

Commit d25d527

Browse files
committed
Remove some unused variables
1 parent 26c0e47 commit d25d527

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

libdap2/cdf.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ extern char* ocfqn(OCddsnode);
1616
static NCerror sequencecheckr(CDFnode* node, NClist* vars, CDFnode* topseq);
1717
static NCerror restructr(NCDAPCOMMON*, CDFnode*, CDFnode*, NClist*);
1818
static NCerror repairgrids(NCDAPCOMMON*, NClist*);
19-
static NCerror structwrap(NCDAPCOMMON*, CDFnode*, CDFnode*, int, CDFnode*, int);
20-
static int findin(CDFnode* parent, CDFnode* child);
19+
static NCerror structwrap(NCDAPCOMMON*, CDFnode*, CDFnode*, size_t, CDFnode*);
20+
static size_t findin(CDFnode* parent, CDFnode* child);
2121
static CDFnode* makenewstruct(NCDAPCOMMON*, CDFnode*, CDFnode*);
2222
static NCerror mapnodesr(CDFnode*, CDFnode*, int depth);
2323
static NCerror mapfcn(CDFnode* dstnode, CDFnode* srcnode);
@@ -507,10 +507,9 @@ repairgrids(NCDAPCOMMON* ncc, NClist* repairlist)
507507
for(i=0;i<nclistlength(repairlist);i+=2) {
508508
CDFnode* node = (CDFnode*)nclistget(repairlist,i);
509509
CDFnode* pattern = (CDFnode*)nclistget(repairlist,i+1);
510-
int tindex = findin(pattern->container,pattern);
511510
size_t index = findin(node->container,node);
512511
ncstat = structwrap(ncc, node,node->container,index,
513-
pattern->container,tindex);
512+
pattern->container);
514513
#ifdef DEBUG
515514
fprintf(stderr,"repairgrids: %s -> %s\n",
516515
ocfqn(node->ocnode),ocfqn(pattern->ocnode));
@@ -521,8 +520,8 @@ ocfqn(node->ocnode),ocfqn(pattern->ocnode));
521520
}
522521

523522
static NCerror
524-
structwrap(NCDAPCOMMON* ncc, CDFnode* node, CDFnode* parent, int parentindex,
525-
CDFnode* patterngrid, int gridindex)
523+
structwrap(NCDAPCOMMON* ncc, CDFnode* node, CDFnode* parent, size_t parentindex,
524+
CDFnode* patterngrid)
526525
{
527526
CDFnode* newstruct;
528527

libdap2/constraints.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -700,13 +700,11 @@ dapvar2projection(CDFnode* var, DCEprojection** projectionp)
700700
NClist* path = nclistnew();
701701
NClist* segments;
702702
DCEprojection* projection = NULL;
703-
int dimindex;
704703

705704
/* Collect the nodes needed to construct the projection segments */
706705
collectnodepath(var,path,!WITHDATASET);
707706

708707
segments = nclistnew();
709-
dimindex = 0; /* point to next subset of slices */
710708
nclistsetalloc(segments,nclistlength(path));
711709
for(i=0;i<nclistlength(path);i++) {
712710
DCEsegment* segment = (DCEsegment*)dcecreate(CES_SEGMENT);
@@ -730,7 +728,6 @@ dapvar2projection(CDFnode* var, DCEprojection** projectionp)
730728
}
731729
segment->slicesdefined = 1;
732730
segment->slicesdeclized = 1;
733-
dimindex += localrank;
734731
nclistpush(segments,(void*)segment);
735732
}
736733

0 commit comments

Comments
 (0)