Fri, 07 Jul 2023 18:43:11 +0200
merge upstream changes
1.1 --- a/src/cx/iterator.h Fri Jul 07 18:33:11 2023 +0200 1.2 +++ b/src/cx/iterator.h Fri Jul 07 18:43:11 2023 +0200 1.3 @@ -204,13 +204,13 @@ 1.4 1.5 /** 1.6 * Iterator value type. 1.7 - * An iterator points to a certain element in an (possibly unbounded) chain of elements. 1.8 + * An iterator points to a certain element in a (possibly unbounded) chain of elements. 1.9 * Iterators that are based on collections (which have a defined "first" element), are supposed 1.10 * to be "position-aware", which means that they keep track of the current index within the collection. 1.11 * 1.12 * @note Objects that are pointed to by an iterator are always mutable through that iterator. However, 1.13 * this iterator cannot mutate the collection itself (add or remove elements) and any mutation of the 1.14 - * collection by other means make this iterator invalid (regardless of what cxIteratorValid() returns). 1.15 + * collection by other means makes this iterator invalid (regardless of what cxIteratorValid() returns). 1.16 * 1.17 * @see CxMutIterator 1.18 */
2.1 --- a/src/cx/list.h Fri Jul 07 18:33:11 2023 +0200 2.2 +++ b/src/cx/list.h Fri Jul 07 18:43:11 2023 +0200 2.3 @@ -77,7 +77,7 @@ 2.4 void (*destructor)(struct cx_list_s *list); 2.5 2.6 /** 2.7 - * Member function for inserting a single elements. 2.8 + * Member function for inserting a single element. 2.9 * Implementors SHOULD see to performant implementations for corner cases. 2.10 */ 2.11 int (*insert_element)( 2.12 @@ -145,7 +145,7 @@ 2.13 ); 2.14 2.15 /** 2.16 - * Member function for sorting the list in place. 2.17 + * Member function for sorting the list in-place. 2.18 */ 2.19 void (*sort)(struct cx_list_s *list); 2.20 2.21 @@ -584,7 +584,7 @@ 2.22 } 2.23 2.24 /** 2.25 - * Sorts the list in place. 2.26 + * Sorts the list in-place. 2.27 * 2.28 * \remark The underlying sort algorithm is implementation defined. 2.29 *