Refactor:core:Introduce enum for debug levels, and use it everywhere.|First part of #1269.

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

5 files changed, 47 insertions, 47 deletions

diff --git a/navit/binding/dbus/binding_dbus.c b/navit/binding/dbus/binding_dbus.c
index b4bc4d183..ab2f9975d 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(1,"enter %s\n", type);
+	dbg(lvl_warning,"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(1,"return %s\n", ret);
+	dbg(lvl_warning,"return %s\n", ret);
 	return (ret);
 }
 
@@ -134,7 +134,7 @@ resolve_object(const char *opath, char *type)
 	struct attr attr;
 
 	if (strncmp(opath, object_path, strlen(object_path))) {
-		dbg(0,"wrong object path %s\n",opath);
+		dbg(lvl_error,"wrong object path %s\n",opath);
 		return NULL;
 	}
 	prefix=g_strdup_printf("%s/%s/", object_path, type);
@@ -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(0,"default_navit\n");
+			dbg(lvl_error,"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(0,"%sDBUS_TYPE_INT32: %d\n",prefix,vali);
+			dbg(lvl_error,"%sDBUS_TYPE_INT32: %d\n",prefix,vali);
 			break;
 		case DBUS_TYPE_STRING:
             		dbus_message_iter_get_basic(iter, &vals);
-			dbg(0,"%sDBUS_TYPE_STRING: %s\n",prefix,vals);
+			dbg(lvl_error,"%sDBUS_TYPE_STRING: %s\n",prefix,vals);
 			break;
 		case DBUS_TYPE_STRUCT:
-			dbg(0,"%sDBUS_TYPE_STRUCT:\n",prefix);
+			dbg(lvl_error,"%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(0,"%sDBUS_TYPE_VARIANT:\n",prefix);
+			dbg(lvl_error,"%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(0,"%sDBUS_TYPE_DICT_ENTRY:\n",prefix);
+			dbg(lvl_error,"%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(0,"%sDBUS_TYPE_ARRAY:\n",prefix);
+			dbg(lvl_error,"%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(0,"%c\n",arg);
+			dbg(lvl_error,"%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(1, "attr value: 0x%x string: %s\n", ret, attr_type);
+	dbg(lvl_warning, "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(1, "seems valid. signature: %s\n", dbus_message_iter_get_signature(&iterattr));
+	dbg(lvl_warning, "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;
@@ -812,9 +812,9 @@ request_set_add_remove_attr(DBusConnection *connection, DBusMessage *message, ch
 		destroy_attr(&attr);
 		if (ret)
 			return empty_reply(connection, message);
-		dbg(0,"failed to set/add/remove attr\n");
+		dbg(lvl_error,"failed to set/add/remove attr\n");
 	} else {
-		dbg(0,"failed to decode attr\n");
+		dbg(lvl_error,"failed to decode attr\n");
 	}
     	return dbus_error_invalid_parameter(connection, message);
 }
@@ -1121,7 +1121,7 @@ point_get_from_message(DBusMessage *message, DBusMessageIter *iter, struct point
 {
 	DBusMessageIter iter2;
 
-	dbg(0,"%s\n", dbus_message_iter_get_signature(iter));
+	dbg(lvl_error,"%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(0, " x -> %x  y -> %x\n", p->x, p->y);
+	dbg(lvl_error, " 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(0,"%s\n", dbus_message_iter_get_signature(&iter));
+	dbg(lvl_error,"%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(1,"Dumping route from dbus to %s\n", filename);
+	dbg(lvl_warning,"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(0,"%s\n", dbus_message_iter_get_signature(&iter));
+	dbg(lvl_error,"%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(0, " w -> %i  h -> %i\n", w, h);
+	dbg(lvl_error, " 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(0, " destination -> %s\n", description);
+	dbg(lvl_error, " 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(1,"path=%s\n",ret);
+	dbg(lvl_warning,"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(1,"path=%s\n",path);
+    dbg(lvl_warning,"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(1,"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_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));
 	if (dbus_message_is_method_call (message, "org.freedesktop.DBus.Introspectable", "Introspect")) {
 		DBusMessage *reply;
             	char *navitintrospectxml = generate_navitintrospectxml(dbus_message_get_path(message));
-		dbg(1,"Introspect %s:Result:%s\n",dbus_message_get_path(message), navitintrospectxml);
+		dbg(lvl_warning,"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(0,"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_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));
 	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(0,"enter %s %s %s\n",opath,command,interface);
+	dbg(lvl_error,"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(1,"enter\n");
+	dbg(lvl_warning,"enter\n");
 	dbus_error_init(&error);
 #ifdef DBUS_USE_SYSTEM_BUS
 	connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error);
@@ -2050,7 +2050,7 @@ void plugin_init(void)
 	connection = dbus_bus_get(DBUS_BUS_SESSION, &error);
 #endif
 	if (!connection) {
-		dbg(0,"Failed to open connection to session message bus: %s\n", error.message);
+		dbg(lvl_error,"Failed to open connection to session message bus: %s\n", error.message);
 		dbus_error_free(&error);
 		return;
 	}
@@ -2062,7 +2062,7 @@ void plugin_init(void)
 	dbus_connection_register_fallback(connection, object_path, &dbus_navit_vtable, NULL);
 	dbus_bus_request_name(connection, service_name, 0, &error);
 	if (dbus_error_is_set(&error)) {
-		dbg(0,"Failed to request name: %s", error.message);
+		dbg(lvl_error,"Failed to request name: %s", error.message);
 		dbus_error_free (&error);
 	}
 	callback.type=attr_callback;
diff --git a/navit/binding/python/config.c b/navit/binding/python/config.c
index ffcaed2cd..207dcdc4b 100644
--- a/navit/binding/python/config.c
+++ b/navit/binding/python/config.c
@@ -66,7 +66,7 @@ config_py(PyObject *self, PyObject *args)
 {
 	configObject *ret;
 
-	dbg(0,"enter\n");	
+	dbg(lvl_error,"enter\n");	
 	ret=PyObject_NEW(configObject, &config_Type);
 	return (PyObject *)ret;
 }
diff --git a/navit/binding/python/navit.c b/navit/binding/python/navit.c
index 413a6b938..ca87d7ffb 100644
--- a/navit/binding/python/navit.c
+++ b/navit/binding/python/navit.c
@@ -44,10 +44,10 @@ navit_get_attr_py(navitObject *self, PyObject *args)
 	if (!PyArg_ParseTuple(args, "s", &name))
 		return NULL;
 	if (!navit_get_attr(self->navit, attr_from_name(name), &attr, NULL)) {
-		dbg(0,"get_attr not ok\n");
+		dbg(lvl_error,"get_attr not ok\n");
 		Py_RETURN_NONE;
 	}
-	dbg(0,"get_attr ok\n");
+	dbg(lvl_error,"get_attr ok\n");
 	return python_object_from_attr(&attr);
 }
 
@@ -131,7 +131,7 @@ navit_py(PyObject *self, PyObject *args)
 {
 	navitObject *ret;
 
-	dbg(0,"enter\n");	
+	dbg(lvl_error,"enter\n");	
 	ret=PyObject_NEW(navitObject, &navit_Type);
 	return (PyObject *)ret;
 }
@@ -139,7 +139,7 @@ navit_py(PyObject *self, PyObject *args)
 PyObject *
 navit_py_ref(struct navit *navit)
 {
-	dbg(0,"navit=%p\n", navit);
+	dbg(lvl_error,"navit=%p\n", navit);
 	navitObject *ret=PyObject_NEW(navitObject, &navit_Type);
 	ret->navit=navit;
 	return (PyObject *)ret;
diff --git a/navit/binding/python/pcoord.c b/navit/binding/python/pcoord.c
index a4cb2640d..2ee4a9285 100644
--- a/navit/binding/python/pcoord.c
+++ b/navit/binding/python/pcoord.c
@@ -76,7 +76,7 @@ pcoord_py(PyObject *self, PyObject *args)
 	ret->pc.pro=pro;
 	ret->pc.x=c.x;
 	ret->pc.y=c.y;
-	dbg(0,"0x%x,0x%x\n", c.x, c.y);
+	dbg(lvl_error,"0x%x,0x%x\n", c.x, c.y);
 	return (PyObject *)ret;
 }
 
diff --git a/navit/binding/win32/binding_win32.c b/navit/binding/win32/binding_win32.c
index 5d33ec47e..835a2f6e2 100644
--- a/navit/binding/win32/binding_win32.c
+++ b/navit/binding/win32/binding_win32.c
@@ -60,10 +60,10 @@ struct win32_binding_private {
 static int
 win32_cmd_send_signal(struct navit *navit, char *command, struct attr **in, struct attr ***out)
 {
-	dbg(0,"this function is a stub\n");
+	dbg(lvl_error,"this function is a stub\n");
 	if (in) {
 		while (*in) {
-			dbg(0,"another attribute to be sent\n");
+			dbg(lvl_error,"another attribute to be sent\n");
 			in++;
 		}
 	}
@@ -84,23 +84,23 @@ win32_wm_copydata(struct win32_binding_private *this, int *hwndSender, COPYDATAS
         navit.type=attr_navit;
         navit.u.navit=this->navit;
         if(cpd->dwData!=NAVIT_BINDING_W32_DWDATA) {
-        	dbg(0,"COPYDATA message came with wrong DWDATA value, expected %d, got %d.\n",NAVIT_BINDING_W32_DWDATA,cpd->dwData);
+        	dbg(lvl_error,"COPYDATA message came with wrong DWDATA value, expected %d, got %d.\n",NAVIT_BINDING_W32_DWDATA,cpd->dwData);
         	return;
         }
         if(cpd->cbData<sizeof(*msg)) {
-        	dbg(0,"COPYDATA message too short, expected >=%d, got %d.\n",sizeof(*msg),cpd->cbData);
+        	dbg(lvl_error,"COPYDATA message too short, expected >=%d, got %d.\n",sizeof(*msg),cpd->cbData);
         	return;
         }
         msg=cpd->lpData;
         if(cpd->dwData!=NAVIT_BINDING_W32_VERSION) {
-        	dbg(0,"Got request with wrong version number, expected %d, got %d.\n",NAVIT_BINDING_W32_VERSION,msg->version);
+        	dbg(lvl_error,"Got request with wrong version number, expected %d, got %d.\n",NAVIT_BINDING_W32_VERSION,msg->version);
         	return;
         }
         if(strcmp(NAVIT_BINDING_W32_MAGIC,msg->magic)) {
-        	dbg(0,"Got request with wrong MAGIC, expected %s, got %*s.\n",NAVIT_BINDING_W32_MAGIC, msg->magic,sizeof(msg->magic));
+        	dbg(lvl_error,"Got request with wrong MAGIC, expected %s, got %*s.\n",NAVIT_BINDING_W32_MAGIC, msg->magic,sizeof(msg->magic));
         	return;
         }
-	dbg(0,"Running command %s\n", msg->text);
+	dbg(lvl_error,"Running command %s\n", msg->text);
         command_evaluate(&navit, msg->text);
 }
 
@@ -120,9 +120,9 @@ static void
 win32_main_navit(struct win32_binding_private *this, struct navit *navit, int added)
 {
 	struct attr attr;
-	dbg(0,"enter\n");
+	dbg(lvl_error,"enter\n");
 	if (added==1) {
-		dbg(0,"enter2\n");
+		dbg(lvl_error,"enter2\n");
 		this->navit=navit;
 		command_add_table_attr(commands, sizeof(commands)/sizeof(struct command_table), navit, &attr);
 		navit_add_attr(navit, &attr);
@@ -137,7 +137,7 @@ void plugin_init(void)
 {
 	struct attr callback;
 	struct win32_binding_private *this=g_new0(struct win32_binding_private,1);
-	dbg(0,"enter\n");
+	dbg(lvl_error,"enter\n");
 	callback.type=attr_callback;
 	callback.u.callback=callback_new_attr_1(callback_cast(win32_main_navit),attr_navit,this);
 	config_add_attr(config, &callback);