Fix warnings

benjeffery · benjeffery · commit 24cf27a8bc61 · 2025-10-16T04:34:21.000+01:00
diff --git a/c/tskit/genotypes.c b/c/tskit/genotypes.c
@@ -212,7 +212,7 @@ tsk_haplotype_build_mutation_index(tsk_haplotype_t *self)
     }
     self->node_mutation_offsets[0] = 0;
     for (j = 0; j < self->num_nodes; j++) {
-        total_mutations += counts[j];
+        total_mutations += (tsk_size_t) counts[j];
         if (total_mutations > INT32_MAX) {
             ret = tsk_trace_error(TSK_ERR_UNSUPPORTED_OPERATION);
             goto out;
@@ -281,7 +281,7 @@ tsk_haplotype_build_ancestral_states(tsk_haplotype_t *self)
     }
 
     self->ancestral_states
-        = tsk_malloc(self->num_sites * sizeof(*self->ancestral_states));
+        = tsk_malloc((tsk_size_t) self->num_sites * sizeof(*self->ancestral_states));
     if (self->ancestral_states == NULL) {
         return tsk_trace_error(TSK_ERR_NO_MEMORY);
     }

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ tsk_haplotype_build_mutation_index(tsk_haplotype_t *self)`
`212`	`212`	`}`
`213`	`213`	`self->node_mutation_offsets[0] = 0;`
`214`	`214`	`for (j = 0; j < self->num_nodes; j++) {`
`215`		`- total_mutations += counts[j];`
	`215`	`+ total_mutations += (tsk_size_t) counts[j];`
`216`	`216`	`if (total_mutations > INT32_MAX) {`
`217`	`217`	`ret = tsk_trace_error(TSK_ERR_UNSUPPORTED_OPERATION);`
`218`	`218`	`goto out;`
`@@ -281,7 +281,7 @@ tsk_haplotype_build_ancestral_states(tsk_haplotype_t *self)`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`self->ancestral_states`
`284`		`- = tsk_malloc(self->num_sites * sizeof(*self->ancestral_states));`
	`284`	`+ = tsk_malloc((tsk_size_t) self->num_sites * sizeof(*self->ancestral_states));`
`285`	`285`	`if (self->ancestral_states == NULL) {`
`286`	`286`	`return tsk_trace_error(TSK_ERR_NO_MEMORY);`
`287`	`287`	`}`