8cec4ba176d633ac375b32125ccebc9a3bdb883f tdreszer Fri Apr 15 22:52:50 2011 -0700 Checked in minor changes from Jim's review. Only think of consequence here is the dyStringLen macro had been using strlen, when the stringSize is part of the structure diff --git src/inc/linefile.h src/inc/linefile.h index 0a593fd..9760691 100644 --- src/inc/linefile.h +++ src/inc/linefile.h @@ -43,31 +43,31 @@ int lineStart; /* Offset of line in buffer. */ int lineEnd; /* End of line in buffer. */ bool zTerm; /* Replace '\n' with zero? */ enum nlType nlType; /* type of line endings: dos, unix, mac or undet */ bool reuse; /* Set if reusing input. */ char *buf; /* Buffer. */ struct pipeline *pl; /* pipeline if reading compressed */ struct metaOutput *metaOutput; /* list of FILE handles to write metaData to */ bool isMetaUnique; /* if set, do not repeat comments in output */ struct hash *metaLines; /* save lines to suppress repetition */ #ifdef USE_TABIX tabix_t *tabix; /* A tabix-compressed file and its binary index file (.tbi) */ ti_iter_t tabixIter; /* An iterator to get decompressed indexed lines of text */ #endif struct dyString *fullLine; // Filled with full line when a lineFileNextFull is called - boolean fullLineResuse; // If TRUE, next call to lineFileNextFull will get already built fullLine + boolean fullLineReuse; // If TRUE, next call to lineFileNextFull will get already built fullLine }; char *getFileNameFromHdrSig(char *m); /* Check if header has signature of supported compression stream, and return a phoney filename for it, or NULL if no sig found. */ struct lineFile *lineFileDecompressFd(char *name, bool zTerm, int fd); /* open a linefile with decompression from a file or socket descriptor */ struct lineFile *lineFileDecompressMem(bool zTerm, char *mem, long size); /* open a linefile with decompression from a memory stream */ struct lineFile *lineFileMayOpen(char *fileName, bool zTerm); /* Try and open up a lineFile. If fileName ends in .gz, .Z, or .bz2, * it will be read from a decompress pipeline. */