Skip to content

Commit 5dbfdce

Browse files
jeromekelleherjeromekelleher
committed
Migrate to clang-format 21.1.8
1 parent dc394d7 commit 5dbfdce

10 files changed

Lines changed: 84 additions & 82 deletions

File tree

‎.github/workflows/tests.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ env:
1212
jobs:
1313
pre-commit:
1414
name: Lint
15-
uses: tskit-dev/.github/.github/workflows/lint.yml@v4
15+
uses: tskit-dev/.github/.github/workflows/lint.yml@v5
16+
with:
17+
clang-format-version: 21.1.8
1618

1719
packaging:
1820
name: Python packaging

‎c/tests/test_stats.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ verify_pair_coalescence_counts(tsk_treeseq_t *ts, tsk_flags_t options)
349349

350350
/* test various bin assignments */
351351
for (i = 0; i < N; i++) {
352-
node_bin_map[i] = ((tsk_id_t)(i % B));
352+
node_bin_map[i] = ((tsk_id_t) (i % B));
353353
}
354354
ret = tsk_treeseq_pair_coalescence_counts(ts, P, sample_set_sizes, sample_sets, I,
355355
index_tuples, T, breakpoints, B, node_bin_map, options, C_B);
@@ -439,7 +439,7 @@ verify_pair_coalescence_quantiles(tsk_treeseq_t *ts)
439439

440440
for (i = 0; i < N; i++) {
441441
node_bin_map_empty[i] = TSK_NULL;
442-
node_bin_map_shuff[i] = (tsk_id_t)(i % B);
442+
node_bin_map_shuff[i] = (tsk_id_t) (i % B);
443443
for (j = 0; j < B; j++) {
444444
if (nodes_time[i] >= epochs[j] && nodes_time[i] < epochs[j + 1]) {
445445
node_bin_map[i] = (tsk_id_t) j;
@@ -612,7 +612,7 @@ verify_pair_coalescence_rates(tsk_treeseq_t *ts)
612612
CU_ASSERT_EQUAL_FATAL(ret, TSK_ERR_BAD_NODE_BIN_MAP_DIM);
613613
node_bin_map[0] = 0;
614614

615-
node_bin_map[0] = (tsk_id_t)(B - 1);
615+
node_bin_map[0] = (tsk_id_t) (B - 1);
616616
ret = tsk_treeseq_pair_coalescence_rates(ts, P, sample_set_sizes, sample_sets, I,
617617
index_tuples, T, breakpoints, B, node_bin_map, epochs, 0, C);
618618
CU_ASSERT_EQUAL_FATAL(ret, TSK_ERR_BAD_NODE_TIME_WINDOW);
@@ -3154,14 +3154,14 @@ test_two_site_correlated_multiallelic(void)
31543154
num_sample_sets = 2;
31553155
tsk_memset(result, 0, sizeof(*result) * result_size);
31563156
ret = tsk_treeseq_r2_ij(&ts, num_sample_sets, sample_set_sizes, sample_sets, 1,
3157-
(tsk_id_t[2]){ 0, 0 }, num_sites, sites, NULL, num_sites, sites, NULL, 0,
3157+
(tsk_id_t[2]) { 0, 0 }, num_sites, sites, NULL, num_sites, sites, NULL, 0,
31583158
result);
31593159
CU_ASSERT_EQUAL_FATAL(ret, 0);
31603160
assert_arrays_almost_equal(result_size, result, truth_r2);
31613161

31623162
tsk_memset(result, 0, sizeof(*result) * result_size);
31633163
ret = tsk_treeseq_D2_ij(&ts, num_sample_sets, sample_set_sizes, sample_sets, 1,
3164-
(tsk_id_t[2]){ 0, 0 }, num_sites, sites, NULL, num_sites, sites, NULL, 0,
3164+
(tsk_id_t[2]) { 0, 0 }, num_sites, sites, NULL, num_sites, sites, NULL, 0,
31653165
result);
31663166
CU_ASSERT_EQUAL_FATAL(ret, 0);
31673167
assert_arrays_almost_equal(result_size, result, truth_D2);
@@ -3170,7 +3170,7 @@ test_two_site_correlated_multiallelic(void)
31703170
// population case
31713171
tsk_memset(result, 0, sizeof(*result) * result_size);
31723172
ret = tsk_treeseq_D2_ij_unbiased(&ts, num_sample_sets, sample_set_sizes, sample_sets,
3173-
1, (tsk_id_t[2]){ 0, 0 }, num_sites, sites, NULL, num_sites, sites, NULL, 0,
3173+
1, (tsk_id_t[2]) { 0, 0 }, num_sites, sites, NULL, num_sites, sites, NULL, 0,
31743174
result);
31753175
CU_ASSERT_EQUAL_FATAL(ret, 0);
31763176
assert_arrays_almost_equal(result_size, result, truth_D2_unbiased);
@@ -3180,7 +3180,7 @@ test_two_site_correlated_multiallelic(void)
31803180
sample_set_sizes[1] = 4;
31813181
tsk_memset(result, 0, sizeof(*result) * result_size);
31823182
ret = tsk_treeseq_D2_ij_unbiased(&ts, num_sample_sets, sample_set_sizes, sample_sets,
3183-
1, (tsk_id_t[2]){ 0, 1 }, num_sites, sites, NULL, num_sites, sites, NULL, 0,
3183+
1, (tsk_id_t[2]) { 0, 1 }, num_sites, sites, NULL, num_sites, sites, NULL, 0,
31843184
result);
31853185
CU_ASSERT_EQUAL_FATAL(ret, 0);
31863186
assert_arrays_almost_equal(result_size, result, truth_D2_unbiased_disjoint);
@@ -3347,14 +3347,14 @@ test_two_site_uncorrelated_multiallelic(void)
33473347
num_sample_sets = 2;
33483348
tsk_memset(result, 0, sizeof(*result) * result_size);
33493349
ret = tsk_treeseq_r2_ij(&ts, num_sample_sets, sample_set_sizes, sample_sets, 1,
3350-
(tsk_id_t[2]){ 0, 0 }, num_sites, sites, NULL, num_sites, sites, NULL, 0,
3350+
(tsk_id_t[2]) { 0, 0 }, num_sites, sites, NULL, num_sites, sites, NULL, 0,
33513351
result);
33523352
CU_ASSERT_EQUAL_FATAL(ret, 0);
33533353
assert_arrays_almost_equal(result_size, result, truth_r2);
33543354

33553355
tsk_memset(result, 0, sizeof(*result) * result_size);
33563356
ret = tsk_treeseq_D2_ij(&ts, num_sample_sets, sample_set_sizes, sample_sets, 1,
3357-
(tsk_id_t[2]){ 0, 0 }, num_sites, sites, NULL, num_sites, sites, NULL, 0,
3357+
(tsk_id_t[2]) { 0, 0 }, num_sites, sites, NULL, num_sites, sites, NULL, 0,
33583358
result);
33593359
CU_ASSERT_EQUAL_FATAL(ret, 0);
33603360
assert_arrays_almost_equal(result_size, result, truth_D2);
@@ -3363,7 +3363,7 @@ test_two_site_uncorrelated_multiallelic(void)
33633363
// population case
33643364
tsk_memset(result, 0, sizeof(*result) * result_size);
33653365
ret = tsk_treeseq_D2_ij_unbiased(&ts, num_sample_sets, sample_set_sizes, sample_sets,
3366-
1, (tsk_id_t[2]){ 0, 0 }, num_sites, sites, NULL, num_sites, sites, NULL, 0,
3366+
1, (tsk_id_t[2]) { 0, 0 }, num_sites, sites, NULL, num_sites, sites, NULL, 0,
33673367
result);
33683368
CU_ASSERT_EQUAL_FATAL(ret, 0);
33693369
assert_arrays_almost_equal(result_size, result, truth_D2_unbiased);
@@ -3373,7 +3373,7 @@ test_two_site_uncorrelated_multiallelic(void)
33733373
sample_set_sizes[1] = 4;
33743374
tsk_memset(result, 0, sizeof(*result) * result_size);
33753375
ret = tsk_treeseq_D2_ij_unbiased(&ts, num_sample_sets, sample_set_sizes, sample_sets,
3376-
1, (tsk_id_t[2]){ 0, 1 }, num_sites, sites, NULL, num_sites, sites, NULL, 0,
3376+
1, (tsk_id_t[2]) { 0, 1 }, num_sites, sites, NULL, num_sites, sites, NULL, 0,
33773377
result);
33783378
CU_ASSERT_EQUAL_FATAL(ret, 0);
33793379
assert_arrays_almost_equal(result_size, result, truth_D2_unbiased_disjoint);

‎c/tests/test_tables.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -864,7 +864,7 @@ test_table_collection_metadata(void)
864864
takeset_metadata = tsk_malloc(example_metadata_length * sizeof(char));
865865
CU_ASSERT_FATAL(takeset_metadata != NULL);
866866
memcpy(takeset_metadata, &example_metadata,
867-
(size_t)(example_metadata_length * sizeof(char)));
867+
(size_t) (example_metadata_length * sizeof(char)));
868868

869869
ret = tsk_table_collection_init(&tc1, 0);
870870
CU_ASSERT_EQUAL_FATAL(ret, 0);
@@ -982,7 +982,7 @@ test_node_table(void)
982982
CU_ASSERT_EQUAL(table.individual[j], j);
983983
CU_ASSERT_EQUAL(table.num_rows, (tsk_size_t) j + 1);
984984
CU_ASSERT_EQUAL(
985-
table.metadata_length, (tsk_size_t)(j + 1) * test_metadata_length);
985+
table.metadata_length, (tsk_size_t) (j + 1) * test_metadata_length);
986986
CU_ASSERT_EQUAL(table.metadata_offset[j + 1], table.metadata_length);
987987
/* check the metadata */
988988
tsk_memcpy(metadata_copy, table.metadata + table.metadata_offset[j],
@@ -1641,7 +1641,7 @@ test_edge_table_with_options(tsk_flags_t options)
16411641
CU_ASSERT_EQUAL(table.metadata_offset, NULL);
16421642
} else {
16431643
CU_ASSERT_EQUAL(
1644-
table.metadata_length, (tsk_size_t)(j + 1) * test_metadata_length);
1644+
table.metadata_length, (tsk_size_t) (j + 1) * test_metadata_length);
16451645
CU_ASSERT_EQUAL(table.metadata_offset[j + 1], table.metadata_length);
16461646
/* check the metadata */
16471647
tsk_memcpy(metadata_copy, table.metadata + table.metadata_offset[j],
@@ -4274,7 +4274,7 @@ test_migration_table(void)
42744274
CU_ASSERT_EQUAL(table.time[j], j);
42754275
CU_ASSERT_EQUAL(table.num_rows, (tsk_size_t) j + 1);
42764276
CU_ASSERT_EQUAL(
4277-
table.metadata_length, (tsk_size_t)(j + 1) * test_metadata_length);
4277+
table.metadata_length, (tsk_size_t) (j + 1) * test_metadata_length);
42784278
CU_ASSERT_EQUAL(table.metadata_offset[j + 1], table.metadata_length);
42794279
/* check the metadata */
42804280
tsk_memcpy(metadata_copy, table.metadata + table.metadata_offset[j],
@@ -4995,7 +4995,7 @@ test_individual_table(void)
49954995
table.location[spatial_dimension * (size_t) j + k], test_location[k]);
49964996
}
49974997
CU_ASSERT_EQUAL(
4998-
table.metadata_length, (tsk_size_t)(j + 1) * test_metadata_length);
4998+
table.metadata_length, (tsk_size_t) (j + 1) * test_metadata_length);
49994999
CU_ASSERT_EQUAL(table.metadata_offset[j + 1], table.metadata_length);
50005000
/* check the metadata */
50015001
tsk_memcpy(metadata_copy, table.metadata + table.metadata_offset[j],
@@ -5049,7 +5049,7 @@ test_individual_table(void)
50495049
flags = tsk_malloc(num_rows * sizeof(tsk_flags_t));
50505050
CU_ASSERT_FATAL(flags != NULL);
50515051
for (k = 0; k < num_rows; k++) {
5052-
flags[k] = (tsk_flags_t)(k + num_rows);
5052+
flags[k] = (tsk_flags_t) (k + num_rows);
50535053
}
50545054
location = tsk_malloc(spatial_dimension * num_rows * sizeof(double));
50555055
CU_ASSERT_FATAL(location != NULL);
@@ -5064,7 +5064,7 @@ test_individual_table(void)
50645064
parents = tsk_malloc(num_parents * num_rows * sizeof(tsk_id_t));
50655065
CU_ASSERT_FATAL(parents != NULL);
50665066
for (k = 0; k < num_parents * num_rows; k++) {
5067-
parents[k] = (tsk_id_t)(k + (num_rows * 4));
5067+
parents[k] = (tsk_id_t) (k + (num_rows * 4));
50685068
}
50695069
parents_offset = tsk_malloc((num_rows + 1) * sizeof(tsk_size_t));
50705070
CU_ASSERT_FATAL(parents_offset != NULL);
@@ -11805,9 +11805,9 @@ test_table_collection_takeset_indexes(void)
1180511805
rem = tsk_malloc(t1.edges.num_rows * sizeof(*rem));
1180611806
CU_ASSERT_FATAL(rem != NULL);
1180711807
memcpy(ins, t1.indexes.edge_insertion_order,
11808-
(size_t)(t1.edges.num_rows * sizeof(*ins)));
11808+
(size_t) (t1.edges.num_rows * sizeof(*ins)));
1180911809
memcpy(
11810-
rem, t1.indexes.edge_removal_order, (size_t)(t1.edges.num_rows * sizeof(*rem)));
11810+
rem, t1.indexes.edge_removal_order, (size_t) (t1.edges.num_rows * sizeof(*rem)));
1181111811

1181211812
ret = tsk_table_collection_copy(&t1, &t2, 0);
1181311813
CU_ASSERT_EQUAL_FATAL(ret, 0);

‎c/tskit/core.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -883,8 +883,8 @@ tsk_search_sorted(const double *restrict array, tsk_size_t size, double value)
883883
upper = mid;
884884
}
885885
}
886-
offset = (int64_t)(array[lower] < value);
887-
return (tsk_size_t)(lower + offset);
886+
offset = (int64_t) (array[lower] < value);
887+
return (tsk_size_t) (lower + offset);
888888
}
889889

890890
/* Rounds the specified double to the closest multiple of 10**-num_digits. If

‎c/tskit/haplotype_matching.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -572,15 +572,15 @@ static inline bool
572572
element_in(
573573
const uint64_t *restrict A, tsk_id_t u, const tsk_id_t state, tsk_size_t num_words)
574574
{
575-
tsk_size_t index = ((tsk_size_t) u) * num_words + (tsk_size_t)(state / 64);
575+
tsk_size_t index = ((tsk_size_t) u) * num_words + (tsk_size_t) (state / 64);
576576
return (A[index] & (1ULL << (state % 64))) != 0;
577577
}
578578

579579
static inline void
580580
set_optimal_value(
581581
uint64_t *restrict A, tsk_id_t u, const tsk_size_t num_words, tsk_id_t state)
582582
{
583-
tsk_size_t index = ((tsk_size_t) u) * num_words + (tsk_size_t)(state / 64);
583+
tsk_size_t index = ((tsk_size_t) u) * num_words + (tsk_size_t) (state / 64);
584584
tsk_bug_assert(((tsk_size_t) state) / 64 < num_words);
585585
A[index] |= 1ULL << (state % 64);
586586
}
@@ -815,7 +815,7 @@ tsk_ls_hmm_redistribute_transitions(tsk_ls_hmm_t *self)
815815
* iterating over the roots. See the existing parsimony implementations
816816
* for an example. */
817817
for (root = tsk_tree_get_left_root(&self->tree); root != TSK_NULL;
818-
root = right_sib[root]) {
818+
root = right_sib[root]) {
819819
stack[0].tree_node = root;
820820
stack[0].old_state = T_old[T_index[root]].value_index;
821821
stack[0].new_state
@@ -966,7 +966,7 @@ tsk_ls_hmm_run_forward(tsk_ls_hmm_t *self, int32_t *haplotype)
966966
}
967967

968968
for (t_ret = tsk_tree_first(&self->tree); t_ret == TSK_TREE_OK;
969-
t_ret = tsk_tree_next(&self->tree)) {
969+
t_ret = tsk_tree_next(&self->tree)) {
970970
ret = tsk_ls_hmm_update_tree(self, TSK_DIR_FORWARD);
971971
if (ret != 0) {
972972
goto out;
@@ -1166,7 +1166,7 @@ tsk_ls_hmm_run_backward(
11661166
}
11671167

11681168
for (t_ret = tsk_tree_last(&self->tree); t_ret == TSK_TREE_OK;
1169-
t_ret = tsk_tree_prev(&self->tree)) {
1169+
t_ret = tsk_tree_prev(&self->tree)) {
11701170
ret = tsk_ls_hmm_update_tree(self, TSK_DIR_REVERSE);
11711171
if (ret != 0) {
11721172
goto out;
@@ -1492,7 +1492,7 @@ tsk_compressed_matrix_decode(tsk_compressed_matrix_t *self, double *values)
14921492
}
14931493

14941494
for (t_ret = tsk_tree_first(&tree); t_ret == TSK_TREE_OK;
1495-
t_ret = tsk_tree_next(&tree)) {
1495+
t_ret = tsk_tree_next(&tree)) {
14961496
ret = tsk_tree_get_sites(&tree, &sites, &num_tree_sites);
14971497
if (ret != 0) {
14981498
goto out;

‎c/tskit/tables.c‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ check_offset_overflow(tsk_size_t current_size, tsk_size_t additional_elements)
100100
|| current_size > (max_val - additional_elements);
101101
}
102102

103-
#define TSK_NUM_ROWS_UNSET ((tsk_size_t) -1)
103+
#define TSK_NUM_ROWS_UNSET ((tsk_size_t) - 1)
104104
#define TSK_MAX_COL_NAME_LEN 64
105105

106106
static int
@@ -8255,8 +8255,8 @@ pair_to_integer(tsk_id_t a, tsk_id_t b, tsk_size_t N)
82558255
static inline void
82568256
integer_to_pair(int64_t index, tsk_size_t N, tsk_id_t *a, tsk_id_t *b)
82578257
{
8258-
*a = (tsk_id_t)(index / (int64_t) N);
8259-
*b = (tsk_id_t)(index % (int64_t) N);
8258+
*a = (tsk_id_t) (index / (int64_t) N);
8259+
*b = (tsk_id_t) (index % (int64_t) N);
82608260
}
82618261

82628262
static int64_t
@@ -8997,7 +8997,7 @@ simplifier_check_state(simplifier_t *self)
89978997
for (j = 0; j < self->input_tables.nodes.num_rows; j++) {
89988998
last_position = -1;
89998999
for (list_node = self->node_mutation_list_map_head[j]; list_node != NULL;
9000-
list_node = list_node->next) {
9000+
list_node = list_node->next) {
90019001
tsk_bug_assert(
90029002
self->input_tables.mutations.node[list_node->mutation] == (tsk_id_t) j);
90039003
site = self->input_tables.mutations.site[list_node->mutation];
@@ -9028,7 +9028,7 @@ simplifier_check_state(simplifier_t *self)
90289028
child = self->buffered_children[j];
90299029
tsk_bug_assert(self->child_edge_map_head[child] != NULL);
90309030
for (int_list = self->child_edge_map_head[child]; int_list != NULL;
9031-
int_list = int_list->next) {
9031+
int_list = int_list->next) {
90329032
tsk_bug_assert(int_list->left < int_list->right);
90339033
if (int_list->next != NULL) {
90349034
tsk_bug_assert(int_list->right < int_list->next->left);
@@ -9108,7 +9108,7 @@ simplifier_print_state(simplifier_t *self, FILE *out)
91089108
child = self->buffered_children[j];
91099109
fprintf(out, "%lld -> ", (long long) j);
91109110
for (int_list = self->child_edge_map_head[child]; int_list != NULL;
9111-
int_list = int_list->next) {
9111+
int_list = int_list->next) {
91129112
fprintf(out, "(%f, %f), ", int_list->left, int_list->right);
91139113
}
91149114
fprintf(out, "\n");
@@ -9123,7 +9123,7 @@ simplifier_print_state(simplifier_t *self, FILE *out)
91239123
if (self->node_mutation_list_map_head[j] != NULL) {
91249124
fprintf(out, "%lld\t-> [", (long long) j);
91259125
for (list_node = self->node_mutation_list_map_head[j]; list_node != NULL;
9126-
list_node = list_node->next) {
9126+
list_node = list_node->next) {
91279127
fprintf(out, "%lld,", (long long) list_node->mutation);
91289128
}
91299129
fprintf(out, "]\n");
@@ -10187,7 +10187,7 @@ simplifier_insert_input_roots(simplifier_t *self)
1018710187
const double *node_time = self->tables->nodes.time;
1018810188

1018910189
for (input_id = 0; input_id < (tsk_id_t) self->input_tables.nodes.num_rows;
10190-
input_id++) {
10190+
input_id++) {
1019110191
x = self->ancestor_map_head[input_id];
1019210192
if (x != NULL) {
1019310193
output_id = self->node_id_map[input_id];
@@ -10736,11 +10736,11 @@ tsk_table_collection_check_individual_integrity(
1073610736

1073710737
for (j = 0; j < (tsk_size_t) num_individuals; j++) {
1073810738
for (k = individuals.parents_offset[j]; k < individuals.parents_offset[j + 1];
10739-
k++) {
10739+
k++) {
1074010740
/* Check parent references are valid */
1074110741
if (individuals.parents[k] != TSK_NULL
1074210742
&& (individuals.parents[k] < 0
10743-
|| individuals.parents[k] >= num_individuals)) {
10743+
|| individuals.parents[k] >= num_individuals)) {
1074410744
ret = tsk_trace_error(TSK_ERR_INDIVIDUAL_OUT_OF_BOUNDS);
1074510745
goto out;
1074610746
}
@@ -11250,20 +11250,20 @@ tsk_table_collection_equals(const tsk_table_collection_t *self,
1125011250
if (!(options & TSK_CMP_IGNORE_TABLES)) {
1125111251
ret = ret
1125211252
&& tsk_individual_table_equals(
11253-
&self->individuals, &other->individuals, options)
11253+
&self->individuals, &other->individuals, options)
1125411254
&& tsk_node_table_equals(&self->nodes, &other->nodes, options)
1125511255
&& tsk_edge_table_equals(&self->edges, &other->edges, options)
1125611256
&& tsk_migration_table_equals(
11257-
&self->migrations, &other->migrations, options)
11257+
&self->migrations, &other->migrations, options)
1125811258
&& tsk_site_table_equals(&self->sites, &other->sites, options)
1125911259
&& tsk_mutation_table_equals(&self->mutations, &other->mutations, options)
1126011260
&& tsk_population_table_equals(
11261-
&self->populations, &other->populations, options);
11261+
&self->populations, &other->populations, options);
1126211262
/* TSK_CMP_IGNORE_TABLES implies TSK_CMP_IGNORE_PROVENANCE */
1126311263
if (!(options & TSK_CMP_IGNORE_PROVENANCE)) {
1126411264
ret = ret
1126511265
&& tsk_provenance_table_equals(
11266-
&self->provenances, &other->provenances, options);
11266+
&self->provenances, &other->provenances, options);
1126711267
}
1126811268
}
1126911269
/* TSK_CMP_IGNORE_TS_METADATA is implied by TSK_CMP_IGNORE_METADATA */
@@ -11273,19 +11273,19 @@ tsk_table_collection_equals(const tsk_table_collection_t *self,
1127311273
if (!(options & TSK_CMP_IGNORE_TS_METADATA)) {
1127411274
ret = ret
1127511275
&& (self->metadata_length == other->metadata_length
11276-
&& self->metadata_schema_length == other->metadata_schema_length
11277-
&& tsk_memcmp(self->metadata, other->metadata,
11278-
self->metadata_length * sizeof(char))
11279-
== 0
11280-
&& tsk_memcmp(self->metadata_schema, other->metadata_schema,
11281-
self->metadata_schema_length * sizeof(char))
11282-
== 0);
11276+
&& self->metadata_schema_length == other->metadata_schema_length
11277+
&& tsk_memcmp(self->metadata, other->metadata,
11278+
self->metadata_length * sizeof(char))
11279+
== 0
11280+
&& tsk_memcmp(self->metadata_schema, other->metadata_schema,
11281+
self->metadata_schema_length * sizeof(char))
11282+
== 0);
1128311283
}
1128411284

1128511285
if (!(options & TSK_CMP_IGNORE_REFERENCE_SEQUENCE)) {
1128611286
ret = ret
1128711287
&& tsk_reference_sequence_equals(
11288-
&self->reference_sequence, &other->reference_sequence, options);
11288+
&self->reference_sequence, &other->reference_sequence, options);
1128911289
}
1129011290
return ret;
1129111291
}
@@ -12057,7 +12057,7 @@ tsk_table_collection_dumpf(
1205712057
{ "format/name", (const void *) &TSK_FILE_FORMAT_NAME,
1205812058
TSK_FILE_FORMAT_NAME_LENGTH, KAS_INT8 },
1205912059
{ "format/version",
12060-
(const void *) &(uint32_t[]){
12060+
(const void *) &(uint32_t[]) {
1206112061
TSK_FILE_FORMAT_VERSION_MAJOR, TSK_FILE_FORMAT_VERSION_MINOR },
1206212062
2, KAS_UINT32 },
1206312063
{ "sequence_length", (const void *) &self->sequence_length, 1, KAS_FLOAT64 },
@@ -13302,7 +13302,7 @@ tsk_table_collection_union(tsk_table_collection_t *self,
1330213302
/* Now we know the full individual map we can remap the parents of the new
1330313303
* individuals*/
1330413304
for (k = (tsk_id_t) self->individuals.parents_offset[num_individuals_self];
13305-
k < (tsk_id_t) self->individuals.parents_length; k++) {
13305+
k < (tsk_id_t) self->individuals.parents_length; k++) {
1330613306
if (self->individuals.parents[k] != TSK_NULL) {
1330713307
self->individuals.parents[k] = individual_map[self->individuals.parents[k]];
1330813308
}

0 commit comments

Comments
 (0)