diff src/rcfile.c @ 1464:1b3751ac4743

be more verbose on parse errors
author nadvornik
date Fri, 20 Mar 2009 10:12:29 +0000
parents 25168240a247
children 6e020d3ab168
line wrap: on
line diff
--- a/src/rcfile.c	Fri Mar 20 09:46:35 2009 +0000
+++ b/src/rcfile.c	Fri Mar 20 10:12:29 2009 +0000
@@ -721,7 +721,7 @@
 		if (READ_BOOL(*options, metadata.confirm_on_image_change)) continue;
 		if (READ_BOOL(*options, metadata.confirm_on_dir_change)) continue;
 
-		DEBUG_1("unknown attribute %s = %s", option, value);
+		log_printf("unknown attribute %s = %s\n", option, value);
 		}
 
 	return TRUE;
@@ -740,7 +740,7 @@
 		if (READ_INT(options->color_profile, screen_type)) continue;
 		if (READ_CHAR(options->color_profile, screen_file)) continue;
 
-		DEBUG_1("unknown attribute %s = %s", option, value);
+		log_printf("unknown attribute %s = %s\n", option, value);
 		}
 
 }
@@ -756,9 +756,8 @@
 
 		if (READ_CHAR_FULL("input_file", options->color_profile.input_file[i])) continue;
 		if (READ_CHAR_FULL("input_name", options->color_profile.input_name[i])) continue;
-		
 
-		DEBUG_1("unknown attribute %s = %s", option, value);
+		log_printf("unknown attribute %s = %s\n", option, value);
 		}
 	i++;
 	options_parse_func_set_data(parser_data, GINT_TO_POINTER(i));
@@ -781,7 +780,7 @@
 
 void options_parse_leaf(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
 {
-	DEBUG_1("unexpected: %s", element_name);
+	log_printf("unexpected: %s\n", element_name);
 	options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
 }
 
@@ -794,7 +793,7 @@
 		}
 	else
 		{
-		DEBUG_1("unexpected profile: %s", element_name);
+		log_printf("unexpected in <profile>: <%s>\n", element_name);
 		options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
 		}
 }
@@ -808,7 +807,7 @@
 		}
 	else
 		{
-		DEBUG_1("unexpected filter: %s", element_name);
+		log_printf("unexpected in <filter>: <%s>\n", element_name);
 		options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
 		}
 }
@@ -836,7 +835,7 @@
 		}
 	else
 		{
-		DEBUG_1("unexpected in <keyword>: <%s>", element_name);
+		log_printf("unexpected in <keyword>: <%s>\n", element_name);
 		options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
 		}
 }
@@ -852,7 +851,7 @@
 		}
 	else
 		{
-		DEBUG_1("unexpected in <keyword_tree>: <%s>", element_name);
+		log_printf("unexpected in <keyword_tree>: <%s>\n", element_name);
 		options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
 		}
 }
@@ -876,7 +875,7 @@
 		}
 	else
 		{
-		DEBUG_1("unexpected global: %s", element_name);
+		log_printf("unexpected in <global>: <%s>\n", element_name);
 		options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
 		}
 }
@@ -897,7 +896,7 @@
 		}
 	else
 		{
-		DEBUG_1("unexpected in <pane_exif>: <%s>", element_name);
+		log_printf("unexpected in <pane_exif>: <%s>\n", element_name);
 		options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
 		}
 }
@@ -931,7 +930,7 @@
 		}
 	else
 		{
-		DEBUG_1("unexpected in <bar>: <%s>", element_name);
+		log_printf("unexpected in <bar>: <%s>\n", element_name);
 		options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
 		}
 }
@@ -946,7 +945,7 @@
 		}
 	else
 		{
-		DEBUG_1("unexpected in <toolbar>: <%s>", element_name);
+		log_printf("unexpected in <toolbar>: <%s>\n", element_name);
 		options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
 		}
 }
@@ -973,7 +972,7 @@
 		}
 	else
 		{
-		DEBUG_1("unexpected in <layout>: <%s>", element_name);
+		log_printf("unexpected in <layout>: <%s>\n", element_name);
 		options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
 		}
 }
@@ -1007,7 +1006,7 @@
 		}
 	else
 		{
-		DEBUG_1("unexpected in <toplevel>: <%s>", element_name);
+		log_printf("unexpected in <toplevel>: <%s>\n", element_name);
 		options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
 		}
 }