4d4c0c47811a5c33fec75e98a44fc185f09941d4 hiram Thu Nov 21 13:57:01 2013 -0800 there is a macro INLINE for static inline refs #12189 diff --git src/lib/vcf.c src/lib/vcf.c index dd1c443..b2eaed7 100644 --- src/lib/vcf.c +++ src/lib/vcf.c @@ -178,43 +178,43 @@ sprintf(formatPlus, "%s:%d: %s", vcff->lf->fileName, vcff->lf->lineIx, format); else strcpy(formatPlus, format); vaWarn(formatPlus, args); va_end(args); if (vcfFileStopDueToErrors(vcff)) errAbort("VCF: %d parser errors, quitting", vcff->errCnt); } static void *vcfFileAlloc(struct vcfFile *vcff, size_t size) /* Use vcff's local mem to allocate memory. */ { return lmAlloc( vcfFileLm(vcff), size); } -static inline char *vcfFileCloneStrZ(struct vcfFile *vcff, char *str, size_t size) +INLINE char *vcfFileCloneStrZ(struct vcfFile *vcff, char *str, size_t size) /* Use vcff's local mem to allocate memory for a string and copy it. */ { return lmCloneStringZ( vcfFileLm(vcff), str, size); } -static inline char *vcfFileCloneStr(struct vcfFile *vcff, char *str) +INLINE char *vcfFileCloneStr(struct vcfFile *vcff, char *str) /* Use vcff's local mem to allocate memory for a string and copy it. */ { return vcfFileCloneStrZ(vcff, str, strlen(str)); } -static inline char *vcfFileCloneSubstr(struct vcfFile *vcff, char *line, regmatch_t substr) +INLINE char *vcfFileCloneSubstr(struct vcfFile *vcff, char *line, regmatch_t substr) /* Allocate memory for and copy a substring of line. */ { return vcfFileCloneStrZ(vcff, line+substr.rm_so, (substr.rm_eo - substr.rm_so)); } #define vcfFileCloneVar(vcff, var) lmCloneMem( vcfFileLm(vcff), var, sizeof(var)) char *vcfFilePooledStr(struct vcfFile *vcff, char *str) /* Allocate memory for a string from vcff's shared string pool. */ { return hashStoreName(vcff->pool, str); // Always stored in main pool, not reuse pool } static enum vcfInfoType vcfInfoTypeFromSubstr(struct vcfFile *vcff, char *line, regmatch_t substr) /* Translate substring of line into vcfInfoType or complain. */