Skip to content

Commit ce7a9a8

Browse files
committed
declare each var on its own line
1 parent b0650a1 commit ce7a9a8

File tree

1 file changed

+26
-18
lines changed

1 file changed

+26
-18
lines changed

python/_tskitmodule.c

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10507,17 +10507,25 @@ TreeSequence_ld_matrix(TreeSequence *self, PyObject *args, PyObject *kwds,
1050710507
PyObject *ret = NULL;
1050810508
static char *kwlist[] = { "sample_set_sizes", "sample_sets", "row_sites",
1050910509
"col_sites", "row_positions", "column_positions", "mode", NULL };
10510-
10511-
PyObject *row_sites = NULL, *col_sites = NULL, *row_positions = NULL,
10512-
*col_positions = NULL, *sample_set_sizes = NULL, *sample_sets = NULL;
10513-
PyArrayObject *row_sites_array = NULL, *col_sites_array = NULL,
10514-
*row_positions_array = NULL, *col_positions_array = NULL,
10515-
*sample_sets_array = NULL, *sample_set_sizes_array = NULL,
10516-
*result_matrix = NULL;
10517-
tsk_id_t *row_sites_parsed = NULL, *col_sites_parsed = NULL;
10518-
double *row_positions_parsed = NULL, *col_positions_parsed = NULL;
10519-
npy_intp result_dim[3] = { 0, 0, 0 };
10510+
PyObject *sample_set_sizes = NULL;
10511+
PyObject *sample_sets = NULL;
10512+
PyObject *row_sites = NULL;
10513+
PyObject *col_sites = NULL;
10514+
PyObject *row_positions = NULL;
10515+
PyObject *col_positions = NULL;
1052010516
char *mode = NULL;
10517+
PyArrayObject *sample_set_sizes_array = NULL;
10518+
PyArrayObject *sample_sets_array = NULL;
10519+
PyArrayObject *row_sites_array = NULL;
10520+
PyArrayObject *col_sites_array = NULL;
10521+
PyArrayObject *row_positions_array = NULL;
10522+
PyArrayObject *col_positions_array = NULL;
10523+
PyArrayObject *result_matrix = NULL;
10524+
tsk_id_t *row_sites_parsed = NULL;
10525+
tsk_id_t *col_sites_parsed = NULL;
10526+
double *row_positions_parsed = NULL;
10527+
double *col_positions_parsed = NULL;
10528+
npy_intp result_dim[3] = { 0, 0, 0 };
1052110529
tsk_size_t num_sample_sets;
1052210530
tsk_flags_t options = 0;
1052310531
int err;
@@ -10666,29 +10674,29 @@ TreeSequence_k_way_ld_matrix(TreeSequence *self, PyObject *args, PyObject *kwds,
1066610674
PyObject *ret = NULL;
1066710675
static char *kwlist[] = { "sample_set_sizes", "sample_sets", "indexes", "row_sites",
1066810676
"col_sites", "row_positions", "column_positions", "mode", NULL };
10677+
PyObject *sample_set_sizes = NULL;
10678+
PyObject *sample_sets = NULL;
10679+
PyObject *indexes = NULL;
1066910680
PyObject *row_sites = NULL;
1067010681
PyObject *col_sites = NULL;
1067110682
PyObject *row_positions = NULL;
1067210683
PyObject *col_positions = NULL;
10673-
PyObject *sample_set_sizes = NULL;
10674-
PyObject *sample_sets = NULL;
10675-
PyObject *indexes = NULL;
10684+
char *mode = NULL;
10685+
PyArrayObject *sample_set_sizes_array = NULL;
10686+
PyArrayObject *sample_sets_array = NULL;
10687+
PyArrayObject *indexes_array = NULL;
1067610688
PyArrayObject *row_sites_array = NULL;
1067710689
PyArrayObject *col_sites_array = NULL;
1067810690
PyArrayObject *row_positions_array = NULL;
1067910691
PyArrayObject *col_positions_array = NULL;
10680-
PyArrayObject *sample_sets_array = NULL;
10681-
PyArrayObject *sample_set_sizes_array = NULL;
10682-
PyArrayObject *indexes_array = NULL;
1068310692
PyArrayObject *result_matrix = NULL;
1068410693
tsk_id_t *row_sites_parsed = NULL;
1068510694
tsk_id_t *col_sites_parsed = NULL;
1068610695
double *row_positions_parsed = NULL;
1068710696
double *col_positions_parsed = NULL;
10688-
npy_intp *shape, result_dim[3] = { 0, 0, 0 };
10689-
char *mode = NULL;
1069010697
tsk_size_t num_sample_sets;
1069110698
tsk_size_t num_set_index_tuples;
10699+
npy_intp *shape, result_dim[3] = { 0, 0, 0 };
1069210700
tsk_flags_t options = 0;
1069310701
int err;
1069410702

0 commit comments

Comments
 (0)