merged the modularization branch (credentials) back to trunk
This commit is contained in:
@@ -1,10 +1,3 @@
|
||||
/**
|
||||
* @file iterator.h
|
||||
*
|
||||
* @brief Interface iterator_t.
|
||||
*
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copyright (C) 2005-2006 Martin Willi
|
||||
* Copyright (C) 2005 Jan Hutter
|
||||
@@ -19,6 +12,13 @@
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* for more details.
|
||||
*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
/**
|
||||
* @defgroup iterator iterator
|
||||
* @{ @ingroup utils
|
||||
*/
|
||||
|
||||
#ifndef ITERATOR_H_
|
||||
@@ -29,13 +29,11 @@
|
||||
typedef enum hook_result_t hook_result_t;
|
||||
|
||||
/**
|
||||
* @brief Return value of an iterator hook.
|
||||
* Return value of an iterator hook.
|
||||
*
|
||||
* Returning HOOK_AGAIN is useful to "inject" additional elements in an
|
||||
* iteration, HOOK_NEXT is the normal iterator behavior, and HOOK_SKIP may
|
||||
* be used to filter elements out.
|
||||
*
|
||||
* @ingroup utils
|
||||
*/
|
||||
enum hook_result_t {
|
||||
|
||||
@@ -56,14 +54,12 @@ enum hook_result_t {
|
||||
};
|
||||
|
||||
/**
|
||||
* @brief Iterator hook function prototype.
|
||||
* Iterator hook function prototype.
|
||||
*
|
||||
* @param param user supplied parameter
|
||||
* @param in the value the hook receives from the iterator
|
||||
* @param out the value supplied as a result to the iterator
|
||||
* @return a hook_result_t
|
||||
*
|
||||
* @ingroup utils
|
||||
*/
|
||||
typedef hook_result_t (iterator_hook_t)(void *param, void *in, void **out);
|
||||
|
||||
@@ -71,44 +67,34 @@ typedef hook_result_t (iterator_hook_t)(void *param, void *in, void **out);
|
||||
typedef struct iterator_t iterator_t;
|
||||
|
||||
/**
|
||||
* @brief Iterator interface, allows iteration over collections.
|
||||
* Iterator interface, allows iteration over collections.
|
||||
*
|
||||
* iterator_t defines an interface for iterating over collections.
|
||||
* It allows searching, deleting, updating and inserting.
|
||||
*
|
||||
* @b Constructors:
|
||||
* - via linked_list_t.create_iterator, or
|
||||
* - any other class which supports the iterator_t interface
|
||||
*
|
||||
* @see linked_list_t
|
||||
*
|
||||
* @ingroup utils
|
||||
* @deprecated Use enumerator instead.
|
||||
*/
|
||||
struct iterator_t {
|
||||
|
||||
/**
|
||||
* @brief Return number of list items.
|
||||
* Return number of list items.
|
||||
*
|
||||
* @param this calling object
|
||||
* @return number of list items
|
||||
*/
|
||||
int (*get_count) (iterator_t *this);
|
||||
|
||||
/**
|
||||
* @brief Iterate over all items.
|
||||
* Iterate over all items.
|
||||
*
|
||||
* The easy way to iterate over items.
|
||||
*
|
||||
* @param this calling object
|
||||
* @param[out] value item
|
||||
* @return
|
||||
* - TRUE, if there was an element available,
|
||||
* - FALSE otherwise
|
||||
* @param value item
|
||||
* @return TRUE, if there was an element available, FALSE otherwise
|
||||
*/
|
||||
bool (*iterate) (iterator_t *this, void** value);
|
||||
|
||||
/**
|
||||
* @brief Hook a function into the iterator.
|
||||
* Hook a function into the iterator.
|
||||
*
|
||||
* Sometimes it is useful to hook in an iterator. The hook function is
|
||||
* called before any successful return of iterate(). It takes the
|
||||
@@ -119,80 +105,67 @@ struct iterator_t {
|
||||
* If an iterator is hooked, only the iterate() method is valid,
|
||||
* all other methods behave undefined.
|
||||
*
|
||||
* @param this calling object
|
||||
* @param hook iterator hook which manipulates the iterated value
|
||||
* @param param user supplied parameter to pass back to the hook
|
||||
* @param hook iterator hook which manipulates the iterated value
|
||||
* @param param user supplied parameter to pass back to the hook
|
||||
*/
|
||||
void (*set_iterator_hook) (iterator_t *this, iterator_hook_t *hook,
|
||||
void *param);
|
||||
|
||||
/**
|
||||
* @brief Inserts a new item before the given iterator position.
|
||||
* Inserts a new item before the given iterator position.
|
||||
*
|
||||
* The iterator position is not changed after inserting
|
||||
*
|
||||
* @param this calling iterator
|
||||
* @param[in] item value to insert in list
|
||||
* @param item value to insert in list
|
||||
*/
|
||||
void (*insert_before) (iterator_t *this, void *item);
|
||||
|
||||
/**
|
||||
* @brief Inserts a new item after the given iterator position.
|
||||
* Inserts a new item after the given iterator position.
|
||||
*
|
||||
* The iterator position is not changed after inserting.
|
||||
*
|
||||
* @param this calling iterator
|
||||
* @param[in] item value to insert in list
|
||||
* @param this calling iterator
|
||||
* @param item value to insert in list
|
||||
*/
|
||||
void (*insert_after) (iterator_t *this, void *item);
|
||||
|
||||
/**
|
||||
* @brief Replace the current item at current iterator position.
|
||||
* Replace the current item at current iterator position.
|
||||
*
|
||||
* The iterator position is not changed after replacing.
|
||||
*
|
||||
* @param this calling iterator
|
||||
* @param[out] old_item old value will be written here(can be NULL)
|
||||
* @param[in] new_item new value
|
||||
*
|
||||
* @return
|
||||
* - SUCCESS
|
||||
* - FAILED if iterator is on an invalid position
|
||||
* @param this calling iterator
|
||||
* @param old old value will be written here(can be NULL)
|
||||
* @param new new value
|
||||
* @return SUCCESS, FAILED if iterator is on an invalid position
|
||||
*/
|
||||
status_t (*replace) (iterator_t *this, void **old_item, void *new_item);
|
||||
status_t (*replace) (iterator_t *this, void **old, void *new);
|
||||
|
||||
/**
|
||||
* @brief Removes an element from list at the given iterator position.
|
||||
* Removes an element from list at the given iterator position.
|
||||
*
|
||||
* The iterator is set the the following position:
|
||||
* - to the item before, if available
|
||||
* - it gets reseted, otherwise
|
||||
*
|
||||
* @param this calling object
|
||||
* @return
|
||||
* - SUCCESS
|
||||
* - FAILED if iterator is on an invalid position
|
||||
* @return SUCCESS, FAILED if iterator is on an invalid position
|
||||
*/
|
||||
status_t (*remove) (iterator_t *this);
|
||||
|
||||
/**
|
||||
* @brief Resets the iterator position.
|
||||
* Resets the iterator position.
|
||||
*
|
||||
* After reset, the iterator_t objects doesn't point to an element.
|
||||
* A call to iterator_t.has_next is necessary to do any other operations
|
||||
* with the resetted iterator.
|
||||
*
|
||||
* @param this calling object
|
||||
*/
|
||||
void (*reset) (iterator_t *this);
|
||||
|
||||
/**
|
||||
* @brief Destroys an iterator.
|
||||
*
|
||||
* @param this iterator to destroy
|
||||
*
|
||||
* Destroys an iterator.
|
||||
*/
|
||||
void (*destroy) (iterator_t *this);
|
||||
};
|
||||
|
||||
#endif /*ITERATOR_H_*/
|
||||
#endif /*ITERATOR_H_ @} */
|
||||
|
||||
Reference in New Issue
Block a user