X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bam_plcmd.c;h=d1ea03f896e9ad433c95d33ba1dfe88ad2354aae;hb=a958954399757774ee26bfcf0b5b95e9ec9b62f4;hp=d34cd267a9edd363a32605c083fefe5ba512e8bb;hpb=4967051aa734ece6ce44f0fb891a936e849c2fe2;p=samtools.git

diff --git a/bam_plcmd.c b/bam_plcmd.c
index d34cd26..d1ea03f 100644
--- a/bam_plcmd.c
+++ b/bam_plcmd.c
@@ -453,13 +453,13 @@ typedef struct {
 
 typedef struct {
 	bamFile fp;
-	bam_iterf_t iter;
+	bam_iter_t iter;
 } mplp_aux_t;
 
 static int mplp_func(void *data, bam1_t *b)
 {
 	mplp_aux_t *ma = (mplp_aux_t*)data;
-	if (ma->iter) return bam_iterf_read(ma->fp, ma->iter, b);
+	if (ma->iter) return bam_iter_read(ma->fp, ma->iter, b);
 	return bam_read1(ma->fp, b);
 }
 
@@ -494,7 +494,7 @@ static int mpileup(mplp_conf_t *conf, int n, char **fn)
 				exit(1);
 			}
 			if (i == 0) beg0 = beg, end0 = end;
-			data[i]->iter = bam_iterf_query(idx, tid, beg, end);
+			data[i]->iter = bam_iter_query(idx, tid, beg, end);
 			bam_index_destroy(idx);
 		}
 		if (i == 0) h = h_tmp;
@@ -536,7 +536,7 @@ static int mpileup(mplp_conf_t *conf, int n, char **fn)
 	bam_header_destroy(h);
 	for (i = 0; i < n; ++i) {
 		bam_close(data[i]->fp);
-		if (data[i]->iter) bam_iterf_destroy(data[i]->iter);
+		if (data[i]->iter) bam_iter_destroy(data[i]->iter);
 		free(data[i]);
 	}
 	free(data); free(plp); free(ref); free(n_plp);