Merge pull request #414 from jmarshall/kf_for-type

lh3 · web-flow · commit 93aedcd2e718 · 2025-03-21T13:49:36.000-04:00
Fix `kt_for()` declaration parameter types
diff --git a/bwamem.c b/bwamem.c
@@ -1200,7 +1200,7 @@ typedef struct {
 	int64_t n_processed;
 } worker_t;
 
-static void worker1(void *data, int i, int tid)
+static void worker1(void *data, long i, int tid)
 {
 	worker_t *w = (worker_t*)data;
 	if (!(w->opt->flag&MEM_F_PE)) {
@@ -1214,7 +1214,7 @@ static void worker1(void *data, int i, int tid)
 	}
 }
 
-static void worker2(void *data, int i, int tid)
+static void worker2(void *data, long i, int tid)
 {
 	extern int mem_sam_pe(const mem_opt_t *opt, const bntseq_t *bns, const uint8_t *pac, const mem_pestat_t pes[4], uint64_t id, bseq1_t s[2], mem_alnreg_v a[2]);
 	extern void mem_reg2ovlp(const mem_opt_t *opt, const bntseq_t *bns, const uint8_t *pac, bseq1_t *s, mem_alnreg_v *a);
@@ -1234,7 +1234,7 @@ static void worker2(void *data, int i, int tid)
 
 void mem_process_seqs(const mem_opt_t *opt, const bwt_t *bwt, const bntseq_t *bns, const uint8_t *pac, int64_t n_processed, int n, bseq1_t *seqs, const mem_pestat_t *pes0)
 {
-	extern void kt_for(int n_threads, void (*func)(void*,int,int), void *data, int n);
+	extern void kt_for(int n_threads, void (*func)(void*,long,int), void *data, long n);
 	worker_t w;
 	mem_pestat_t pes[4];
 	double ctime, rtime;

Original file line number	Diff line number	Diff line change
`@@ -1200,7 +1200,7 @@ typedef struct {`
`1200`	`1200`	`int64_t n_processed;`
`1201`	`1201`	`} worker_t;`
`1202`	`1202`
`1203`		`-static void worker1(void *data, int i, int tid)`
	`1203`	`+static void worker1(void *data, long i, int tid)`
`1204`	`1204`	`{`
`1205`	`1205`	`worker_t w = (worker_t)data;`
`1206`	`1206`	`if (!(w->opt->flag&MEM_F_PE)) {`
`@@ -1214,7 +1214,7 @@ static void worker1(void *data, int i, int tid)`
`1214`	`1214`	`}`
`1215`	`1215`	`}`
`1216`	`1216`
`1217`		`-static void worker2(void *data, int i, int tid)`
	`1217`	`+static void worker2(void *data, long i, int tid)`
`1218`	`1218`	`{`
`1219`	`1219`	`extern int mem_sam_pe(const mem_opt_t opt, const bntseq_t bns, const uint8_t *pac, const mem_pestat_t pes[4], uint64_t id, bseq1_t s[2], mem_alnreg_v a[2]);`
`1220`	`1220`	`extern void mem_reg2ovlp(const mem_opt_t opt, const bntseq_t bns, const uint8_t pac, bseq1_t s, mem_alnreg_v *a);`
`@@ -1234,7 +1234,7 @@ static void worker2(void *data, int i, int tid)`
`1234`	`1234`
`1235`	`1235`	`void mem_process_seqs(const mem_opt_t opt, const bwt_t bwt, const bntseq_t bns, const uint8_t pac, int64_t n_processed, int n, bseq1_t seqs, const mem_pestat_t pes0)`
`1236`	`1236`	`{`
`1237`		`- extern void kt_for(int n_threads, void (func)(void,int,int), void *data, int n);`
	`1237`	`+ extern void kt_for(int n_threads, void (func)(void,long,int), void *data, long n);`
`1238`	`1238`	`worker_t w;`
`1239`	`1239`	`mem_pestat_t pes[4];`
`1240`	`1240`	`double ctime, rtime;`