diff options
Diffstat (limited to 'navit/osd.c')
-rw-r--r-- | navit/osd.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/navit/osd.c b/navit/osd.c index f2ac701d1..32269700e 100644 --- a/navit/osd.c +++ b/navit/osd.c @@ -54,7 +54,7 @@ osd_new(struct attr *parent, struct attr **attrs) return NULL; new=plugin_get_category_osd(type->u.str); if (! new) { - dbg(lvl_error, "invalid OSD type '%s'\n", type->u.str); + dbg(lvl_error, "invalid OSD type '%s'", type->u.str); return NULL; } o=g_new0(struct osd, 1); @@ -72,7 +72,7 @@ osd_new(struct attr *parent, struct attr **attrs) g_free(o); o=NULL; } - dbg(lvl_debug,"new osd %p\n",o); + dbg(lvl_debug,"new osd %p",o); return o; } @@ -131,7 +131,7 @@ osd_evaluate_command(struct osd_item *this, struct navit *nav) struct attr navit; navit.type=attr_navit; navit.u.navit=nav; - dbg(lvl_debug, "calling command '%s'\n", this->command); + dbg(lvl_debug, "calling command '%s'", this->command); command_evaluate(&navit, this->command); } @@ -192,14 +192,14 @@ osd_std_calculate_sizes(struct osd_item *item, int w, int h) if (item->gr) { padding = graphics_get_data(item->gr, "padding"); if (padding) { - dbg(lvl_debug, "Got padding=%p for item=%p (item->gr=%p): left=%d top=%d right=%d bottom=%d\n", + dbg(lvl_debug, "Got padding=%p for item=%p (item->gr=%p): left=%d top=%d right=%d bottom=%d", padding, item, item->gr, padding->left, padding->top, padding->right, padding->bottom); } else { - dbg(lvl_debug, "Got padding=%p for item=%p (item->gr=%p)\n", + dbg(lvl_debug, "Got padding=%p for item=%p (item->gr=%p)", padding, item, item->gr); } } else - dbg(lvl_warning, "cannot get padding for item=%p: item->gr is NULL\n", item); + dbg(lvl_warning, "cannot get padding for item=%p: item->gr is NULL", item); /* reduce w and h by total padding in the respective dimension */ if (padding) { @@ -260,12 +260,12 @@ osd_std_keypress(struct osd_item *item, struct navit *nav, char *key) { #if 0 int i; - dbg(lvl_debug,"key=%s\n",key); + dbg(lvl_debug,"key=%s",key); for (i = 0 ; i < strlen(key) ; i++) { - dbg(lvl_debug,"key:0x%02x\n",key[i]); + dbg(lvl_debug,"key:0x%02x",key[i]); } for (i = 0 ; i < strlen(item->accesskey) ; i++) { - dbg(lvl_debug,"accesskey:0x%02x\n",item->accesskey[i]); + dbg(lvl_debug,"accesskey:0x%02x",item->accesskey[i]); } #endif if ( ! graphics_is_disabled(item->gr) && item->accesskey && key && !strcmp(key, item->accesskey)) @@ -289,14 +289,14 @@ osd_std_reconfigure(struct osd_item *item, struct command_saved *cs) { char *err = NULL; /* Error description */ - dbg(lvl_debug, "enter, item=%p, cs=%p\n", item, cs); + dbg(lvl_debug, "enter, item=%p, cs=%p", item, cs); if (!command_saved_error(cs)) { item->configured = !! command_saved_get_int(cs); if (item->gr && !(item->flags & DISABLE_OVERLAY)) graphics_overlay_disable(item->gr, !item->configured); } else { err = command_error_to_text(command_saved_error(cs)); - dbg(lvl_error, "Error in saved command: %s, cs=%p.\n", err, cs); + dbg(lvl_error, "Error in saved command: %s, cs=%p.", err, cs); g_free(err); } } @@ -387,7 +387,7 @@ osd_std_config(struct osd_item *item, struct navit *navit) struct attr attr; char *err = NULL; /* Error description */ - dbg(lvl_debug, "enter, item=%p, enable_cs=%p\n", item, item->enable_cs); + dbg(lvl_debug, "enter, item=%p, enable_cs=%p", item, item->enable_cs); if (item->enable_cs) { item->reconfig_cb = callback_new_1(callback_cast(osd_std_reconfigure), item); command_saved_set_cb(item->enable_cs, item->reconfig_cb); @@ -396,7 +396,7 @@ osd_std_config(struct osd_item *item, struct navit *navit) item->configured = !! command_saved_get_int(item->enable_cs); } else { err = command_error_to_text(command_saved_error(item->enable_cs)); - dbg(lvl_error, "Error in saved command: %s, item=%p.\n", err, item); + dbg(lvl_error, "Error in saved command: %s, item=%p.", err, item); g_free(err); } } else { @@ -412,7 +412,7 @@ osd_std_config(struct osd_item *item, struct navit *navit) void osd_set_std_config(struct navit *nav, struct osd_item *item) { - dbg(lvl_debug, "enter, item=%p\n", item); + dbg(lvl_debug, "enter, item=%p", item); item->cb = callback_new_attr_2(callback_cast(osd_std_config), attr_osd_configuration, item, nav); navit_add_callback(nav, item->cb); osd_std_config(item, nav); @@ -422,7 +422,7 @@ void osd_set_keypress(struct navit *nav, struct osd_item *item) { struct graphics *navit_gr = navit_get_graphics(nav); - dbg(lvl_info,"accesskey %s\n",item->accesskey); + dbg(lvl_info,"accesskey %s",item->accesskey); if (item->accesskey) { item->keypress_cb=callback_new_attr_2(callback_cast(osd_std_keypress), attr_keypress, item, nav); graphics_add_callback(navit_gr, item->keypress_cb); @@ -453,12 +453,12 @@ osd_set_std_graphic(struct navit *nav, struct osd_item *item, struct osd_priv *p padding = graphics_get_data(navit_gr, "padding"); if (padding) { - dbg(lvl_debug, "Got padding=%p for item=%p: left=%d top=%d right=%d bottom=%d\n", + dbg(lvl_debug, "Got padding=%p for item=%p: left=%d top=%d right=%d bottom=%d", padding, item, padding->left, padding->top, padding->right, padding->bottom); w -= (padding->left + padding->right); h -= (padding->top + padding->bottom); } else - dbg(lvl_debug, "Padding is NULL\n"); + dbg(lvl_debug, "Padding is NULL"); osd_std_calculate_sizes(item, w, h); |