577c7537344e58f1538843f38e084f6e175b5ca3 markd Wed Apr 29 11:34:27 2020 -0700 fix warning: suggest parentheses around ‘&&’ within ‘||’ [-Werror=parentheses] diff --git src/hg/hgTracks/bigBedTrack.c src/hg/hgTracks/bigBedTrack.c index 8130474..7a2b3a1 100644 --- src/hg/hgTracks/bigBedTrack.c +++ src/hg/hgTracks/bigBedTrack.c @@ -144,32 +144,32 @@ return filter; } struct bigBedFilter *bigBedMakeFilterBy(struct cart *cart, struct bbiFile *bbi, struct trackDb *tdb, char *field, struct slName *choices) /* Add a bigBed filter using a trackDb filterBy statement. */ { struct bigBedFilter *filter; char *setting = getFilterType(cart, tdb, field, FILTERBY_SINGLE); AllocVar(filter); filter->fieldNum = getFieldNum(bbi, field); if (setting && (sameString(setting, FILTERBY_SINGLE_LIST) || sameString(setting, FILTERBY_MULTIPLE_LIST_OR) || sameString(setting, FILTERBY_MULTIPLE_LIST_ONLY_OR))) filter->comparisonType = COMPARE_HASH_LIST_OR; -else if (setting && sameString(setting, FILTERBY_MULTIPLE_LIST_AND) - || sameString(setting, FILTERBY_MULTIPLE_LIST_ONLY_AND)) +else if (setting && (sameString(setting, FILTERBY_MULTIPLE_LIST_AND) + || sameString(setting, FILTERBY_MULTIPLE_LIST_ONLY_AND))) filter->comparisonType = COMPARE_HASH_LIST_AND; else filter->comparisonType = COMPARE_HASH; filter->valueHash = newHash(5); filter->numValuesInHash = slCount(choices); for(; choices; choices = choices->next) hashStore(filter->valueHash, choices->name); return filter; } struct bigBedFilter *bigBedBuildFilters(struct cart *cart, struct bbiFile *bbi, struct trackDb *tdb) /* Build all the numeric and filterBy filters for a bigBed */ {