13b4184b2e434953f411f20dd87104f99b550275 hiram Fri Oct 2 11:53:27 2015 -0700 fixup gcc warnings for -Wunused-but-set-variable refs #16121 diff --git src/hg/lib/hui.c src/hg/lib/hui.c index 14e707f..f49e942 100644 --- src/hg/lib/hui.c +++ src/hg/lib/hui.c @@ -4273,41 +4273,40 @@ } static void printSubtrackTableBody(struct trackDb *parentTdb, struct slRef *subtrackRefList, struct subtrackConfigSettings *settings, struct cart *cart) /* Print list of subtracks */ { sortOrder_t *sortOrder = settings->sortOrder; boolean useDragAndDrop = settings->useDragAndDrop; boolean restrictions = settings->restrictions; struct dyString *dyHtml = newDyString(SMALLBUF); char buffer[SMALLBUF]; char *db = cartString(cart, "db"); // The subtracks need to be sorted by priority but only sortable and dragable will have // non-default (cart) priorities to sort on -boolean preSorted = FALSE; if (sortOrder != NULL || useDragAndDrop) { - // preserves user's prev sort/drags - preSorted = tdbRefSortPrioritiesFromCart(cart, &subtrackRefList); + // preserves user's prev sort/drags, ignore returned value about where + // priorities come from + (void) tdbRefSortPrioritiesFromCart(cart, &subtrackRefList); printf("<TBODY class='%saltColors'>\n", (sortOrder != NULL ? "sortable " : "") ); } else { slSort(&subtrackRefList, trackDbRefCmp); // straight from trackDb.ra - preSorted = TRUE; puts("<TBODY>"); } // Finally the big "for loop" to list each subtrack as a table row. printf("\n<!-- ----- subtracks list ----- -->\n"); membersForAll_t* membersForAll = membersForAllSubGroupsGet(parentTdb,NULL); struct hash *vocabHash = vocabBasicFromSetting(parentTdb, cart); struct slRef *subtrackRef; /* Color handling ?? */ //char *colors[2] = { COLOR_BG_DEFAULT, // COLOR_BG_ALTDEFAULT }; char *colors[2] = { "bgLevel1", "bgLevel1" }; int colorIx = settings->bgColorIx; @@ -5660,37 +5659,36 @@ puts(" <B> Show only items in top-scoring </B>"); cgiMakeIntVarWithLimits(option,atoi(scoreFilterCt),"Top-scoring count",0,1,100000); //* Only check size of table if track does not have subtracks */ if ( !parentLevel && hTableExists(db, tdb->table)) printf(" (range: 1 to 100,000 total items: %d)\n",getTableSize(db, tdb->table)); else printf(" (range: 1 to 100,000)\n"); } } cfgEndBox(boxed); } // Moved from hgTrackUi for consistency static void filterByChromCfgUi(struct cart *cart, struct trackDb *tdb) { -char *filterSetting; char filterVar[256]; char *filterVal = ""; printf("<p><b>Filter by chromosome (e.g. chr10):</b> "); safef(filterVar, sizeof(filterVar), "%s.chromFilter", tdb->track); -filterSetting = cartUsualString(cart, filterVar, filterVal); +(void) cartUsualString(cart, filterVar, filterVal); // ignore returned setting cgiMakeTextVar(filterVar, cartUsualString(cart, filterVar, ""), 15); } // Moved from hgTrackUi for consistency void crossSpeciesCfgUi(struct cart *cart, struct trackDb *tdb) // Put up UI for selecting rainbow chromosome color or intensity score. { char colorVar[256]; char *colorSetting; // initial value of chromosome coloring option is "on", unless // overridden by the colorChromDefault setting in the track char *colorDefault = trackDbSettingOrDefault(tdb, "colorChromDefault", "on"); printf("<p><b>Color track based on chromosome:</b> "); safef(colorVar, sizeof(colorVar), "%s.color", tdb->track); @@ -6392,49 +6390,42 @@ *label = tolower(*label); printf("%s<BR>", label); puts("</TD>"); lineBreakJustPrinted = FALSE; j++; } } puts("</TR></TABLE><BR>\n"); return wmSpeciesList; } void wigMafCfgUi(struct cart *cart, struct trackDb *tdb,char *name, char *title, boolean boxed, char *db) /* UI for maf/wiggle track * NOTE: calls wigCfgUi */ { -bool lowerFirstChar = TRUE; int i; char option[MAX_SP_SIZE]; boolean parentLevel = isNameAtParentLevel(tdb,name); boxed = cfgBeginBoxAndTitle(tdb, boxed, title); char *defaultCodonSpecies = trackDbSetting(tdb, SPECIES_CODON_DEFAULT); char *framesTable = trackDbSetting(tdb, "frames"); char *snpTable = trackDbSetting(tdb, "snpTable"); -char *firstCase = trackDbSetting(tdb, ITEM_FIRST_CHAR_CASE); -if (firstCase != NULL) - { - if (sameWord(firstCase, "noChange")) lowerFirstChar = FALSE; - } char *treeImage = NULL; struct consWiggle *consWig, *consWiggles = wigMafWiggles(db, tdb); - boolean isWigMafProt = FALSE; if (strstr(tdb->type, "wigMafProt")) isWigMafProt = TRUE; puts("<TABLE><TR><TD VALIGN=\"TOP\">"); if (consWiggles && consWiggles->next) { /* check for alternate conservation wiggles -- create checkboxes */ puts("<P STYLE=\"margin-top:10;\"><B>Conservation:</B>" ); boolean first = TRUE; for (consWig = consWiggles; consWig != NULL; consWig = consWig->next) { char *wigVarSuffix = NULL; char *wigVar = wigMafWiggleVar(name, consWig, &wigVarSuffix);