X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bam.c;h=8b517565026f276d860f91634789ec8fa2f36195;hb=d0e30eec1158752010659982342a611fc91ae8e3;hp=837b956c8e879734550bdbb7b0dfeb034dcd91ad;hpb=bb9a8233e309f483c565dac4cb7193decdf324a5;p=samtools.git

diff --git a/bam.c b/bam.c
index 837b956..8b51756 100644
--- a/bam.c
+++ b/bam.c
@@ -5,6 +5,7 @@
 #include "bam.h"
 #include "bam_endian.h"
 #include "kstring.h"
+#include "sam_header.h"
 
 int bam_is_be = 0;
 char *bam_flag2char_table = "pPuUrR12sfd\0\0\0\0\0";
@@ -59,10 +60,9 @@ void bam_header_destroy(bam_header_t *header)
 		free(header->target_len);
 	}
 	free(header->text);
-#ifndef BAM_NO_HASH
-	if (header->rg2lib) bam_strmap_destroy(header->rg2lib);
+	if (header->dict) sam_header_free(header->dict);
+	if (header->rg2lib) sam_tbl_destroy(header->rg2lib);
 	bam_destroy_header_hash(header);
-#endif
 	free(header);
 }
 
@@ -291,3 +291,10 @@ void bam_view1(const bam_header_t *header, const bam1_t *b)
 	printf("%s\n", s);
 	free(s);
 }
+
+const char *bam_get_library(const bam_header_t *header, const bam1_t *b)
+{
+	const uint8_t *rg;
+	rg = bam_aux_get(b, "RG");
+	return (rg == 0)? 0 : sam_tbl_get(header->rg2lib, (const char*)(rg + 1));
+}