diff --git a/parse.cpp b/parse.cpp index f405bd9f..d5c59eed 100644 --- a/parse.cpp +++ b/parse.cpp @@ -140,8 +140,6 @@ parse_eq(char *eqn, struct elt_list **elt_ptr, int association) /* * Sort elements in reaction and combine */ - //qsort(elt_list[0], (size_t) count_elts, sizeof(struct elt_list), - // elt_list_compare); if (elt_list_combine() == ERROR) return (ERROR); /* diff --git a/read.cpp b/read.cpp index 276fc1ad..05851720 100644 --- a/read.cpp +++ b/read.cpp @@ -1665,7 +1665,7 @@ read_inverse(void) { qsort(inverse[n].isotopes, (size_t) inverse[n].count_isotopes, - (size_t) sizeof(struct inv_isotope), inverse_isotope_compare); + sizeof(struct inv_isotope), inverse_isotope_compare); } if (inverse[n].count_i_u > 0) diff --git a/structures.cpp b/structures.cpp index 614a4632..8a240017 100644 --- a/structures.cpp +++ b/structures.cpp @@ -962,7 +962,7 @@ master_bsearch(const char *ptr) return (NULL); } void_ptr = bsearch((const char *) ptr, - (char *) master[0], + (char *) &master[0], master.size(), sizeof(struct master *), master_compare_string); if (void_ptr == NULL) @@ -1258,7 +1258,7 @@ phase_bsearch(const char *ptr, int *j, int print) { void_ptr = (void *) bsearch((char *) ptr, - (char *) phases[0], + (char *) &phases[0], phases.size(), sizeof(struct phase *), phase_compare_string); } diff --git a/tidy.cpp b/tidy.cpp index 0f2bf574..3d3a140e 100644 --- a/tidy.cpp +++ b/tidy.cpp @@ -150,14 +150,14 @@ tidy_model(void) /* species */ if (new_model == TRUE) { - qsort(s[0], s.size(), sizeof(struct species *), s_compare); + qsort(&s[0], s.size(), sizeof(struct species *), s_compare); /* master species */ - qsort(master[0], master.size(), sizeof(struct master *), master_compare); + qsort(&master[0], master.size(), sizeof(struct master *), master_compare); /* elements */ - qsort(elements[0], elements.size(), sizeof(struct element *), element_compare); + qsort(&elements[0], elements.size(), sizeof(struct element *), element_compare); /* phases */ - qsort(phases[0], phases.size(), sizeof(struct phase *), phase_compare); + qsort(&phases[0], phases.size(), sizeof(struct phase *), phase_compare); }