53520dd65ad69639e8bd84b3a328d3048c6415f5 angie Wed Jan 1 14:19:07 2014 -0800 Oops, forgot to add stub for bamFileAndIndexMustExist to the #else (no USE_BAM) part of bamFile.cfixes #12401 diff --git src/lib/bamFile.c src/lib/bamFile.c index 6dd3ae5..b3fcffe 100644 --- src/lib/bamFile.c +++ src/lib/bamFile.c @@ -577,30 +577,37 @@ FILE *f = mustOpen(bedOut, "w"); samToOpenBed(samIn, f); carefulClose(&f); } #else // If we're not compiling with samtools, make stub routines so compile won't fail: boolean bamFileExists(char *bamFileName) /* Return TRUE if we can successfully open the bam file and its index file. */ { warn(COMPILE_WITH_SAMTOOLS, "bamFileExists"); return FALSE; } +void bamFileAndIndexMustExist(char *fileOrUrl) +/* Open both a bam file and its accompanying index or errAbort; this is what it + * takes for diagnostic info to propagate up through errCatches in calling code. */ +{ +warn(COMPILE_WITH_SAMTOOLS, "bamFileAndIndexMustExist"); +} + samfile_t *bamOpen(char *fileOrUrl, char **retBamFileName) /* Return an open bam file */ { warn(COMPILE_WITH_SAMTOOLS, "bamOpen"); return FALSE; } void bamClose(samfile_t **pSamFile) /* Close down a samefile_t */ { errAbort(COMPILE_WITH_SAMTOOLS, "bamClose"); } void bamFetch(char *fileOrUrl, char *position, bam_fetch_f callbackFunc, void *callbackData, samfile_t **pSamFile)