29356d0b9520b11bb46d22f5c70b8b1a275b5116 kent Tue Dec 27 12:06:35 2016 -0800 Removing bamChromInfo structure and the routines to free it. The routine that made it got deleted a while back for some reason, so I'm just tidying up. diff --git src/lib/bamFile.c src/lib/bamFile.c index c44dea1..a70dfc8 100644 --- src/lib/bamFile.c +++ src/lib/bamFile.c @@ -572,56 +572,30 @@ else if (type == 'c') { dyStringPrintf(dy, "%d", *s); ++s; } else if (type == 'S') { dyStringPrintf(dy, "%u", *(uint16_t*)s); s += 2; } else if (type == 's') { dyStringPrintf(dy, "%d", *(int16_t*)s); s += 2; } else if (type == 'I') { dyStringPrintf(dy, "%u", *(uint32_t*)s); s += 4; } else if (type == 'i') { dyStringPrintf(dy, "%d", *(int32_t*)s); s += 4; } else if (type == 'f') { dyStringPrintf(dy, "%g", *(float*)s); s += 4; } else if (type == 'd') { dyStringPrintf(dy, "%lg", *(double*)s); s += 8; } else if (type == 'Z' || type == 'H') { dyStringAppend(dy, (char *)s); s += strlen((char *)s) + 1; } } } - - -static void bamChromInfoFree(struct bamChromInfo **pInfo) -/* Free up one chromInfo */ -{ -struct bamChromInfo *info = *pInfo; -if (info != NULL) - { - freeMem(info->name); - freez(pInfo); - } -} - -void bamChromInfoFreeList(struct bamChromInfo **pList) -/* Free a list of dynamically allocated bamChromInfo's */ -{ -struct bamChromInfo *el, *next; - -for (el = *pList; el != NULL; el = next) - { - next = el->next; - bamChromInfoFree(&el); - } -*pList = NULL; -} - struct psl *bamToPslUnscored(const bam1_t *bam, const bam_hdr_t *hdr) /* Translate BAM's numeric CIGAR encoding into PSL sufficient for cds.c (just coords, * no scoring info) */ { const bam1_core_t *core = &bam->core; struct psl *psl; AllocVar(psl); boolean isRc = (core->flag & BAM_FREVERSE); psl->strand[0] = isRc ? '-' : '+'; psl->qName = cloneString(bam1_qname(bam)); psl->tName = cloneString(hdr->target_name[core->tid]); unsigned blockCount = 0; unsigned *blockSizes, *qStarts, *tStarts; AllocArray(blockSizes, core->n_cigar); AllocArray(qStarts, core->n_cigar);