Changeset 5151

Timestamp:

01/05/08 01:03:03 (9 months ago)

Author:

morris

Message:

Rename wi_array_argv() to wi_array_create_argv()

Add wi_array_destroy_argv()

Add wi_array_by_adding_data() and wi_array_by_adding_data_from_array()

Files:

• libwired/trunk/libwired/collections/wi-array.c (modified) (4 diffs)
• libwired/trunk/libwired/collections/wi-array.h (modified) (3 diffs)
• libwired/trunk/libwired/system/wi-task.c (modified) (1 diff)

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

@@ -585 +585 @@
-
-
-
+create_
-        wi_string_t             *description;
-        const char              **argv;
@@ -607 +607 @@
-        
-        return argv;
+}
+
+
+
+void wi_array_destroy_argv(wi_uinteger_t argc, const char **argv) {
+        wi_uinteger_t   i;
+        
+        for(i = 0; i < argc; i++)
+                free((char *) argv[i]);
+        
+        free(argv);
-}
-
@@ -858 +869 @@
-
-
+wi_array_t * wi_array_by_adding_data(wi_array_t *array, void *data) {
+        wi_array_t              *newarray;
+        
+        newarray = wi_copy(array);
+        wi_array_add_data(array, data);
+        
+        return wi_autorelease(newarray);
+}
+
+
+
-void wi_array_add_data_sorted(wi_array_t *array, void *data, wi_compare_func_t *compare) {
-        _wi_array_item_t        *item;
@@ -876 +898 @@
-        for(i = 0; i < count; i++)
-                wi_array_add_data(array, wi_array_data_at_index(otherarray, i));
+}
+
+
+wi_array_t * wi_array_by_adding_data_from_array(wi_array_t *array, wi_array_t *otherarray) {
+        wi_array_t              *newarray;
+        
+        newarray = wi_copy(array);
+        wi_array_add_data_from_array(array, otherarray);
+        
+        return wi_autorelease(newarray);
-}
-

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

@@ -35 +35 @@
-
-#define WI_ARRAY(array, i)                              wi_array_data_at_index((array), (i))
+#define wi_array_argv                                   wi_array_create_argv
-
-
@@ -73 +74 @@
-WI_EXPORT void                                                  wi_array_get_data_in_range(wi_array_t *, void **, wi_range_t);
-WI_EXPORT wi_string_t *                                 wi_array_components_joined_by_string(wi_array_t *, wi_string_t *);
-WI_EXPORT const char **                                 wi_array_argv(wi_array_t *);
-WI_EXPORT wi_array_t *                                  wi_array_subarray_with_range(wi_array_t *, wi_range_t);
+WI_EXPORT const char **                                 wi_array_create_argv(wi_array_t *);
+WI_EXPORT void                                                  wi_array_destroy_argv(wi_uinteger_t, const char **);
-
-WI_EXPORT wi_enumerator_t *                             wi_array_data_enumerator(wi_array_t *);
@@ -83 +85 @@
-
-WI_EXPORT void                                                  wi_array_add_data(wi_array_t *, void *);
+WI_EXPORT wi_array_t *                                  wi_array_by_adding_data(wi_array_t *, void *);
-WI_EXPORT void                                                  wi_array_add_data_sorted(wi_array_t *, void *, wi_compare_func_t *);
-WI_EXPORT void                                                  wi_array_add_data_from_array(wi_array_t *, wi_array_t *);
+WI_EXPORT wi_array_t *                                  wi_array_by_adding_data_from_array(wi_array_t *, wi_array_t *);
-WI_EXPORT void                                                  wi_array_insert_data_at_index(wi_array_t *, void *, wi_uinteger_t);
-WI_EXPORT void                                                  wi_array_replace_data_at_index(wi_array_t *, void *, wi_uinteger_t);

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

@@ -196 +196 @@
-                launch_path = wi_string_cstring(task->launch_path);
-                wi_array_insert_data_at_index(task->arguments, task->launch_path, 0);
-
+create_
-                
-                if(execv(launch_path, (char * const *) argv) < 0) {