diff --git a/v2/libtpcpar/parcomb.c b/v2/libtpcpar/parcomb.c index acc7666a7f00cfbe588796b41c2fc37bdd17ccb5..c6ee4857aac9d0dce9e59a2634158d56fb05bf9f 100644 --- a/v2/libtpcpar/parcomb.c +++ b/v2/libtpcpar/parcomb.c @@ -51,9 +51,9 @@ int parSelectByAnother( /* Search for parameter names */ for(int i=0; i<d1->parNr; i++) { - if(d1->n[i].name==NULL || strnlen(d1->n[i].name, 1)<1) continue; + if(strnlen(d1->n[i].name, 1)<1) continue; for(int j=0; j<d2->parNr; j++) { - if(d2->n[j].name==NULL || strnlen(d2->n[j].name, 1)<1) continue; + if(strnlen(d2->n[j].name, 1)<1) continue; if(strcasecmp(d1->n[i].name, d2->n[j].name)==0) {d1->n[i].sw=1; continue;} /* Allow mixed '-' and '_' */ char *buf1, *buf2; @@ -67,9 +67,9 @@ int parSelectByAnother( /* Search for TAC names */ for(int i=0; i<d1->tacNr; i++) { - if(d1->r[i].name==NULL || strnlen(d1->r[i].name, 1)<1) continue; + if(strnlen(d1->r[i].name, 1)<1) continue; for(int j=0; j<d2->tacNr; j++) { - if(d2->r[i].name==NULL || strnlen(d2->r[j].name, 1)<1) continue; + if(strnlen(d2->r[j].name, 1)<1) continue; if(strcasecmp(d1->r[i].name, d2->r[j].name)==0) {d1->r[i].sw=1; continue;} /* Allow mixed '-' and '_' */ char *buf1, *buf2; @@ -135,10 +135,10 @@ int parCombineTACs( /* Copy contents for common TACs */ for(int i=0; i<d1->tacNr; i++) { /* find matching TAC name */ - if(d1->r[i].name==NULL || strnlen(d1->r[i].name, 1)<1) continue; + if(strnlen(d1->r[i].name, 1)<1) continue; int j; for(j=0; j<d2->tacNr; j++) { - if(d2->r[i].name==NULL || strnlen(d2->r[j].name, 1)<1) continue; + if(strnlen(d2->r[j].name, 1)<1) continue; if(strcasecmp(d1->r[i].name, d2->r[j].name)==0) break; /* Allow mixed '-' and '_' */ char *buf1, *buf2;