e685265dd1b666acaab2bc076c141c368fb4be66 hiram Thu Oct 15 11:36:17 2015 -0700 fixup gcc warnings for -Wunused-but-set-variable refs #16121 diff --git src/hg/hgTracks/simpleTracks.c src/hg/hgTracks/simpleTracks.c index 32d076e..9f25c28 100644 --- src/hg/hgTracks/simpleTracks.c +++ src/hg/hgTracks/simpleTracks.c @@ -7742,40 +7742,38 @@ int shortOff = heightPer/4; int shortHeight = heightPer - 2*shortOff; int tallStart, tallEnd, shortStart, shortEnd; boolean isFull = (vis == tvFull); double scale = scaleForPixels(width); memset(colorBin, 0, MAXPIXELS * sizeof(colorBin[0])); if (vis == tvDense) { slSort(&tg->items, cmpLfsWhiteToBlack); } for (cds = tg->items; cds != NULL; cds = cds->next) { - int wTall, wShort, end, start, blocks; + int end, start, blocks; for (blocks = 0; blocks < cds->ssCount; blocks++) { tallStart = cds->largeStarts[blocks]; tallEnd = cds->largeEnds[blocks]; shortStart = cds->smallStarts[blocks]; shortEnd = cds->smallEnds[blocks]; - wTall = tallEnd - tallStart; - wShort = shortEnd - shortStart; if (shortStart < tallStart) { end = tallStart; drawScaledBoxSample(hvg, shortStart, end, scale, xOff, y+shortOff, shortHeight, color , cds->score); } if (shortEnd > tallEnd) { start = tallEnd; drawScaledBoxSample(hvg, start, shortEnd, scale, xOff, y+shortOff, shortHeight, color , cds->score); } if (tallEnd > tallStart) { drawScaledBoxSample(hvg, tallStart, tallEnd, scale, xOff, y, heightPer, color, cds->score); } @@ -11551,31 +11549,30 @@ slReverse(&list); tg->items = list; } static void omimGene2Load(struct track *tg) /* Load and filter omimGene2 items, storing long label from omimGene2DisorderList. */ { bedPlusLabelLoad(tg, omimGene2DisorderList); omimFilter(tg); } Color omimGene2Color(struct track *tg, void *item, struct hvGfx *hvg) /* set the color for omimLocation track items */ { struct bed *el = item; -char *omimId; char *phenClass; char query[256]; struct sqlResult *sr; char **row; struct rgbColor *normal = &(tg->color); struct rgbColor lighter; struct rgbColor lightest; Color class1Clr, class2Clr, class3Clr, class4Clr, classOtherClr; /* color scheme: Lighter Green: for Class 1 OMIM records @@ -11611,31 +11608,30 @@ omimPhenotypeClassColName, el->name, omimPhenotypeClassColName); sr = sqlMustGetResult(conn, query); row = sqlNextRow(sr); hFreeConn(&conn); if (row == NULL) { // set to gray if this entry does not have any disorder info sqlFreeResult(&sr); return classOtherClr; } else { - omimId = row[0]; phenClass = row[1]; if (sameWord(phenClass, "3")) { // set to dark green, the same color as omimGene2 track sqlFreeResult(&sr); return class3Clr; } else if (sameWord(phenClass, "2")) { // set to light green for class 2 sqlFreeResult(&sr); return class2Clr; } else if (sameWord(phenClass, "1")) @@ -11890,31 +11886,30 @@ omimLocationBuffer[0] = '\0'; conn = hAllocConn(database); sqlSafef(query,sizeof(query), "select concat(title1, ' ', title2) from omimGeneMap where omimId=%s", name); (void)sqlQuickQuery(conn, query, omimLocationBuffer, sizeof(omimLocationBuffer)); hFreeConn(&conn); return(omimLocationBuffer); } Color omimLocationColor(struct track *tg, void *item, struct hvGfx *hvg) /* set the color for omimLocation track items */ { struct bed *el = item; -char *omimId; char *phenClass; char query[256]; struct sqlResult *sr; char **row; struct rgbColor *normal = &(tg->color); struct rgbColor lighter; struct rgbColor lightest; Color class1Clr, class2Clr, class3Clr, class4Clr, classOtherClr; /* color scheme: Lighter Green: for Class 1 OMIM records @@ -11947,31 +11942,30 @@ sqlSafef(query, sizeof(query), "select omimId, %s from omimPhenotype where omimId=%s", omimPhenotypeClassColName, el->name); sr = sqlMustGetResult(conn, query); row = sqlNextRow(sr); hFreeConn(&conn); if (row == NULL) { // set to gray if this entry does not have any disorder info sqlFreeResult(&sr); return classOtherClr; } else { - omimId = row[0]; phenClass = row[1]; if (sameWord(phenClass, "3")) { // set to dark green, the same color as omimGene2 track sqlFreeResult(&sr); return class3Clr; } else { if (sameWord(phenClass, "2")) { // set to light green for class 2 sqlFreeResult(&sr); return class2Clr;