1cc8c6d3d7f2357898ad366c94b1f33a403a2aee angie Thu Dec 8 14:14:33 2016 -0800 Libifying isAllDigits from a handful of places into common.c. diff --git src/lib/annoStreamTab.c src/lib/annoStreamTab.c index d1f8675..0888834 100644 --- src/lib/annoStreamTab.c +++ src/lib/annoStreamTab.c @@ -70,35 +70,30 @@ lineFileClose(&(self->lf)); self->lf = astLFOpen(self->fileOrUrl); self->eof = FALSE; } } static void reuseRow(struct annoStreamTab *self) // When a row falls after the region, undo the damage of lineFileChopNext, // tell lf to reuse the line, and set EOF - we are all done until & unless the region changes. { unChop(self->asWords, self->streamer.numCols); lineFileReuse(self->lf); self->eof = TRUE; } -INLINE boolean isAllDigits(char *s) -{ -return (isNotEmpty(s) && countLeadingDigits(s) == strlen(s)); -} - static void checkWordCountAndBin(struct annoStreamTab *self, int wordCount) /* Auto-detect initial bin column and set self->omitBin if autoSql doesn't have bin. */ { if (wordCount == self->streamer.numCols + 1 && isAllDigits(self->asWords[0])) { self->fileWordCount = self->streamer.numCols + 1; char *asFirstColumnName = self->streamer.asObj->columnList->name; if (!sameString(asFirstColumnName, "bin")) self->omitBin = 1; } else self->fileWordCount = self->streamer.numCols; }