Changeset 4610

Timestamp:

02/13/07 22:08:48 (2 years ago)

Author:

morris

Message:

Add wi_data(), wi_data_init(), wi_data_by_appending_data(), wi_data_by_appending_bytes()

Files:

• libwired/trunk/libwired/data/wi-data.c (modified) (7 diffs)
• libwired/trunk/libwired/data/wi-data.h (modified) (2 diffs)

libwired/trunk/libwired/data/wi-data.c

@@ -39 +39 @@
-#include <wired/wi-data.h>
-#include <wired/wi-file.h>
+#include <wired/wi-macros.h>
-#include <wired/wi-private.h>
-#include <wired/wi-runtime.h>
-#include <wired/wi-string.h>
-#include <wired/wi-system.h>
+
+#define _WI_DATA_MIN_SIZE                               128
+
-
-struct _wi_data {
@@ -93 +97 @@
-#pragma mark -
-
+wi_data_t * wi_data(void) {
+        return wi_autorelease(wi_data_init(wi_data_alloc()));
+}
+
+
+
-wi_data_t * wi_data_with_random_bytes(wi_uinteger_t length) {
-        return wi_autorelease(wi_data_init_with_random_bytes(wi_data_alloc(), length));
@@ -113 +123 @@
-
-
+wi_data_t * wi_data_init(wi_data_t *data) {
+        return wi_data_init_with_capacity(data, 0);
+}
+
+
+
-wi_data_t * wi_data_init_with_capacity(wi_data_t *data, wi_uinteger_t capacity) {
-capacity
+WI_MAX(wi_exp2m1(wi_log2(capacity) + 1), _WI_DATA_MIN_SIZE)
-        data->bytes             = wi_malloc(data->capacity);
-        
@@ -134 +150 @@
-
-#ifdef WI_CRYPTO
+
-wi_data_t * wi_data_init_with_random_bytes(wi_data_t *data, wi_uinteger_t length) {
-        data = wi_data_init_with_capacity(data, length);
@@ -143 +160 @@
-        return data;
-}
+
-#endif
-
@@ -326 +344 @@
-
-
+wi_data_t * wi_data_by_appending_data(wi_data_t *data, wi_data_t *append_data) {
+        wi_data_t               *newdata;
+        
+        newdata = wi_copy(data);
+        wi_data_append_bytes(newdata, append_data->bytes, append_data->length);
+        
+        return wi_autorelease(newdata);
+}
+
+
+
-void wi_data_append_bytes(wi_data_t *data, const void *bytes, wi_uinteger_t length) {
-        if(data->length + length > data->capacity) {
@@ -335 +364 @@
-
-        data->length += length;
+}
+
+
+
+wi_data_t * wi_data_by_appending_bytes(wi_data_t *data, const void *bytes, wi_uinteger_t length) {
+        wi_data_t               *newdata;
+        
+        newdata = wi_copy(data);
+        wi_data_append_bytes(newdata, bytes, length);
+        
+        return wi_autorelease(newdata);
-}
-

libwired/trunk/libwired/data/wi-data.h

@@ -38 +38 @@
-WI_EXPORT wi_runtime_id_t                               wi_data_runtime_id(void);
-
+WI_EXPORT wi_data_t *                                   wi_data(void);
-WI_EXPORT wi_data_t *                                   wi_data_with_base64(wi_string_t *);
-WI_EXPORT wi_data_t *                                   wi_data_with_random_bytes(wi_uinteger_t);
-
-WI_EXPORT wi_data_t *                                   wi_data_alloc(void);
+WI_EXPORT wi_data_t *                                   wi_data_init(wi_data_t *);
-WI_EXPORT wi_data_t *                                   wi_data_init_with_capacity(wi_data_t *, wi_uinteger_t);
-WI_EXPORT wi_data_t *                                   wi_data_init_with_bytes(wi_data_t *, const void *, wi_uinteger_t);
@@ -52 +54 @@
-
-WI_EXPORT void                                                  wi_data_append_data(wi_data_t *, wi_data_t *);
+WI_EXPORT wi_data_t *                                   wi_data_by_appending_data(wi_data_t *, wi_data_t *);
-WI_EXPORT void                                                  wi_data_append_bytes(wi_data_t *, const void *, wi_uinteger_t);
+WI_EXPORT wi_data_t *                                   wi_data_by_appending_bytes(wi_data_t *, const void *, wi_uinteger_t);
-
-WI_EXPORT wi_string_t *                                 wi_data_md5(wi_data_t *);