diff --git a/mod/box/index.h b/mod/box/index.h index e0d4d684072a202494b84887e39fbcd2f4e2104b..07e706e74624724ad188f2bcd7c78c2c711df0b4 100644 --- a/mod/box/index.h +++ b/mod/box/index.h @@ -126,8 +126,8 @@ struct key_def { * initialized separately. */ - (struct iterator *) allocIterator; -- (void) initIterator: (struct iterator *) iterator: (enum iterator_type) type; -- (void) initIterator: (struct iterator *) iterator: (enum iterator_type) type +- (void) initIterator: (struct iterator *) iterator :(enum iterator_type) type; +- (void) initIterator: (struct iterator *) iterator :(enum iterator_type) type :(void *) key :(int) part_count; @end diff --git a/mod/box/index.m b/mod/box/index.m index b4b533274ceb77e6472762caa523708c11a69499..9dd265a9725bd2cead52216dcbb7298a618f0b83 100644 --- a/mod/box/index.m +++ b/mod/box/index.m @@ -166,14 +166,14 @@ iterator_first_equal(struct iterator *it) return NULL; } -- (void) initIterator: (struct iterator *) iterator: (enum iterator_type) type +- (void) initIterator: (struct iterator *) iterator :(enum iterator_type) type { (void) iterator; (void) type; [self subclassResponsibility: _cmd]; } -- (void) initIterator: (struct iterator *) iterator: (enum iterator_type) type +- (void) initIterator: (struct iterator *) iterator :(enum iterator_type) type :(void *) key :(int) part_count { @@ -390,7 +390,7 @@ hash_iterator_free(struct iterator *iterator) #endif } -- (void) initIterator: (struct iterator *) iterator: (enum iterator_type) type +- (void) initIterator: (struct iterator *) iterator :(enum iterator_type) type { assert(iterator->next = hash_iterator_next); struct hash_iterator *it = hash_iterator(iterator); @@ -403,7 +403,7 @@ hash_iterator_free(struct iterator *iterator) it->hash = int_hash; } -- (void) initIterator: (struct iterator *) iterator: (enum iterator_type) type +- (void) initIterator: (struct iterator *) iterator :(enum iterator_type) type :(void *) key :(int) part_count { @@ -523,7 +523,7 @@ hash_iterator_free(struct iterator *iterator) #endif } -- (void) initIterator: (struct iterator *) iterator: (enum iterator_type) type +- (void) initIterator: (struct iterator *) iterator :(enum iterator_type) type { assert(iterator->next = hash_iterator_next); struct hash_iterator *it = hash_iterator(iterator); @@ -536,7 +536,7 @@ hash_iterator_free(struct iterator *iterator) it->hash = (struct mh_i32ptr_t *) int64_hash; } -- (void) initIterator: (struct iterator *) iterator: (enum iterator_type) type +- (void) initIterator: (struct iterator *) iterator :(enum iterator_type) type :(void *) field :(int) part_count { @@ -647,7 +647,7 @@ hash_iterator_free(struct iterator *iterator) #endif } -- (void) initIterator: (struct iterator *) iterator: (enum iterator_type) type +- (void) initIterator: (struct iterator *) iterator :(enum iterator_type) type { assert(iterator->next = hash_iterator_next); struct hash_iterator *it = hash_iterator(iterator); @@ -660,7 +660,7 @@ hash_iterator_free(struct iterator *iterator) it->hash = (struct mh_i32ptr_t *) str_hash; } -- (void) initIterator: (struct iterator *) iterator: (enum iterator_type) type +- (void) initIterator: (struct iterator *) iterator :(enum iterator_type) type :(void *) key :(int) part_count { diff --git a/mod/box/tree.m b/mod/box/tree.m index 05a7298f5c44a71b3e7060f585a5a5136cac5c60..04eac45165bf0d566361049a6fa04ab528ab7093 100644 --- a/mod/box/tree.m +++ b/mod/box/tree.m @@ -833,12 +833,12 @@ tree_iterator_free(struct iterator *iterator) return (struct iterator *) it; } -- (void) initIterator: (struct iterator *) iterator: (enum iterator_type) type +- (void) initIterator: (struct iterator *) iterator :(enum iterator_type) type { [self initIterator: iterator :type :NULL :0]; } -- (void) initIterator: (struct iterator *) iterator: (enum iterator_type) type +- (void) initIterator: (struct iterator *) iterator :(enum iterator_type) type :(void *) key :(int) part_count {