Changeset 4389

Timestamp:

09/29/06 15:40:40 (2 years ago)

Author:

morris

Message:

Use more enumerators

Files:

• libwired/trunk/libwired/collections/wi-array.c (modified) (1 diff)
• libwired/trunk/libwired/collections/wi-list.c (modified) (5 diffs)
• libwired/trunk/libwired/net/wi-host.c (modified) (1 diff)
• libwired/trunk/libwired/net/wi-socket.c (modified) (5 diffs)
• libwired/trunk/libwired/system/wi-terminal.c (modified) (5 diffs)

libwired/trunk/libwired/collections/wi-array.c

@@ -228 +228 @@
-
-wi_array_t * wi_array_init_with_list(wi_array_t *array, wi_list_t *list) {
-list_node_t *node
-
+enumerator_t                *enumerator
+       
-        
-        array = wi_array_init_with_capacity(array, wi_list_count(list));
-
-
+
+
+
-                wi_array_add_data(array, data);
-        

libwired/trunk/libwired/collections/wi-list.c

@@ -223 +223 @@
-static wi_runtime_instance_t * _wi_list_copy(wi_runtime_instance_t *instance) {
-        wi_list_t                               *list = instance, *list_copy;
-list_node_t                 *node
-wi_runtime_instance_t
+enumerator_t                        *enumerator
+void                           
-        
-        list_copy = wi_list_init_with_callbacks(wi_list_alloc(), list->callbacks);
-
-
+
+
+
-                wi_list_append_data(list_copy, data);
-        
@@ -265 +266 @@
-static wi_string_t * _wi_list_description(wi_runtime_instance_t *instance) {
-        wi_list_t                       *list = instance;
-list_node_t         *node
+enumerator_t                *enumerator
-        wi_string_t                     *string, *description;
-        void                            *data;
@@ -274 +275 @@
-                list->count);
-        
-
+
+
+
-                if(list->callbacks.description)
-                        description = (*list->callbacks.description)(data);
@@ -295 +298 @@
-        wi_rwlock_wrlock(list->lock);
-}
-
-
-
@@ -727 +729 @@
-
-void wi_list_append_data_from_list(wi_list_t *list, wi_list_t *otherlist) {
-list_node_t         *node
+enumerator_t                *enumerator
-        void                            *data;
-        
-
+
+
+
-                wi_list_append_data(list, data);
-}

libwired/trunk/libwired/net/wi-host.c

@@ -158 +158 @@
-        wi_host_t                       *host1 = instance1;
-        wi_host_t                       *host2 = instance2;
+        wi_enumerator_t         *enumerator;
-        wi_list_t                       *addresses1;
-        wi_list_t                       *addresses2;
-        wi_list_node_t          *node;
-        wi_address_t            *address;
-fals
+tru
-
-        addresses1 = wi_host_addresses(host1);
-        addresses2 = wi_host_addresses(host2);
-        
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-        }

libwired/trunk/libwired/net/wi-socket.c

@@ -838 +838 @@
-
-wi_socket_t * wi_socket_wait_multiple(wi_list_t *list, wi_time_interval_t timeout) {
-list_node_t         *node
+enumerator_t                *enumerator
-        wi_socket_t                     *socket, *accept_socket;
-        struct timeval          tv;
@@ -851 +851 @@
-
-        wi_list_rdlock(list);
-
+
+
+
+
-                if(socket->direction & WI_SOCKET_READ)
-                        FD_SET(socket->sd, &rfds);
@@ -861 +864 @@
-                        max_sd = socket->sd;
-        }
+
-        wi_list_unlock(list);
-        
@@ -874 +878 @@
-        
-        wi_list_rdlock(list);
-
+
+
+
+
-                if(FD_ISSET(socket->sd, &rfds) || FD_ISSET(socket->sd, &wfds)) {
-                        accept_socket = socket;
@@ -881 +888 @@
-                }
-        }
+        
-        wi_list_unlock(list);
-        

libwired/trunk/libwired/system/wi-terminal.c

@@ -112 +112 @@
-static void                                                                             _wi_terminal_buffer_reload(wi_terminal_buffer_t *);
-
+
-static char                                                                             _wi_terminal_flush_buffer[_WI_TERMINAL_FLUSH_BUFFER_SIZE];
-static uint32_t                                                                 _wi_terminal_flush_offset;
@@ -357 +358 @@
-
-void wi_terminal_set_size(wi_terminal_t *terminal, wi_size_t size) {
-
+
+
-        
-        terminal->co = size.width;
-        terminal->li = size.height;
-        
-count = wi_array_count
-
-for(i = 0; i < count; i++
-WI_ARRAY(terminal->buffers, i)
+enumerator = wi_array_data_enumerator
+
+while((buffer = wi_enumerator_next_data(enumerator))
+buffer
-}
-
@@ -560 +562 @@
-
-static wi_array_t * _wi_terminal_buffer_lines_for_string(wi_terminal_buffer_t *buffer, wi_string_t *string) {
-
+
+
-        wi_string_t             *string_copy, *line, *subline;
-        wi_size_t               size;
-, count, i
+
-        
-        array           = wi_array_init(wi_array_alloc());
-        size            = wi_terminal_size(buffer->terminal);
-
-
-
-
-
-
+
+
+
-                if(wi_terminal_width_of_string(buffer->terminal, line) < size.width) {
-                        wi_array_add_data(array, line);
@@ -610 +610 @@
-
-wi_boolean_t wi_terminal_buffer_printf(wi_terminal_buffer_t *buffer, wi_string_t *fmt, ...) {
+        wi_enumerator_t *enumerator;
-        wi_array_t              *array;
-
+, *line
-        wi_point_t              location;
-        va_list                 ap;
-        uint32_t                i, count;
-        wi_boolean_t    result = false;
-        
@@ -628 +628 @@
-                        wi_terminal_move(buffer->terminal, wi_make_point(0, wi_terminal_scroll(buffer->terminal).length));
-                        
-count = wi_array_count
+enumerator = wi_array_data_enumerator
-                        
-for(i = 0; i < count; i++
+while((line = wi_enumerator_next_data(enumerator))
-                                _wi_terminal_puts(buffer->terminal, WI_STR("\n"));
-WI_ARRAY(array, i)
+line
-                                
-                                buffer->line++;