X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bam.h;h=c0bde4b9374e742ddda46dcc9474e78d4a2c1d45;hb=7bd63d5c2677364126702d76c56e4d75981c62f4;hp=76f3e0f99f783a1779df83fc4b1be7c88ec6aaf8;hpb=f3f36d07ad46e302dd772121dd644dc408aebb88;p=samtools.git

diff --git a/bam.h b/bam.h
index 76f3e0f..c0bde4b 100644
--- a/bam.h
+++ b/bam.h
@@ -401,8 +401,8 @@ extern "C" {
 	  @abstract  Free the memory allocated for an alignment.
 	  @param  b  pointer to an alignment
 	 */
-#define bam_destroy1(b) do {											\
-		if ((b)->hash) bam_aux_destroy(b); free((b)->data); free(b);	\
+#define bam_destroy1(b) do {						\
+		if ((b)->hash) free((b)->data); free(b);	\
 	} while (0)
 
 	/*!
@@ -600,11 +600,12 @@ extern "C" {
 	 */
 	void bam_parse_region(bam_header_t *header, const char *str, int *ref_id, int *begin, int *end);
 
-	int32_t bam_aux_geti(bam1_t *b, const char tag[2], int *err);
-	float bam_aux_getf(bam1_t *b, const char tag[2], int *err);
-	char bam_aux_getc(bam1_t *b, const char tag[2], int *err);
-	char *bam_aux_getZH(bam1_t *b, const char tag[2], int *err);
-	void bam_aux_destroy(bam1_t *b);
+	uint8_t *bam_aux_get(bam1_t *b, const char tag[2]);
+	int32_t bam_aux2i(const uint8_t *s);
+	float bam_aux2f(const uint8_t *s);
+	double bam_aux2d(const uint8_t *s);
+	char bam_aux2A(const uint8_t *s);
+	char *bam_aux2Z(const uint8_t *s);
 
 	/*!  
 	  @abstract Calculate the rightmost coordinate of an alignment on the