Fix:core:Change all logging at lvl_error/warning to lvl_debug, unless it looks like an error message.|#1269, part 5

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5967 ffa7fe5e-494d-0410-b361-a75ebd5db220

1 files changed, 26 insertions, 26 deletions

diff --git a/navit/binding/dbus/binding_dbus.c b/navit/binding/dbus/binding_dbus.c
index ab2f9975d..36d3fb079 100644
--- a/navit/binding/dbus/binding_dbus.c
+++ b/navit/binding/dbus/binding_dbus.c
@@ -84,7 +84,7 @@ object_new(char *type, void *object)
 {
 	int id;
 	char *ret;
-	dbg(lvl_warning,"enter %s\n", type);
+	dbg(lvl_debug,"enter %s\n", type);
 	if ((ret=g_hash_table_lookup(object_hash_rev, object)))
 		return ret;
 	id=GPOINTER_TO_INT(g_hash_table_lookup(object_count, type));
@@ -92,7 +92,7 @@ object_new(char *type, void *object)
 	ret=g_strdup_printf("%s/%s/%d", object_path, type, id);
 	g_hash_table_insert(object_hash, ret, object);
 	g_hash_table_insert(object_hash_rev, object, ret);
-	dbg(lvl_warning,"return %s\n", ret);
+	dbg(lvl_debug,"return %s\n", ret);
 	return (ret);
 }
 
@@ -151,7 +151,7 @@ resolve_object(const char *opath, char *type)
 		if (!config_get_attr(config, attr_navit, &navit, NULL))
 			return NULL;
 		if (!oprefix[0]) {
-			dbg(lvl_error,"default_navit\n");
+			dbg(lvl_debug,"default_navit\n");
 			return navit.u.navit;
 		}
 		if (!strncmp(oprefix,def_graphics,strlen(def_graphics))) {
@@ -382,42 +382,42 @@ dbus_dump_iter(char *prefix, DBusMessageIter *iter)
 		switch (arg) {
 		case DBUS_TYPE_INT32:
             		dbus_message_iter_get_basic(iter, &vali);
-			dbg(lvl_error,"%sDBUS_TYPE_INT32: %d\n",prefix,vali);
+			dbg(lvl_debug,"%sDBUS_TYPE_INT32: %d\n",prefix,vali);
 			break;
 		case DBUS_TYPE_STRING:
             		dbus_message_iter_get_basic(iter, &vals);
-			dbg(lvl_error,"%sDBUS_TYPE_STRING: %s\n",prefix,vals);
+			dbg(lvl_debug,"%sDBUS_TYPE_STRING: %s\n",prefix,vals);
 			break;
 		case DBUS_TYPE_STRUCT:
-			dbg(lvl_error,"%sDBUS_TYPE_STRUCT:\n",prefix);
+			dbg(lvl_debug,"%sDBUS_TYPE_STRUCT:\n",prefix);
 			prefixr=g_strdup_printf("%s  ",prefix);
         		dbus_message_iter_recurse(iter, &iterr);
 			dbus_dump_iter(prefixr, &iterr);
 			g_free(prefixr);
 			break;
 		case DBUS_TYPE_VARIANT:
-			dbg(lvl_error,"%sDBUS_TYPE_VARIANT:\n",prefix);
+			dbg(lvl_debug,"%sDBUS_TYPE_VARIANT:\n",prefix);
 			prefixr=g_strdup_printf("%s  ",prefix);
         		dbus_message_iter_recurse(iter, &iterr);
 			dbus_dump_iter(prefixr, &iterr);
 			g_free(prefixr);
 			break;
 		case DBUS_TYPE_DICT_ENTRY:
-			dbg(lvl_error,"%sDBUS_TYPE_DICT_ENTRY:\n",prefix);
+			dbg(lvl_debug,"%sDBUS_TYPE_DICT_ENTRY:\n",prefix);
 			prefixr=g_strdup_printf("%s  ",prefix);
         		dbus_message_iter_recurse(iter, &iterr);
 			dbus_dump_iter(prefixr, &iterr);
 			g_free(prefixr);
 			break;
 		case DBUS_TYPE_ARRAY:
-			dbg(lvl_error,"%sDBUS_TYPE_ARRAY:\n",prefix);
+			dbg(lvl_debug,"%sDBUS_TYPE_ARRAY:\n",prefix);
 			prefixr=g_strdup_printf("%s  ",prefix);
         		dbus_message_iter_recurse(iter, &iterr);
 			dbus_dump_iter(prefixr, &iterr);
 			g_free(prefixr);
 			break;
 		default:
-			dbg(lvl_error,"%c\n",arg);
+			dbg(lvl_debug,"%c\n",arg);
 		}
 		dbus_message_iter_next(iter);
 	}
@@ -517,7 +517,7 @@ decode_attr_type_from_iter(DBusMessageIter *iter)
 	dbus_message_iter_get_basic(iter, &attr_type);
 	dbus_message_iter_next(iter);
 	ret=attr_from_name(attr_type);
-	dbg(lvl_warning, "attr value: 0x%x string: %s\n", ret, attr_type);
+	dbg(lvl_debug, "attr value: 0x%x string: %s\n", ret, attr_type);
 	return ret;
 }
 
@@ -534,7 +534,7 @@ decode_attr_from_iter(DBusMessageIter *iter, struct attr *attr)
 
 	dbus_message_iter_recurse(iter, &iterattr);
 	dbus_message_iter_next(iter);
-	dbg(lvl_warning, "seems valid. signature: %s\n", dbus_message_iter_get_signature(&iterattr));
+	dbg(lvl_debug, "seems valid. signature: %s\n", dbus_message_iter_get_signature(&iterattr));
 
 	if (attr->type >= attr_type_item_begin && attr->type <= attr_type_item_end)
 		return 0;
@@ -1121,7 +1121,7 @@ point_get_from_message(DBusMessage *message, DBusMessageIter *iter, struct point
 {
 	DBusMessageIter iter2;
 
-	dbg(lvl_error,"%s\n", dbus_message_iter_get_signature(iter));
+	dbg(lvl_debug,"%s\n", dbus_message_iter_get_signature(iter));
 
 	dbus_message_iter_recurse(iter, &iter2);
 
@@ -1135,7 +1135,7 @@ point_get_from_message(DBusMessage *message, DBusMessageIter *iter, struct point
 		return 0;
 	dbus_message_iter_get_basic(&iter2, &p->y);
 
-	dbg(lvl_error, " x -> %x  y -> %x\n", p->x, p->y);
+	dbg(lvl_debug, " x -> %x  y -> %x\n", p->x, p->y);
 
 	dbus_message_iter_next(&iter2);
 
@@ -1268,7 +1268,7 @@ request_navit_zoom(DBusConnection *connection, DBusMessage *message)
 		return dbus_error_invalid_object_path(connection, message);
 
 	dbus_message_iter_init(message, &iter);
-	dbg(lvl_error,"%s\n", dbus_message_iter_get_signature(&iter));
+	dbg(lvl_debug,"%s\n", dbus_message_iter_get_signature(&iter));
 
 	dbus_message_iter_get_basic(&iter, &factor);
 
@@ -1313,7 +1313,7 @@ request_navit_route_export_gpx(DBusConnection *connection, DBusMessage *message)
 		pp=&p;
 	}
 
-	dbg(lvl_warning,"Dumping route from dbus to %s\n", filename);
+	dbg(lvl_debug,"Dumping route from dbus to %s\n", filename);
 
 	struct map * map=NULL;
 	struct navigation * nav = NULL;
@@ -1392,7 +1392,7 @@ request_navit_resize(DBusConnection *connection, DBusMessage *message)
 		return dbus_error_invalid_object_path(connection, message);
 
 	dbus_message_iter_init(message, &iter);
-	dbg(lvl_error,"%s\n", dbus_message_iter_get_signature(&iter));
+	dbg(lvl_debug,"%s\n", dbus_message_iter_get_signature(&iter));
 
 	if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_INT32)
 		return dbus_error_invalid_parameter(connection, message);
@@ -1404,7 +1404,7 @@ request_navit_resize(DBusConnection *connection, DBusMessage *message)
 		return dbus_error_invalid_parameter(connection, message);
 	dbus_message_iter_get_basic(&iter, &h);
 
-	dbg(lvl_error, " w -> %i  h -> %i\n", w, h);
+	dbg(lvl_debug, " w -> %i  h -> %i\n", w, h);
 
 	navit_handle_resize(navit, w, h);
 
@@ -1503,7 +1503,7 @@ request_navit_set_destination(DBusConnection *connection, DBusMessage *message)
 
 	dbus_message_iter_next(&iter);
 	dbus_message_iter_get_basic(&iter, &description);
-	dbg(lvl_error, " destination -> %s\n", description);
+	dbg(lvl_debug, " destination -> %s\n", description);
 
 	navit_set_destination(navit, &pc, description, 1);
 	return empty_reply(connection, message);
@@ -1865,7 +1865,7 @@ introspect_path(const char *object)
 	if (strncmp(object, object_path, strlen(object_path)))
 		return NULL;
 	ret=g_strdup(object+strlen(object_path));
-	dbg(lvl_warning,"path=%s\n",ret);
+	dbg(lvl_debug,"path=%s\n",ret);
 	for (i = strlen(ret)-1 ; i >= 0 ; i--) {
 		if (ret[i] == '/' || (ret[i] >= '0' && ret[i] <= '9'))
 			ret[i]='\0';
@@ -1893,7 +1893,7 @@ generate_navitintrospectxml(const char *object)
     char *path=introspect_path(object);
     if (!path)
 	return NULL;
-    dbg(lvl_warning,"path=%s\n",path);
+    dbg(lvl_debug,"path=%s\n",path);
 
     // write header and make navit introspectable
     navitintrospectxml = g_strdup_printf("%s%s%s\n", navitintrospectxml_head1, object, navitintrospectxml_head2);
@@ -1936,11 +1936,11 @@ navit_handler_func(DBusConnection *connection, DBusMessage *message, void *user_
 {
 	int i;
 	char *path;
-	dbg(lvl_warning,"type=%s interface=%s path=%s member=%s signature=%s\n", dbus_message_type_to_string(dbus_message_get_type(message)), dbus_message_get_interface(message), dbus_message_get_path(message), dbus_message_get_member(message), dbus_message_get_signature(message));
+	dbg(lvl_debug,"type=%s interface=%s path=%s member=%s signature=%s\n", dbus_message_type_to_string(dbus_message_get_type(message)), dbus_message_get_interface(message), dbus_message_get_path(message), dbus_message_get_member(message), dbus_message_get_signature(message));
 	if (dbus_message_is_method_call (message, "org.freedesktop.DBus.Introspectable", "Introspect")) {
 		DBusMessage *reply;
             	char *navitintrospectxml = generate_navitintrospectxml(dbus_message_get_path(message));
-		dbg(lvl_warning,"Introspect %s:Result:%s\n",dbus_message_get_path(message), navitintrospectxml);
+		dbg(lvl_debug,"Introspect %s:Result:%s\n",dbus_message_get_path(message), navitintrospectxml);
 		if (navitintrospectxml) {
 			reply = dbus_message_new_method_return(message);
 			dbus_message_append_args(reply, DBUS_TYPE_STRING, &navitintrospectxml, DBUS_TYPE_INVALID);
@@ -1974,7 +1974,7 @@ static DBusObjectPathVTable dbus_navit_vtable = {
 DBusHandlerResult
 filter(DBusConnection *connection, DBusMessage *message, void *user_data)
 {
-	dbg(lvl_error,"type=%s interface=%s path=%s member=%s signature=%s\n", dbus_message_type_to_string(dbus_message_get_type(message)), dbus_message_get_interface(message), dbus_message_get_path(message), dbus_message_get_member(message), dbus_message_get_signature(message));
+	dbg(lvl_debug,"type=%s interface=%s path=%s member=%s signature=%s\n", dbus_message_type_to_string(dbus_message_get_type(message)), dbus_message_get_interface(message), dbus_message_get_path(message), dbus_message_get_member(message), dbus_message_get_signature(message));
 	if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) {
 	}
 	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
@@ -1987,7 +1987,7 @@ dbus_cmd_send_signal(struct navit *navit, char *command, struct attr **in, struc
 	DBusMessage* msg;
 	char *opath=object_new("navit",navit);
 	char *interface=g_strdup_printf("%s%s", service_name, ".navit");
-	dbg(lvl_error,"enter %s %s %s\n",opath,command,interface);
+	dbg(lvl_debug,"enter %s %s %s\n",opath,command,interface);
 	msg = dbus_message_new_signal(opath, interface, "signal");
 	if (msg) {
 		DBusMessageIter iter1,iter2,iter3;
@@ -2042,7 +2042,7 @@ void plugin_init(void)
 	object_hash=g_hash_table_new(g_str_hash, g_str_equal);
 	object_hash_rev=g_hash_table_new(NULL, NULL);
 	object_count=g_hash_table_new(g_str_hash, g_str_equal);
-	dbg(lvl_warning,"enter\n");
+	dbg(lvl_debug,"enter\n");
 	dbus_error_init(&error);
 #ifdef DBUS_USE_SYSTEM_BUS
 	connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error);