e2ff040d76c018b4207c9eb819c898b0fde42dbf kent Mon Dec 2 16:17:28 2013 -0800 Removing lineFileNextRealWithSize - it was buggy and hard to fix in general case, and only one module was using it. Replaced it with something local to fastqStatsAndSubsample.c. diff --git src/inc/linefile.h src/inc/linefile.h index 30f4818..1f28171 100644 --- src/inc/linefile.h +++ src/inc/linefile.h @@ -103,34 +103,30 @@ /* Close up a list of line files. */ boolean lineFileNext(struct lineFile *lf, char **retStart, int *retSize); /* Fetch next line from file. */ boolean lineFileNextFull(struct lineFile *lf, char **retFull, int *retFullSize, char **retRaw, int *retRawSize); // Fetch next line from file joining up any that are continued by ending '\' // If requested, and was joined, the unjoined raw lines are also returned // NOTE: comment lines can't be continued! ("# comment \ \n more comment" is 2 lines.) boolean lineFileNextReal(struct lineFile *lf, char **retStart); /* Fetch next line from file that is not blank and * does not start with a '#'. */ -boolean lineFileNextRealWithSize(struct lineFile *lf, char **retStart, int *retSize); -/* Fetch next line from file that is not blank and - * does not start with a '#'. Return size of line. */ - boolean lineFileNextFullReal(struct lineFile *lf, char **retStart); // Fetch next line from file that is not blank and does not start with a '#'. // Continuation lines (ending in '\') are joined into a single line. void lineFileNeedNext(struct lineFile *lf, char **retStart, int *retSize); /* Fetch next line from file. Squawk and die if it's not there. */ void lineFileReuse(struct lineFile *lf); /* Reuse current line. */ void lineFileReuseFull(struct lineFile *lf); // Reuse last full line read. Unlike lineFileReuse, // lineFileReuseFull only works with previous lineFileNextFull call #define lineFileString(lf) ((lf)->buf + (lf)->lineStart)