84f9843f1c767648dde8a3afafa8762c21b6a0cc angie Tue Mar 22 10:57:28 2011 -0700 Code review feedback from Mark: use MayOpen naming convention, solineFileOnTabix -> lineFileTabixMayOpen. I still can't bring myself to remove the calls to warn, because I want the CGIs to get those using the webAbort error handlers in conjunction w/errCatch etc. There are tons of calls to warn() in our lib code, which can be redirected using the errAbort handler stack if desired. diff --git src/inc/linefile.h src/inc/linefile.h index 62ccc3a..e6bbc9b 100644 --- src/inc/linefile.h +++ src/inc/linefile.h @@ -210,29 +210,29 @@ void lineFileSetUniqueMetaData(struct lineFile *lf); /* suppress duplicate lines in metadata */ void lineFileRemoveInitialCustomTrackLines(struct lineFile *lf); /* remove initial browser and track lines */ /*----- Optionally-compiled wrapper on tabix (compression + indexing): -----*/ #define COMPILE_WITH_TABIX "%s: Sorry, this functionality is available only when\n" \ "you have installed the tabix library from\n" \ "http://samtools.sourceforge.net/ and rebuilt kent/src with USE_TABIX=1\n" \ "(see http://genomewiki.ucsc.edu/index.php/Build_Environment_Variables)." -struct lineFile *lineFileOnTabix(char *fileOrUrl, bool zTerm); +struct lineFile *lineFileTabixMayOpen(char *fileOrUrl, bool zTerm); /* Wrap a line file around a data file that has been compressed and indexed * by the tabix command line program. The index file <fileName>.tbi must be * readable in addition to fileName. If there's a problem, warn & return NULL. * This works only if kent/src has been compiled with USE_TABIX=1 and linked * with the tabix C library. */ boolean lineFileSetTabixRegion(struct lineFile *lf, char *seqName, int start, int end); -/* Assuming lf was created by lineFileOnTabix, tell tabix to seek to the specified region +/* Assuming lf was created by lineFileTabixMayOpen, tell tabix to seek to the specified region * and return TRUE (or if there are no items in region, return FALSE). */ #endif /* LINEFILE_H */