Changeset 4797

Timestamp:

05/27/07 23:48:49 (2 years ago)

Author:

morris

Message:

Make sure we use l in %d and %u format specifiers since they will be long on 64-bit

Files:

• libwired/trunk/libwired/collections/wi-array.c (modified) (3 diffs)
• libwired/trunk/libwired/collections/wi-hash.c (modified) (4 diffs)
• libwired/trunk/libwired/collections/wi-set.c (modified) (2 diffs)
• libwired/trunk/libwired/data/wi-date.c (modified) (1 diff)
• libwired/trunk/libwired/data/wi-url.c (modified) (1 diff)
• libwired/trunk/libwired/misc/wi-crypto.c (modified) (2 diffs)
• libwired/trunk/libwired/misc/wi-error.c (modified) (1 diff)
• libwired/trunk/libwired/misc/wi-settings.c (modified) (1 diff)
• libwired/trunk/libwired/misc/wi-test.c (modified) (1 diff)
• libwired/trunk/libwired/net/wi-address.c (modified) (1 diff)
• libwired/trunk/libwired/p7/wi-p7-spec.c (modified) (11 diffs)
• libwired/trunk/test/tests/wi-runtime-tests.c (modified) (1 diff)

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

@@ -133 +133 @@
-        wi_is_equal,
-        wi_description
-};
-
-const wi_array_callbacks_t                              wi_array_null_callbacks = {
-        NULL,
-        NULL,
-        NULL,
-        NULL
-};
-
@@ -447 +440 @@
-        wi_uinteger_t           i;
-        
-d
+lu
-                wi_runtime_class_name(array),
-                array,
@@ -460 +453 @@
-                        description = wi_string_with_format(WI_STR("%p"), data);
-                
-
+l
-        }
-        

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

@@ -161 +161 @@
-};
-
-const wi_hash_key_callbacks_t                   wi_hash_null_key_callbacks = {
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL
-};
-
-const wi_hash_value_callbacks_t                 wi_hash_default_value_callbacks = {
-        wi_retain,
@@ -174 +166 @@
-        wi_is_equal,
-        wi_description
-};
-
-const wi_hash_value_callbacks_t                 wi_hash_null_value_callbacks = {
-        NULL,
-        NULL,
-        NULL,
-        NULL
-};
-
@@ -346 +331 @@
-        wi_uinteger_t           i;
-
-d
+lu
-                wi_runtime_class_name(hash),
-                hash,
@@ -461 +446 @@
-        
-        if(hash->key_count == 0)
-rray(
+utorelease(wi_array_init(wi_array_alloc())
-        
-        callbacks.retain                = NULL;

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

@@ -136 +136 @@
-};
-
-const wi_set_callbacks_t                                wi_set_null_callbacks = {
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL
-};
-
-static wi_uinteger_t                                    _wi_set_buckets_per_page;
-
@@ -301 +293 @@
-        wi_uinteger_t           i;
-
-d
+lu
-                wi_runtime_class_name(set),
-                set,

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

@@ -107 +107 @@
-
-        if(days > 0) {
-u:%.2u:%.2u:%.2
+lu:%.2lu:%.2lu:%.2l
-                        days, hours, minutes, seconds);
-        }
-        else if(hours > 0) {
-u:%.2u:%.2
+lu:%.2lu:%.2l
-                        hours, minutes, seconds);
-        }
-        else if(minutes > 0) {
-u:%.2
+lu:%.2l
-                        minutes, seconds);
-        }
-        else {
-
+l
-                        seconds);
-        }

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

@@ -198 +198 @@
-        
-        if(url->port > 0)
-
+l
-        
-        if(url->path)

libwired/trunk/libwired/misc/wi-crypto.c

@@ -228 +228 @@
-        wi_rsa_t                *rsa = instance;
-        
-
+l
-        wi_runtime_class_name(rsa),
-                rsa,
@@ -527 +527 @@
-        wi_cipher_t             *cipher = instance;
-        
-
+l
-        wi_runtime_class_name(cipher),
-                cipher,

libwired/trunk/libwired/misc/wi-error.c

@@ -254 +254 @@
-                wi_release(error->string);
-
-u
+d
-                        file,
-                        line,

libwired/trunk/libwired/misc/wi-settings.c

@@ -297 +297 @@
-
-static void _wi_settings_log_error(wi_settings_t *settings, wi_string_t *name) {
-d
+lu
-                name, settings->file, settings->line);
-}

libwired/trunk/libwired/misc/wi-test.c

@@ -105 +105 @@
-        
-        wi_log_info(WI_STR("Tests stopped at %@"), wi_date_string_with_format(_wi_tests_start_date, WI_STR("%Y-%m-%d %H:%M:%S")));
-u %@ passed (%.1f%%), %
+lu %@ passed (%.1f%%), %l
-                wi_tests_passed,
-                wi_tests_passed == 1

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

@@ -216 +216 @@
-        }
-        
-
+l
-           wi_runtime_class_name(address),
-           address,

libwired/trunk/libwired/p7/wi-p7-spec.c

@@ -737 +737 @@
-                                if(wi_hash_data_for_key(p7_spec->types_id, (void *) type->id)) {
-                                        wi_error_set_libwired_p7_error(WI_ERROR_P7_INVALIDSPEC,
-
+l
-                                                type->name, type->id);
-                                        
@@ -776 +776 @@
-                                if(wi_hash_data_for_key(p7_spec->fields_id, (void *) field->id)) {
-                                        wi_error_set_libwired_p7_error(WI_ERROR_P7_INVALIDSPEC,
-
+l
-                                                field->id, field->name);
-                                        
@@ -815 +815 @@
-                                if(wi_hash_data_for_key(p7_spec->messages_id, (void *) message->id)) {
-                                        wi_error_set_libwired_p7_error(WI_ERROR_P7_INVALIDSPEC,
-
+l
-                                                message->id, message->name);
-                                        
@@ -961 +961 @@
-        if(count != other_count) {
-                wi_error_set_libwired_p7_error(WI_ERROR_P7_INVALIDSPEC,
-u %@, but peer has %
+lu %@, but peer has %l
-                        transaction->message->name,
-                        count,
@@ -1092 +1092 @@
-        if(message->id != other_message->id) {
-                wi_error_set_libwired_p7_error(WI_ERROR_P7_INVALIDSPEC,
-u, but peer has id %
+lu, but peer has id %l
-                        message->name, transaction->message->name, message->id, other_message->id);
-                
@@ -1126 +1126 @@
-                        if(field->id != other_field->id) {
-                                wi_error_set_libwired_p7_error(WI_ERROR_P7_INVALIDSPEC,
-u, but peer has id %
+lu, but peer has id %l
-                                        parameter->field->name, message->name, transaction->message->name, field->id, other_field->id);
-                                
@@ -1429 +1429 @@
-        _wi_p7_spec_type_t              *type = instance;
-        
-u, size = %
+lu, size = %l
-        wi_runtime_class_name(type),
-                type,
@@ -1536 +1536 @@
-        _wi_p7_spec_field_t             *field = instance;
-        
-
+l
-        wi_runtime_class_name(field),
-                field,
@@ -1613 +1613 @@
-        _wi_p7_spec_message_t           *message = instance;
-        
-
+l
-        wi_runtime_class_name(message),
-                message,
@@ -1973 +1973 @@
-                return WI_STR("one or more times");
-
-
+l
-}
-
@@ -1989 +1989 @@
-        _wi_p7_spec_reply_t             *reply = instance;
-        
-
+l
-        wi_runtime_class_name(reply),
-                reply,

libwired/trunk/test/tests/wi-runtime-tests.c

@@ -124 +124 @@
-        _wi_runtimetest_t       *runtimetest = instance;
-        
-
+l
-}
-