71846b84aa4e4c3b938ebc76ab6de4f7e7913fdd hiram Wed Nov 25 10:48:36 2015 -0800 fixup gcc warnings for -Wunused-but-set-variable refs #16121 diff --git src/hg/fishClones/fishClones.c src/hg/fishClones/fishClones.c index 8d061fd..7f8cee1 100644 --- src/hg/fishClones/fishClones.c +++ src/hg/fishClones/fishClones.c @@ -326,58 +326,57 @@ AllocVar(ret); ret->next = NULL; ret->name = cloneString(n); touppers(ret->name); ret->phase = 0; return(ret); } struct place *createPlace(struct position *pos) /* Create a place record */ { struct place *ret; char *names, *words[2]; struct name *n; - int wordCount; AllocVar(ret); ret->next = NULL; ret->chrom = cloneString(pos->chrom); ret->start = pos->start; ret->end = pos->end; ret->type = cloneString(pos->type); ret->numAcc = 0; ret->acc = NULL; ret->numSts = 0; ret->sts = NULL; ret->numBacEndPair = 0; ret->bePair = NULL; ret->numBacEnd = 0; ret->bacEnd = NULL; ret->startBE = -1; ret->endBE = -1; if (sameString(ret->type, "Accession")) { ret->numAcc++; ret->acc = createName(pos->name); ret->acc->phase = pos->phase; } if (sameString(ret->type, "BAC End Pair")) { names = cloneString(pos->name); - wordCount = chopString(names, ",",words,2); + (void) chopString(names, ",",words,2); // ignore return count ret->bePair = createName(words[0]); n = createName(words[1]); slAddHead(&ret->bePair, n); ret->numBacEndPair++; ret->startBE = 0; ret->endBE = 0; } if (sameString(ret->type, "STS Marker")) { ret->numSts++; ret->sts = createName(pos->name); } if (sameString(ret->type, "BAC End")) { if (pos->orien == '+') @@ -836,31 +835,30 @@ newPos->end = be->chromEnd; lfsFree(&be); slAddHead(&fc->endPair, newPos); } sqlFreeResult(&sr); } int combinePos(struct place *p, struct position *pos) /* See if current position can be added to placement */ { int ret = 0; int d1 = abs(p->start - pos->start); int d2 = abs(p->end - pos->end); struct name *n; char *words[2], *names; - int wordCount; struct name *pos2; boolean badBE = FALSE, sameEnd = FALSE; /* Check if BAC end and facing the wrong way */ n = createName(pos->name); if ((!inNameList(n, p->bacEnd)) && (!inNameList(n, p->bePair))) { if ((sameString(pos->type, "BAC End")) && ( ((pos->orien == '+') && ((pos->start - p->start) > 25000)) || ((pos->orien == '-') && ((p->end - pos->end) > 25000)) )) badBE = TRUE; else if ((((p->startBE != -1) && ((p->start - pos->start) > 25000)) || ((p->endBE != -1) && ((pos->end - p->end) > 25000))) && (((!sameString(pos->type, "BAC End Pair")) || (p->bePair == NULL)) && (p->acc == NULL))) @@ -920,31 +918,31 @@ ( ((sameString(pos->type, "BAC End")) && (pos->orien == '-')) && ((p->end - pos->end) <= 25000) && ((p->endBE < 0) || ((p->end - pos->end) < p->endBE))) ) p->endBE = p->end - pos->end; if (sameString(pos->type, "Accession")) { p->numAcc++; n = createName(pos->name); n->phase = pos->phase; slAddHead(&p->acc, n); } if (sameString(pos->type, "BAC End Pair")) { names = cloneString(pos->name); - wordCount = chopString(names, ",",words,2); + (void) chopString(names, ",",words,2); // ignore return count n = createName(words[0]); slAddHead(&p->bePair, n); n = createName(words[1]); slAddHead(&p->bePair, n); p->numBacEndPair++; } if (sameString(pos->type, "STS Marker")) { /* Check if used for STS Marker */ n = createName(pos->name); if (!inNameList(n, p->sts)) { p->numSts++; n = createName(pos->name); slAddHead(&p->sts, n);