554ac74cd549839f4e59820fe66bde5a7b73e981 hiram Thu Oct 15 15:35:06 2015 -0700 fixup gcc warnings for -Wunused-but-set-variable refs #16121 diff --git src/hg/hgTables/joining.c src/hg/hgTables/joining.c index 772439e..9b86475 100644 --- src/hg/hgTables/joining.c +++ src/hg/hgTables/joining.c @@ -96,34 +96,33 @@ s = s->next; } } } fprintf(f, "\n"); ++outCount; } } } static struct joinedTables *joinedTablesNew(int fieldCount, int keyCount, int maxRowCount) /* Make up new empty joinedTables. */ { struct joinedTables *jt; -struct lm *lm; AllocVar(jt); -lm = jt->lm = lmInit(64*1024); +jt->lm = lmInit(64*1024); jt->fieldCount = fieldCount; jt->keyCount = keyCount; jt->maxRowCount = maxRowCount; return jt; } static void joinedTablesFree(struct joinedTables **pJt) /* Free up joinable table and associated rows. */ { struct joinedTables *jt = *pJt; if (jt != NULL) { lmCleanup(&jt->lm); joinerDtfFreeList(&jt->fieldList); joinerDtfFreeList(&jt->keyList); @@ -556,37 +555,38 @@ struct joinedTables *joined, int fieldOffset, int keyOffset, char *idField, struct hash *idHash, struct slName *chopBefore, struct slName *chopAfter, struct tableJoiner *tj, boolean isPositional, boolean isFirst) /* Load up rows. */ { struct region *region; struct dyString *sqlFields = dyStringNew(0); struct joinerDtf *dtf; struct slRef *ref; struct joinerPair *jp; int fieldCount = 0, keyCount = 0; int idFieldIx = -1; struct sqlConnection *conn = hAllocConn(tj->database); char *identifierFilter = NULL; -char *filter; boolean needUpdateFilter = FALSE; struct joinedRow *jr; if (isFirst) identifierFilter = identifierWhereClause(idField, idHash); -filter = filterClause(tj->database, tj->table, regionList->chrom, identifierFilter); + +// ignore returned filter from this call to filterClause: +filterClause(tj->database, tj->table, regionList->chrom, identifierFilter); /* Record combined filter. */ // Show only the SQL filter built from filter page options, not identifierFilter, // because identifierFilter can get enormous (like 126kB for 12,500 rsIDs). char *filterNoIds = filterClause(tj->database, tj->table, regionList->chrom, NULL); if (filterNoIds != NULL) { if (joined->filter == NULL) joined->filter = dyStringNew(0); else dyStringAppend(joined->filter, " AND "); dyStringAppend(joined->filter, filterNoIds); if (!isFirst) { needUpdateFilter = TRUE;