diff options
author | Joseph Herlant <aerostitch@users.noreply.github.com> | 2018-04-26 10:12:26 -0700 |
---|---|---|
committer | jkoan <jkoan@users.noreply.github.com> | 2018-04-26 19:12:26 +0200 |
commit | 221f783ea1caaaab2f5ceadc6b0fb3e720aac3df (patch) | |
tree | 1ecf89faa1dfa550477669b05ef5c36e9864f68a /navit/attr.c | |
parent | 011bb15468b4cb626e9facecba924b04bd494d7f (diff) | |
download | navit-221f783ea1caaaab2f5ceadc6b0fb3e720aac3df.tar.gz |
Fix:debug:Change line separators for dbg to work also on win* platform (#546)
* Fix:debug:Change line separators for dbg to work also on win* platform
* Fix:debug:Break multiline dbg statements to use the new model
* Fix:debug:Move the EOL into debug_vprintf
Diffstat (limited to 'navit/attr.c')
-rw-r--r-- | navit/attr.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/navit/attr.c b/navit/attr.c index 18ad79f64..863ab08ae 100644 --- a/navit/attr.c +++ b/navit/attr.c @@ -153,7 +153,7 @@ attr_new_from_text(const char *name, const char *value) int min,max,count; ret=g_new0(struct attr, 1); - dbg(lvl_debug,"enter name='%s' value='%s'\n", name, value); + dbg(lvl_debug,"enter name='%s' value='%s'", name, value); attr=attr_from_name(name); ret->type=attr; switch (attr) { @@ -171,7 +171,7 @@ attr_new_from_text(const char *name, const char *value) ret->u.item_types[count++]=item_type; ret->u.item_types[count]=type_none; } else { - dbg(lvl_error,"Unknown item type '%s' ignored.\n",tok); + dbg(lvl_error,"Unknown item type '%s' ignored.",tok); } str=NULL; } @@ -251,13 +251,13 @@ attr_new_from_text(const char *name, const char *value) } if (value_is_relative) { if ((ret->u.num > ATTR_REL_MAXREL) || (ret->u.num < ATTR_REL_MINREL)) { - dbg(lvl_error, "Relative possibly-relative attribute with value out of range: %li\n", ret->u.num); + dbg(lvl_error, "Relative possibly-relative attribute with value out of range: %li", ret->u.num); } ret->u.num += ATTR_REL_RELSHIFT; } else { if ((ret->u.num > ATTR_REL_MAXABS) || (ret->u.num < ATTR_REL_MINABS)) { - dbg(lvl_error, "Non-relative possibly-relative attribute with value out of range: %li\n", ret->u.num); + dbg(lvl_error, "Non-relative possibly-relative attribute with value out of range: %li", ret->u.num); } } break; @@ -291,7 +291,7 @@ attr_new_from_text(const char *name, const char *value) color->b = (b << 8) | b; color->a = (a << 8) | a; } else { - dbg(lvl_error,"color %s has unknown format\n",value); + dbg(lvl_error,"color %s has unknown format",value); } break; } @@ -302,7 +302,7 @@ attr_new_from_text(const char *name, const char *value) transform_to_geo(projection_mg, &c, g); break; } - dbg(lvl_debug,"unknown attribute\n"); + dbg(lvl_debug,"unknown attribute"); g_free(ret); ret=NULL; } @@ -515,9 +515,9 @@ attr_to_text(struct attr *attr, struct map *map, int pretty) struct attr * attr_search(struct attr **attrs, struct attr *last, enum attr_type attr) { - dbg(lvl_info, "enter attrs=%p\n", attrs); + dbg(lvl_info, "enter attrs=%p", attrs); while (*attrs) { - dbg(lvl_debug,"*attrs=%p\n", *attrs); + dbg(lvl_debug,"*attrs=%p", *attrs); if ((*attrs)->type == attr) { return *attrs; } @@ -615,7 +615,7 @@ attr_generic_set_attr(struct attr **attrs, struct attr *attr) { struct attr **curr=attrs; int i,count=0; - dbg(lvl_debug, "enter, attrs=%p, attr=%p (%s)\n", attrs, attr, attr_to_name(attr->type)); + dbg(lvl_debug, "enter, attrs=%p, attr=%p (%s)", attrs, attr, attr_to_name(attr->type)); while (curr && *curr) { if ((*curr)->type == attr->type) { attr_free(*curr); @@ -648,7 +648,7 @@ attr_generic_add_attr(struct attr **attrs, struct attr *attr) { struct attr **curr=attrs; int i,count=0; - dbg(lvl_debug, "enter, attrs=%p, attr=%p (%s)\n", attrs, attr, attr_to_name(attr->type)); + dbg(lvl_debug, "enter, attrs=%p, attr=%p (%s)", attrs, attr, attr_to_name(attr->type)); while (curr && *curr) { curr++; count++; @@ -796,7 +796,7 @@ attr_data_size(struct attr *attr) while (attr->u.attr_types[i++] != attr_none); return i*sizeof(enum attr_type); } - dbg(lvl_error,"size for %s unknown\n", attr_to_name(attr->type)); + dbg(lvl_error,"size for %s unknown", attr_to_name(attr->type)); return 0; } @@ -956,7 +956,7 @@ attr_from_line(char *line, char *name, int *pos, char *val_ret, char *name_ret) int len=0,quoted; char *p,*e,*n; - dbg(lvl_debug,"get_tag %s from %s\n", name, line); + dbg(lvl_debug,"get_tag %s from %s", name, line); if (name) len=strlen(name); if (pos) |