Changeset 4607

Timestamp:

02/13/07 21:36:19 (2 years ago)

Author:

morris

Message:

Make log function semi-public

Files:

• libwired/trunk/libwired/p7/wi-p7-private.h (modified) (1 diff)
• libwired/trunk/libwired/p7/wi-p7-spec.c (modified) (42 diffs)

libwired/trunk/libwired/p7/wi-p7-private.h

@@ -63 +63 @@
-WI_EXPORT void                                          wi_p7_message_deserialize(wi_p7_message_t *);
-
+WI_EXPORT void                                          wi_p7_spec_log_warn(wi_p7_spec_t *, wi_string_t *, ...);
-WI_EXPORT wi_boolean_t                          wi_p7_spec_is_checking(wi_p7_spec_t *);
-

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

@@ -259 +259 @@
-static void                                                                     _wi_p7_spec_dealloc(wi_runtime_instance_t *);
-static wi_string_t *                                            _wi_p7_spec_description(wi_runtime_instance_t *);
-
-static void                                                                     _wi_p7_spec_log_warn(wi_p7_spec_t *, wi_string_t *, ...);
-
-static wi_boolean_t                                                     _wi_p7_spec_load_builtin(wi_p7_spec_t *, wi_boolean_t);
@@ -572 +570 @@
-#pragma mark -
-
-static void _wi_p7_spec_log_warn(wi_p7_spec_t *p7_spec, wi_string_t *fmt, ...) {
-        wi_string_t             *string;
-        va_list                 ap;
-        
-        if(p7_spec->checking) {
-                va_start(ap, fmt);
-                string = wi_string_init_with_format_and_arguments(wi_string_alloc(), fmt, ap);
-                va_end(ap);
-                
-                if(p7_spec->filename)
-                        wi_log_warn(WI_STR("%@: %@"), p7_spec->filename, string);
-                else
-                        wi_log_warn(WI_STR("%@"), string);
-        }
-}
-
-
-
-#pragma mark -
-
-static wi_boolean_t _wi_p7_spec_load_builtin(wi_p7_spec_t *p7_spec, wi_boolean_t checking) {
-        xmlDocPtr               doc;
@@ -736 +714 @@
-                        if(p7_spec->checking) {
-                                if(wi_hash_data_for_key(p7_spec->types_name, type->name)) {
-_
+
-                                                type->name);
-                                        
@@ -743 +721 @@
-
-                                if(wi_hash_data_for_key(p7_spec->types_id, (void *) type->id)) {
-_
+
-                                                type->name, type->id);
-                                        
@@ -777 +755 @@
-                        if(p7_spec->checking) {
-                                if(wi_hash_data_for_key(p7_spec->fields_name, field->name)) {
-_
+
-                                                field->name);
-                                        
@@ -784 +762 @@
-                                
-                                if(wi_hash_data_for_key(p7_spec->fields_id, (void *) field->id)) {
-_
+
-                                                field->name, field->id);
-                                        
@@ -818 +796 @@
-                        if(p7_spec->checking) {
-                                if(wi_hash_data_for_key(p7_spec->messages_name, message->name)) {
-_
+
-                                                message->name);
-                                        
@@ -825 +803 @@
-                                
-                                if(wi_hash_data_for_key(p7_spec->messages_id, (void *) message->id)) {
-_
+
-                                                message->id, message->name);
-                                        
@@ -859 +837 @@
-                        if(p7_spec->checking) {
-                                if(wi_hash_data_for_key(p7_spec->transactions_name, transaction->message->name)) {
-_
+
-                                                transaction->message->name);
-                                        
@@ -877 +855 @@
-#pragma mark -
-
+void wi_p7_spec_log_warn(wi_p7_spec_t *p7_spec, wi_string_t *fmt, ...) {
+        wi_string_t             *string;
+        va_list                 ap;
+        
+        if(p7_spec->checking) {
+                va_start(ap, fmt);
+                string = wi_string_init_with_format_and_arguments(wi_string_alloc(), fmt, ap);
+                va_end(ap);
+                
+                if(p7_spec->filename)
+                        wi_log_warn(WI_STR("%@: %@"), p7_spec->filename, string);
+                else
+                        wi_log_warn(WI_STR("%@"), string);
+        }
+}
+
+
+
+#pragma mark -
+
-wi_boolean_t wi_p7_spec_is_checking(wi_p7_spec_t *p7_spec) {
-        return p7_spec->checking;
@@ -928 +926 @@
-                if(!other_transaction || !other_transaction->required) {
-                        if(!other_transaction) {
-_
+
-                                        transaction->message->name);
-                        } else {
-_
+
-                                        transaction->message->name);
-                        }
@@ -944 +942 @@
-                
-                if(transaction->originator != other_transaction->originator) {
-_
+
-                                transaction->message->name,
-                                _wi_p7_spec_transaction_originator(transaction),
@@ -1003 +1001 @@
-        
-        if(count != other_count) {
-_
+
-                        transaction->message->name,
-                        count,
@@ -1028 +1026 @@
-                if(!other_reply || !other_reply->required) {
-                        if(!other_reply) {
-_
+
-                                        reply->message->name, transaction->message->name);
-                        } else {
-_
+
-                                        reply->message->name, transaction->message->name);
-                        }
@@ -1041 +1039 @@
-        if(other_reply) {
-                if(reply->count != other_reply->count) {
-_
+
-                                reply->message->name,
-                                reply->count,
@@ -1071 +1069 @@
-        
-        if(message->id != other_message->id) {
-_
+
-                        WI_STR("Message in reply \"%@\" in transaction \"%@\" should have id %u, but peer has id %u"),
-                        message->name, transaction->message->name, message->id, other_message->id);
@@ -1087 +1085 @@
-                        if(!other_parameter || !other_parameter->required) {
-                                if(!other_parameter) {
-_
+
-                                                WI_STR("Parameter \"%@\" in reply \"%@\" in transaction \"%@\" is required, but peer lacks it"),
-                                                parameter->field->name, message->name, transaction->message->name);
-                                } else {
-_
+
-                                                WI_STR("Parameter \"%@\" in reply \"%@\" in transaction \"%@\" is required, but peer has it optional"),
-                                                parameter->field->name, message->name, transaction->message->name);
@@ -1105 +1103 @@
-                        
-                        if(field->id != other_field->id) {
-_
+
-                                        WI_STR("Field in parameter \"%@\" in reply \"%@\" in transaction \"%@\" should have id %u, but peer has id %u"),
-                                        parameter->field->name, message->name, transaction->message->name, field->id, other_field->id);
@@ -1113 +1111 @@
-                        
-                        if(field->type->id != other_field->type->id) {
-_
+
-                                        WI_STR("Parameter \"%@\" in reply \"%@\" in transaction \"%@\" should be of type \"%@\", but peer has it as \"%@\""),
-                                        parameter->field->name, message->name, transaction->message->name, field->type->name, other_field->type->name);
@@ -1122 +1120 @@
-                        if(field->type->id == WI_P7_ENUM) {
-                                if(!wi_is_equal(field->enums, other_field->enums)) {
-_
+
-                                                WI_STR("Parameter \"%@\" in reply \"%@\" in transaction \"%@\" have enumerations that differ with those of peer"),
-                                                parameter->field->name, message->name, transaction->message->name);
@@ -1304 +1302 @@
-        
-        if(!type->name) {
-_
+
-                
-                return NULL;
@@ -1312 +1310 @@
-        
-        if(type->id == WI_P7_SPEC_TYPE_ID_NULL) {
-_
+
-                        type->name);
-                
@@ -1366 +1364 @@
-
-        if(!field->name) {
-_
+
-
-                return NULL;
@@ -1374 +1372 @@
-
-        if(!type) {
-_
+
-                        field->name);
-
@@ -1386 +1384 @@
-        
-        if(!field->type) {
-_
+
-                        field->name, type);
-
@@ -1395 +1393 @@
-        
-        if(field->id == WI_P7_SPEC_FIELD_ID_NULL) {
-_
+
-                        field->name);
-
@@ -1409 +1407 @@
-                                
-                                if(!name) {
-_
+
-                                                field->name);
-                                        
@@ -1462 +1460 @@
-
-        if(!message->name) {
-_
+
-                
-                return NULL;
@@ -1470 +1468 @@
-        
-        if(message->id == WI_P7_SPEC_MESSAGE_ID_NULL) {
-_
+
-                        message->name);
-
@@ -1489 +1487 @@
-                        if(p7_spec->checking) {
-                                if(wi_hash_data_for_key(message->parameters, parameter->field->name)) {
-_
+
-                                                message->name, parameter->field->name);
-                                        
@@ -1537 +1535 @@
-
-        if(!field) {
-_
+
-                        message->name);
-                
@@ -1549 +1547 @@
-        
-        if(!parameter->field) {
-_
+
-                        message->name, field);
-                
@@ -1561 +1559 @@
-                        if(wi_string_case_insensitive_compare(use, WI_STR("required")) != 0 &&
-                           wi_string_case_insensitive_compare(use, WI_STR("optional")) != 0) {
-_
+
-                                        message->name, parameter->field->name, use);
-                                
@@ -1606 +1604 @@
-        
-        if(!message) {
-_
+
-                
-                return NULL;
@@ -1617 +1615 @@
-        
-        if(!transaction->message) {
-_
+
-                        message);
-                
@@ -1626 +1624 @@
-
-        if(!originator) {
-_
+
-                        transaction->message->name);
-                
@@ -1636 +1634 @@
-                   wi_string_case_insensitive_compare(originator, WI_STR("server")) != 0 &&
-                   wi_string_case_insensitive_compare(originator, WI_STR("both")) != 0) {
-_
+
-                                transaction->message->name, originator);
-                        
@@ -1656 +1654 @@
-                        if(wi_string_case_insensitive_compare(use, WI_STR("required")) != 0 &&
-                           wi_string_case_insensitive_compare(use, WI_STR("optional"))) {
-_
+
-                                        transaction->message->name, use);
-                                
@@ -1737 +1735 @@
-                                if(p7_spec->checking) {
-                                        if(wi_hash_data_for_key(andor->replies_hash, reply->message->name)) {
-_
+
-                                                        transaction->message->name, reply->message->name);
-                                                
@@ -1795 +1793 @@
-
-        if(!message) {
-_
+
-                        transaction->message->name);
-                
@@ -1807 +1805 @@
-        
-        if(!reply->message) {
-_
+
-                        transaction->message->name, message);
-                
@@ -1819 +1817 @@
-                        if(wi_string_case_insensitive_compare(use, WI_STR("required")) != 0 &&
-                           wi_string_case_insensitive_compare(use, WI_STR("optional"))) {
-_
+
-                                        reply->message->name, transaction->message->name, use);
-