@@ -16,8 +16,8 @@ extern char* ocfqn(OCddsnode);
16
16
static NCerror sequencecheckr (CDFnode * node , NClist * vars , CDFnode * topseq );
17
17
static NCerror restructr (NCDAPCOMMON * , CDFnode * , CDFnode * , NClist * );
18
18
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 );
21
21
static CDFnode * makenewstruct (NCDAPCOMMON * , CDFnode * , CDFnode * );
22
22
static NCerror mapnodesr (CDFnode * , CDFnode * , int depth );
23
23
static NCerror mapfcn (CDFnode * dstnode , CDFnode * srcnode );
@@ -507,10 +507,9 @@ repairgrids(NCDAPCOMMON* ncc, NClist* repairlist)
507
507
for (i = 0 ;i < nclistlength (repairlist );i += 2 ) {
508
508
CDFnode * node = (CDFnode * )nclistget (repairlist ,i );
509
509
CDFnode * pattern = (CDFnode * )nclistget (repairlist ,i + 1 );
510
- int tindex = findin (pattern -> container ,pattern );
511
510
size_t index = findin (node -> container ,node );
512
511
ncstat = structwrap (ncc , node ,node -> container ,index ,
513
- pattern -> container , tindex );
512
+ pattern -> container );
514
513
#ifdef DEBUG
515
514
fprintf (stderr ,"repairgrids: %s -> %s\n" ,
516
515
ocfqn (node -> ocnode ),ocfqn (pattern -> ocnode ));
@@ -521,8 +520,8 @@ ocfqn(node->ocnode),ocfqn(pattern->ocnode));
521
520
}
522
521
523
522
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 )
526
525
{
527
526
CDFnode * newstruct ;
528
527
0 commit comments