Merge branch 'trunk' into traffic

# Conflicts:
#	navit/route.c
#	navit/xmlconfig.c

1 files changed, 27 insertions, 43 deletions

diff --git a/navit/xmlconfig.c b/navit/xmlconfig.c
index 0df5ab042..1bf88b8af 100644
--- a/navit/xmlconfig.c
+++ b/navit/xmlconfig.c
@@ -118,7 +118,7 @@ static struct attr ** convert_to_attrs(struct xmlstate *state, struct attr_fixme
 				if (! strcmp(name, attr_fixme[0])) {
 					name=attr_fixme[1];
 					if (fixme_count++ < 10)
-						dbg(lvl_error,"Please change attribute '%s' to '%s' in <%s />\n", attr_fixme[0], attr_fixme[1], fixme->element);
+						dbg(lvl_error,"Please change attribute '%s' to '%s' in <%s />", attr_fixme[0], attr_fixme[1], fixme->element);
 					break;
 				}
 				attr_fixme+=2;
@@ -128,12 +128,12 @@ static struct attr ** convert_to_attrs(struct xmlstate *state, struct attr_fixme
 		if (ret[count])
 			count++;
 		else if (strcmp(*attribute_name,"enabled") && strcmp(*attribute_name,"xmlns:xi"))
-			dbg(lvl_error,"failed to create attribute '%s' with value '%s'\n", *attribute_name,*attribute_value);
+			dbg(lvl_error,"failed to create attribute '%s' with value '%s'", *attribute_name,*attribute_value);
 		attribute_name++;
 		attribute_value++;
 	}
 	ret[count]=NULL;
-	dbg(lvl_debug,"ret=%p\n", ret);
+	dbg(lvl_debug,"ret=%p", ret);
 	return ret;
 }
 
@@ -209,7 +209,7 @@ xmlconfig_announce(struct xmlstate *state)
 		if (itype!=type_none) {
 			navigation_set_announce(state->parent->element_attr.u.data, itype, level);
 		} else {
-			dbg(lvl_error, "Invalid type for announcement: %s\n",tok);
+			dbg(lvl_error, "Invalid type for announcement: %s",tok);
 		}
 		str=NULL;
 	}
@@ -593,7 +593,7 @@ start_element(xml_context *context,
 	const char *parent_name=NULL;
 	char *s,*sep="",*possible_parents;
 	struct attr *parent_attr;
-	dbg(lvl_info,"name='%s' parent='%s'\n", element_name, *parent ? (*parent)->element:NULL);
+	dbg(lvl_info,"name='%s' parent='%s'", element_name, *parent ? (*parent)->element:NULL);
 
 	if (!strcmp(element_name,"xml"))
 		return;
@@ -611,7 +611,7 @@ start_element(xml_context *context,
 		if (!strcmp(element_name,element_fixme[0])) {
 			element_name=element_fixme[1];
 			if (fixme_count++ < 10)
-				dbg(lvl_error,"Please change <%s /> to <%s /> in config file\n", element_fixme[0], element_fixme[1]);
+				dbg(lvl_error,"Please change <%s /> to <%s /> in config file", element_fixme[0], element_fixme[1]);
 		}
 		element_fixme+=2;
 	}
@@ -683,7 +683,7 @@ start_element(xml_context *context,
 			return;
 		new->element_attr.type=attr_from_name(element_name);
 		if (new->element_attr.type == attr_none)
-			dbg(lvl_error,"failed to create object of type '%s'\n", element_name);
+			dbg(lvl_error,"failed to create object of type '%s'", element_name);
 		if (new->element_attr.type == attr_tracking)
 			new->element_attr.type=attr_trackingo;
 		if (new->parent && new->parent->object_func && new->parent->object_func->add_attr)
@@ -704,7 +704,7 @@ end_element (xml_context *context,
 
 	if (!strcmp(element_name,"xml"))
 		return;
-	dbg(lvl_info,"name='%s'\n", element_name);
+	dbg(lvl_info,"name='%s'", element_name);
 	curr=*state;
 	if (curr->object_func && curr->object_func->init)
 		curr->object_func->init(curr->element_attr.u.data);
@@ -759,27 +759,27 @@ xinclude(xml_context *context, const gchar **attribute_names, const gchar **attr
 	doc_new.level=doc_old->level+1;
 	doc_new.user_data=doc_old->user_data;
 	if (! href) {
-		dbg(lvl_debug,"no href, using '%s'\n", doc_old->href);
+		dbg(lvl_debug,"no href, using '%s'", doc_old->href);
 		doc_new.href=doc_old->href;
 		if (file_exists(doc_new.href)) {
 		    parse_file(&doc_new, error);
 		} else {
-		    dbg(lvl_error,"Unable to include %s\n",doc_new.href);
+		    dbg(lvl_error,"Unable to include %s",doc_new.href);
 		}
 	} else {
-		dbg(lvl_debug,"expanding '%s'\n", href);
+		dbg(lvl_debug,"expanding '%s'", href);
 		we=file_wordexp_new(href);
 		we_files=file_wordexp_get_array(we);
 		count=file_wordexp_get_count(we);
-		dbg(lvl_debug,"%d results\n", count);
+		dbg(lvl_debug,"%d results", count);
 		if (file_exists(we_files[0])) {
 			for (i = 0 ; i < count ; i++) {
-				dbg(lvl_debug,"result[%d]='%s'\n", i, we_files[i]);
+				dbg(lvl_debug,"result[%d]='%s'", i, we_files[i]);
 				doc_new.href=we_files[i];
 				parse_file(&doc_new, error);
 			}
 		} else {
-			dbg(lvl_error,"Unable to include %s\n",we_files[0]);
+			dbg(lvl_error,"Unable to include %s",we_files[0]);
 		}
 		file_wordexp_destroy(we);
 
@@ -790,13 +790,6 @@ static int
 strncmp_len(const char *s1, int s1len, const char *s2)
 {
 	int ret;
-#if 0
-	char c[s1len+1];
-	strncpy(c, s1, s1len);
-	c[s1len]='\0';
-	dbg(lvl_debug,"'%s' vs '%s'\n", c, s2);
-#endif
-
 	ret=strncmp(s1, s2, s1len);
 	if (ret)
 		return ret;
@@ -834,13 +827,6 @@ xpointer_test(const char *test, int len, struct xistate *elem)
 	int eq,i,count,vlen,cond_req=1,cond=0;
 	char c;
 	const char *tmp[16];
-#if 0
-	char test2[len+1];
-
-	strncpy(test2, test, len);
-	test2[len]='\0';
-	dbg(lvl_debug,"%s\n", test2);
-#endif
 	if (!len)
 		return 0;
 	c=test[len-1];
@@ -893,7 +879,7 @@ xpointer_xpointer_match(const char *xpointer, int len, struct xistate *first)
 {
 	const char *c;
 	int s;
-	dbg(lvl_info,"%s\n", xpointer);
+	dbg(lvl_info,"%s", xpointer);
 	if (xpointer[0] != '/')
 		return 0;
 	c=xpointer+1;
@@ -1026,16 +1012,14 @@ xi_text (xml_context *context,
 				struct xmldocument *doc=user_data;
 				struct xmlstate *curr, **state = doc->user_data;
 				struct attr attr;
-				char *text_dup = malloc(text_len+1);
 
 				curr=*state;
-				strncpy(text_dup, text, text_len);
-				text_dup[text_len]='\0';
+				char *text_dup = g_strndup(text, text_len);
 				attr.type=attr_xml_text;
 				attr.u.str=text_dup;
 				if (curr->object_func && curr->object_func->add_attr && curr->element_attr.u.data)
 					curr->object_func->add_attr(curr->element_attr.u.data, &attr);
-				free(text_dup);
+				g_free(text_dup);
 				return;
 			}
 		}
@@ -1133,14 +1117,14 @@ xml_parse_text(const char *document, void *data,
 	gboolean result;
 
 	if (!document){
-		dbg(lvl_error, "FATAL: No XML data supplied.\n");
+		dbg(lvl_error, "FATAL: No XML data supplied.");
 		return 0;
 	}
 	context = g_markup_parse_context_new (&parser, 0, data, NULL);
 	result = g_markup_parse_context_parse (context, document, strlen(document), NULL);
 	g_markup_parse_context_free (context);
 	if (!result){
-		dbg(lvl_error, "FATAL: Cannot parse data as XML: '%s'\n", document);
+		dbg(lvl_error, "FATAL: Cannot parse data as XML: '%s'", document);
 		return 0;
 	}
 #else
@@ -1183,7 +1167,7 @@ parse_file(struct xmldocument *document, xmlerror **error)
 	gboolean result;
 	char *xmldir,*newxmldir,*xmlfile,*newxmlfile,*sep;
 
-	dbg(lvl_debug,"enter filename='%s'\n", document->href);
+	dbg(lvl_debug,"enter filename='%s'", document->href);
 #if GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 12
 #define G_MARKUP_TREAT_CDATA_AS_TEXT 0
 #endif
@@ -1227,7 +1211,7 @@ parse_file(struct xmldocument *document, xmlerror **error)
 		unsetenv("XMLFILE");
 	g_free(newxmldir);
 	g_free(newxmlfile);
-	dbg(lvl_debug,"return %d\n", result);
+	dbg(lvl_debug,"return %d", result);
 
 	return result;
 }
@@ -1287,7 +1271,7 @@ gboolean config_load(const char *filename, xmlerror **error)
 	item_create_hash();
 	initStatic();
 
-	dbg(lvl_debug,"enter filename='%s'\n", filename);
+	dbg(lvl_debug,"enter filename='%s'", filename);
 	memset(&document, 0, sizeof(document));
 	document.href=filename;
 	document.user_data=&curr;
@@ -1298,7 +1282,7 @@ gboolean config_load(const char *filename, xmlerror **error)
 	}
 	attr_destroy_hash();
 	item_destroy_hash();
-	dbg(lvl_debug,"return %d\n", result);
+	dbg(lvl_debug,"return %d", result);
 	return result;
 }
 
@@ -1332,7 +1316,7 @@ struct navit_object *
 navit_object_ref(struct navit_object *obj)
 {
 	obj->refcount++;
-	dbg(lvl_debug,"refcount %s %p %d\n",attr_to_name(obj->func->type),obj,obj->refcount);
+	dbg(lvl_debug,"refcount %s %p %d",attr_to_name(obj->func->type),obj,obj->refcount);
         return obj;
 }
 
@@ -1341,7 +1325,7 @@ navit_object_unref(struct navit_object *obj)
 {
 	if (obj) {
 		obj->refcount--;
-		dbg(lvl_debug,"refcount %s %p %d\n",attr_to_name(obj->func->type),obj,obj->refcount);
+		dbg(lvl_debug,"refcount %s %p %d",attr_to_name(obj->func->type),obj,obj->refcount);
 		if (obj->refcount <= 0 && obj->func && obj->func->destroy)
 			obj->func->destroy(obj);
 	}
@@ -1404,7 +1388,7 @@ navit_object_callbacks(struct navit_object *obj, struct attr *attr)
 int
 navit_object_set_attr(struct navit_object *obj, struct attr *attr)
 {
-	dbg(lvl_debug, "enter, obj=%p, attr=%p (%s)\n", obj, attr, attr_to_name(attr->type));
+	dbg(lvl_debug, "enter, obj=%p, attr=%p (%s)", obj, attr, attr_to_name(attr->type));
 	obj->attrs=attr_generic_set_attr(obj->attrs, attr);
 	navit_object_callbacks(obj, attr);
 	return 1;
@@ -1413,7 +1397,7 @@ navit_object_set_attr(struct navit_object *obj, struct attr *attr)
 int
 navit_object_add_attr(struct navit_object *obj, struct attr *attr)
 {
-	dbg(lvl_debug, "enter, obj=%p, attr=%p (%s)\n", obj, attr, attr_to_name(attr->type));
+	dbg(lvl_debug, "enter, obj=%p, attr=%p (%s)", obj, attr, attr_to_name(attr->type));
 	if (attr->type == attr_callback) {
 		struct callback_list *cbl;
 		if (obj->attrs && obj->attrs[0] && obj->attrs[0]->type == attr_callback_list)