Use g_log instead of g_warning in LmParser and remove some unneccesary printouts from parser test
--- a/loudmouth/lm-parser.c Sat Jun 07 11:22:19 2008 +0200
+++ b/loudmouth/lm-parser.c Sat Jun 07 11:36:24 2008 +0200
@@ -138,8 +138,10 @@
if (strcmp (node_name, "stream:stream")) {
g_print ("Got an stream:stream end\n");
}
- g_warning ("Trying to close node that isn't open: %s",
- node_name);
+
+ g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_PARSER,
+ "Trying to close node that isn't open: %s",
+ node_name);
return;
}
@@ -149,8 +151,9 @@
m = _lm_message_new_from_node (parser->cur_root);
if (!m) {
- g_warning ("Couldn't create message: %s\n",
- parser->cur_root->name);
+ g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_PARSER,
+ "Couldn't create message: %s\n",
+ parser->cur_root->name);
return;
}
@@ -200,7 +203,8 @@
g_return_if_fail (user_data != NULL);
g_return_if_fail (error != NULL);
- g_warning ("Parsing failed: %s\n", error->message);
+ g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_PARSER,
+ "Parsing failed: %s\n", error->message);
}
LmParser *
--- a/tests/parser-tests/Makefile.am Sat Jun 07 11:22:19 2008 +0200
+++ b/tests/parser-tests/Makefile.am Sat Jun 07 11:36:24 2008 +0200
@@ -1,6 +1,8 @@
-EXTRA_DIST = \
+include $(top_srcdir)/Makefile.decl
+
+EXTRA_DIST += \
valid-1.xml \
valid-2.xml \
- valid-3.xml \
+ should-be-valid-3.xml \
invalid-1.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/parser-tests/should-be-valid-3.xml Sat Jun 07 11:36:24 2008 +0200
@@ -0,0 +1,14 @@
+<stream:stream
+ from='example.com'
+ id='someid'
+ xmlns='jabber:client'
+ xmlns:stream='http://etherx.jabber.org/streams'
+ version='1.0'>
+
+ <message from='romeo@example.net'
+ to='juliet@example.com'
+ xml:lang='en'>
+ <body>the printout is: name:'.00BD2.A52?'</body>
+ </message>
+</stream:stream>
+
--- a/tests/parser-tests/valid-3.xml Sat Jun 07 11:22:19 2008 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<stream:stream
- from='example.com'
- id='someid'
- xmlns='jabber:client'
- xmlns:stream='http://etherx.jabber.org/streams'
- version='1.0'>
-
- <message from='romeo@example.net'
- to='juliet@example.com'
- xml:lang='en'>
- <body>the printout is: name:'.00BD2.A52?'</body>
- </message>
-</stream:stream>
-
--- a/tests/test-parser.c Sat Jun 07 11:22:19 2008 +0200
+++ b/tests/test-parser.c Sat Jun 07 11:36:24 2008 +0200
@@ -92,7 +92,6 @@
list = get_files ("valid");
for (l = list; l; l = l->next) {
- g_print ("VALID: %s\n", (const gchar *) l->data);
test_parser_with_file ((const gchar *) l->data, TRUE);
g_free (l->data);
}
@@ -106,7 +105,6 @@
list = get_files ("invalid");
for (l = list; l; l = l->next) {
- g_print ("INVALID: %s\n", (const gchar *) l->data);
test_parser_with_file ((const gchar *) l->data, FALSE);
g_free (l->data);
}