fix:gui/internal: remov compiler warnings

3 files changed, 108 insertions, 105 deletions

diff --git a/navit/gui/internal/gui_internal.c b/navit/gui/internal/gui_internal.c
index 61756b485..d9fea2d28 100644
--- a/navit/gui/internal/gui_internal.c
+++ b/navit/gui/internal/gui_internal.c
@@ -1641,6 +1641,7 @@ char *gui_internal_cmd_match_expand(char *pattern, struct attr **in) {
             break;
         case '\\':
             p=*pattern++;
+        /* fall through */
         default:
             *r++=p;
         }
@@ -1662,6 +1663,7 @@ static int gui_internal_match(const char *pattern, const char *string) {
             break;
         case '\\':
             p=*pattern++;
+        /* fall through */
         default:
             if (*string++ != p)
                 return 0;
@@ -1705,7 +1707,7 @@ int gui_internal_set(char *remove, char *add) {
 
 
 static void gui_internal_window_closed(struct gui_priv *this) {
-    gui_internal_cmd2_quit(this, NULL, NULL, NULL, NULL);
+    gui_internal_cmd2_quit(this, NULL, NULL, NULL);
 }
 
 
@@ -1914,7 +1916,7 @@ static int gui_internal_is_active_vehicle(struct gui_priv *this, struct vehicle
 
 static void save_vehicle_xml(struct vehicle *v) {
     struct attr attr;
-    struct attr_iter *iter=vehicle_attr_iter_new();
+    struct attr_iter *iter=vehicle_attr_iter_new(NULL);
     int childs=0;
     printf("<vehicle");
     while (vehicle_get_attr(v, attr_any_xml, &attr, iter)) {
diff --git a/navit/gui/internal/gui_internal_command.c b/navit/gui/internal/gui_internal_command.c
index ffd795b7d..73def7b18 100644
--- a/navit/gui/internal/gui_internal_command.c
+++ b/navit/gui/internal/gui_internal_command.c
@@ -41,16 +41,15 @@
 #include <arpa/inet.h>
 #endif
 
-static void gui_internal_cmd_escape(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
-                                    int *valid) {
+static int gui_internal_cmd_escape(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
     struct attr escaped;
     if (!in || !in[0]) {
         dbg(lvl_error,"first parameter missing or wrong type");
-        return;
+        return 0;
     }
     if (!out) {
         dbg(lvl_error,"output missing");
-        return;
+        return 0;
     }
     if (ATTR_IS_STRING(in[0]->type)) {
         escaped.type=in[0]->type;
@@ -60,15 +59,15 @@ static void gui_internal_cmd_escape(struct gui_priv *this, char *function, struc
         escaped.u.str=g_strdup_printf("%ld",in[0]->u.num);
     } else {
         dbg(lvl_error,"first parameter wrong type");
-        return;
+        return 0;
     }
     dbg(lvl_debug,"in %s result %s",in[0]->u.str,escaped.u.str);
     *out=attr_generic_add_attr(*out, attr_dup(&escaped));
     g_free(escaped.u.str);
+    return 0;
 }
 
-static void gui_internal_cmd2_about(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
-                                    int *valid) {
+static int gui_internal_cmd2_about(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
     struct widget *menu,*wb,*w;
     char *text;
 
@@ -134,15 +133,15 @@ static void gui_internal_cmd2_about(struct gui_priv *this, char *function, struc
 
     gui_internal_menu_render(this);
     graphics_draw_mode(this->gra, draw_mode_end);
+    return 0;
 }
 
-static void gui_internal_cmd2_waypoints(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
-                                        int *valid) {
+static int gui_internal_cmd2_waypoints(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
     gui_internal_select_waypoint(this, _("Waypoints"), NULL, NULL, gui_internal_cmd_position, (void*)2);
+    return 0;
 }
 
-static void gui_internal_cmd_enter_coord(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
-        int *valid) {
+static int gui_internal_cmd_enter_coord(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
     struct widget *w, *wb, *wk, *wr, *we, *wnext, *row;
     wb=gui_internal_menu(this, _("Enter Coordinates"));
     w=gui_internal_box_new(this, gravity_center|orientation_vertical|flags_expand|flags_fill);
@@ -183,18 +182,18 @@ static void gui_internal_cmd_enter_coord(struct gui_priv *this, char *function,
     else
         gui_internal_keyboard_show_native(this, w, VKBD_DEGREE, NULL);
     gui_internal_menu_render(this);
+    return 0;
 }
 
-static void gui_internal_cmd2_town(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
-                                   int *valid) {
+static int gui_internal_cmd2_town(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
     if (this->sl)
         search_list_select(this->sl, attr_country_all, 0, 0);
     gui_internal_search(this,_("Town"),"Town",1);
+    return 0;
 }
 
-static void gui_internal_cmd2_setting_vehicle(struct gui_priv *this, char *function, struct attr **in,
-        struct attr ***out,
-        int *valid) {
+static int gui_internal_cmd2_setting_vehicle(struct gui_priv *this, char *function, struct attr **in,
+        struct attr ***out) {
     struct attr attr,attr2,vattr;
     struct widget *w,*wb,*wl;
     struct attr_iter *iter;
@@ -205,7 +204,7 @@ static void gui_internal_cmd2_setting_vehicle(struct gui_priv *this, char *funct
         vehicle_get_attr(attr.u.vehicle, attr_name, &vattr, NULL);
         navit_attr_iter_destroy(iter);
         gui_internal_menu_vehicle_settings(this, attr.u.vehicle, vattr.u.str);
-        return;
+        return 0;
     }
     navit_attr_iter_destroy(iter);
 
@@ -227,10 +226,11 @@ static void gui_internal_cmd2_setting_vehicle(struct gui_priv *this, char *funct
     }
     navit_attr_iter_destroy(iter);
     gui_internal_menu_render(this);
+    return 0;
 }
 
-static void gui_internal_cmd2_setting_rules(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
-        int *valid) {
+static int gui_internal_cmd2_setting_rules(struct gui_priv *this, char *function, struct attr **in,
+        struct attr ***out) {
     struct widget *wb,*w;
     struct attr on,off;
     wb=gui_internal_menu(this, _("Rules"));
@@ -264,10 +264,10 @@ static void gui_internal_cmd2_setting_rules(struct gui_priv *this, char *functio
                                        gravity_left_center|orientation_horizontal|flags_fill,
                                        &on, &off));
     gui_internal_menu_render(this);
+    return 0;
 }
 
-static void gui_internal_cmd2_setting_maps(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
-        int *valid) {
+static int gui_internal_cmd2_setting_maps(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
     struct attr attr, on, off, description, type, data, url, active;
     struct widget *w,*wb,*row,*wma;
     char *label;
@@ -309,12 +309,11 @@ static void gui_internal_cmd2_setting_maps(struct gui_priv *this, char *function
     }
     navit_attr_iter_destroy(iter);
     gui_internal_menu_render(this);
-
+    return 0;
 }
 
-static void gui_internal_cmd2_setting_layout(struct gui_priv *this, char *function, struct attr **in,
-        struct attr ***out,
-        int *valid) {
+static int gui_internal_cmd2_setting_layout(struct gui_priv *this, char *function, struct attr **in,
+        struct attr ***out) {
     struct attr attr;
     struct widget *w,*wb,*wl,*row;
     struct attr_iter *iter;
@@ -333,6 +332,7 @@ static void gui_internal_cmd2_setting_layout(struct gui_priv *this, char *functi
     }
     navit_attr_iter_destroy(iter);
     gui_internal_menu_render(this);
+    return 0;
 }
 
 /*
@@ -345,9 +345,8 @@ static void gui_internal_cmd2_setting_layout(struct gui_priv *this, char *functi
  * comply with *.heightlines.bin
  *
  */
-static void gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *function, struct attr **in,
-        struct attr ***out,
-        int *valid) {
+static int gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *function, struct attr **in,
+        struct attr ***out) {
     struct widget * menu, *box;
     struct map * map=NULL;
     struct map_rect * mr=NULL;
@@ -431,7 +430,7 @@ static void gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *
                 w->flags=gravity_bottom_center|orientation_horizontal|flags_fill;
                 g_free(text);
                 gui_internal_menu_render(this);
-                return;
+                return 0;
             }
         }
     }
@@ -497,7 +496,7 @@ static void gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *
         gui_internal_menu_render(this);
         if(diagram_points)
             g_free(diagram_points);
-        return;
+        return 0;
     }
 
     gui_internal_menu_render(this);
@@ -559,11 +558,11 @@ static void gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *
         diagram_points=diagram_points->next;
         g_free(diagram_point);
     }
+    return 0;
 }
 
-static void gui_internal_cmd2_route_description(struct gui_priv *this, char *function, struct attr **in,
-        struct attr ***out,
-        int *valid) {
+static int gui_internal_cmd2_route_description(struct gui_priv *this, char *function, struct attr **in,
+        struct attr ***out) {
 
 
     struct widget * menu;
@@ -598,11 +597,10 @@ static void gui_internal_cmd2_route_description(struct gui_priv *this, char *fun
     gui_internal_widget_append(menu,box);
     gui_internal_populate_route_table(this,this->nav);
     gui_internal_menu_render(this);
-
+    return 0;
 }
 
-static void gui_internal_cmd2_pois(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
-                                   int *valid) {
+static int gui_internal_cmd2_pois(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
     struct widget *w;
     struct poi_param *param;
     struct attr pro;
@@ -610,11 +608,11 @@ static void gui_internal_cmd2_pois(struct gui_priv *this, char *function, struct
 
     dbg(lvl_debug,"enter");
     if (!in || !in[0])
-        return;
+        return 0;
     if (!ATTR_IS_COORD_GEO(in[0]->type))
-        return;
+        return 0;
     if (!navit_get_attr(this->nav, attr_projection, &pro, NULL))
-        return;
+        return 0;
     w=g_new0(struct widget,1);
     param=g_new0(struct poi_param,1);
     if (in[1] && ATTR_IS_STRING(in[1]->type)) {
@@ -630,10 +628,10 @@ static void gui_internal_cmd2_pois(struct gui_priv *this, char *function, struct
     gui_internal_cmd_pois(this, w, param);
     g_free(w);
     gui_internal_poi_param_free(param);
+    return 0;
 }
 
-static void gui_internal_cmd2_locale(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
-                                     int *valid) {
+static int gui_internal_cmd2_locale(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
     struct widget *menu,*wb,*w;
     char *text;
 
@@ -676,6 +674,7 @@ static void gui_internal_cmd2_locale(struct gui_priv *this, char *function, stru
 
     gui_internal_menu_render(this);
     graphics_draw_mode(this->gra, draw_mode_end);
+    return 0;
 }
 
 /**
@@ -688,8 +687,7 @@ static void gui_internal_cmd2_locale(struct gui_priv *this, char *function, stru
  * Currently only works on non Windows systems.
  *
  */
-static void gui_internal_cmd2_network_info(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
-        int *valid) {
+static int gui_internal_cmd2_network_info(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
 #if HAS_IFADDRS
     struct widget *menu,*wb,*w;
     char *text;
@@ -723,10 +721,10 @@ static void gui_internal_cmd2_network_info(struct gui_priv *this, char *function
 #else
     dbg(lvl_error, "Cannot show network info: ifaddr.h not found");
 #endif
+    return 0;
 }
 
-static void gui_internal_cmd_formerdests(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
-        int *valid) {
+static int gui_internal_cmd_formerdests(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
     struct widget *wb,*w,*wbm,*tbl=NULL;
     struct map *formerdests;
     struct map_rect *mr_formerdests;
@@ -736,15 +734,15 @@ static void gui_internal_cmd_formerdests(struct gui_priv *this, char *function,
     enum projection projection;
 
     if(!navit_get_attr(this->nav, attr_former_destination_map, &attr, NULL))
-        return;
+        return 0;
 
     formerdests=attr.u.map;
     if(!formerdests)
-        return;
+        return 0;
 
     mr_formerdests=map_rect_new(formerdests, NULL);
     if(!mr_formerdests)
-        return;
+        return 0;
 
     projection = map_projection(formerdests);
 
@@ -790,46 +788,48 @@ static void gui_internal_cmd_formerdests(struct gui_priv *this, char *function,
     }
     gui_internal_menu_render(this);
     map_rect_destroy(mr_formerdests);
+    return 0;
 }
 
-static void gui_internal_cmd2_bookmarks(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
-                                        int *valid) {
+static int gui_internal_cmd2_bookmarks(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
     char *str=NULL;
     if (in && in[0] && ATTR_IS_STRING(in[0]->type)) {
         str=in[0]->u.str;
     }
 
     gui_internal_cmd_bookmarks(this, NULL, str);
+    return 0;
 }
 
-static void gui_internal_cmd2_abort_navigation(struct gui_priv *this, char *function, struct attr **in,
-        struct attr ***out,
-        int *valid) {
+static int gui_internal_cmd2_abort_navigation(struct gui_priv *this, char *function, struct attr **in,
+        struct attr ***out) {
     navit_set_destination(this->nav, NULL, NULL, 0);
+    return 0;
 }
 
-static void gui_internal_cmd2_back(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
-                                   int *valid) {
+static int gui_internal_cmd2_back(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
     graphics_draw_mode(this->gra, draw_mode_begin);
     gui_internal_back(this, NULL, NULL);
     graphics_draw_mode(this->gra, draw_mode_end);
     gui_internal_check_exit(this);
+    return 0;
 }
 
-static void gui_internal_cmd2_back_to_map(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
-        int *valid) {
+static int gui_internal_cmd2_back_to_map(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
     gui_internal_prune_menu(this, NULL);
     gui_internal_check_exit(this);
+    return 0;
 }
 
 
-static void gui_internal_get_data(struct gui_priv *priv, char *command, struct attr **in, struct attr ***out) {
+static int gui_internal_get_data(struct gui_priv *priv, char *command, struct attr **in, struct attr ***out) {
     struct attr private_data = { attr_private_data, {(void *)&priv->data}};
     if (out)
         *out=attr_generic_add_attr(*out, &private_data);
+    return 0;
 }
 
-static void gui_internal_cmd_log(struct gui_priv *this) {
+static int gui_internal_cmd_log(struct gui_priv *this, char *command, struct attr **in, struct attr ***out) {
     struct widget *w,*wb,*wk,*wl,*we,*wnext;
     gui_internal_enter(this, 1);
     gui_internal_set_click_coord(this, NULL);
@@ -859,10 +859,10 @@ static void gui_internal_cmd_log(struct gui_priv *this) {
                                           getenv("LANG"));
     gui_internal_menu_render(this);
     gui_internal_leave(this);
+    return 0;
 }
 
-static void gui_internal_cmd_menu2(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
-                                   int *valid) {
+static int gui_internal_cmd_menu2(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
     char *href=NULL;
     int i=0, ignore=0, replace=0;
 
@@ -877,23 +877,23 @@ static void gui_internal_cmd_menu2(struct gui_priv *this, char *function, struct
 
     if (this->root.children) {
         if (!href)
-            return;
+            return 0;
         gui_internal_html_load_href(this, href, replace);
-        return;
+        return 0;
     }
     gui_internal_cmd_menu(this, ignore, href);
+    return 0;
 }
 
-static void gui_internal_cmd2_position(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
-                                       int *valid) {
+static int gui_internal_cmd2_position(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
     const char *name=_("Position");
     int flags=-1;
 
     dbg(lvl_debug,"enter");
     if (!in || !in[0])
-        return;
+        return 0;
     if (!ATTR_IS_COORD_GEO(in[0]->type))
-        return;
+        return 0;
     if (in[1] && ATTR_IS_STRING(in[1]->type)) {
         name=in[1]->u.str;
         if (in[2] && ATTR_IS_INT(in[2]->type))
@@ -901,26 +901,26 @@ static void gui_internal_cmd2_position(struct gui_priv *this, char *function, st
     }
     dbg(lvl_debug,"flags=0x%x",flags);
     gui_internal_cmd_position_do(this, NULL, in[0]->u.coord_geo, NULL, name, flags);
+    return 0;
 }
 
-static void gui_internal_cmd_redraw_map(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
-                                        int *valid) {
+static int gui_internal_cmd_redraw_map(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
     this->redraw=1;
+    return 0;
 }
 
-static void gui_internal_cmd2_refresh(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
-                                      int *valid) {
+static int gui_internal_cmd2_refresh(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
     char *href=g_strdup(this->href);
     gui_internal_html_load_href(this, href, 1);
     g_free(href);
+    return 0;
 }
 
-static void gui_internal_cmd2_set(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
-                                  int *valid) {
+static int gui_internal_cmd2_set(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
     char *pattern,*command=NULL;
     if (!in || !in[0] || !ATTR_IS_STRING(in[0]->type)) {
         dbg(lvl_error,"first parameter missing or wrong type");
-        return;
+        return 0;
     }
     pattern=in[0]->u.str;
     dbg(lvl_debug,"pattern %s",pattern);
@@ -933,16 +933,17 @@ static void gui_internal_cmd2_set(struct gui_priv *this, char *function, struct
     } else {
         gui_internal_set(pattern, NULL);
     }
-
+    return 0;
 }
 
-void gui_internal_cmd2_quit(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+int gui_internal_cmd2_quit(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
     struct attr navit;
     gui_internal_prune_menu(this, NULL);
     navit.type=attr_navit;
     navit.u.navit=this->nav;
     config_remove_attr(config, &navit);
     event_main_loop_quit();
+    return 0;
 }
 
 static char *gui_internal_append_attr(char *str, enum escape_mode mode, char *pre, struct attr *attr, char *post) {
@@ -962,12 +963,11 @@ static char *gui_internal_append_attr(char *str, enum escape_mode mode, char *pr
     return str;
 }
 
-static void gui_internal_cmd_write(struct gui_priv * this, char *function, struct attr **in, struct attr ***out,
-                                   int *valid) {
+static int gui_internal_cmd_write(struct gui_priv * this, char *function, struct attr **in, struct attr ***out) {
     char *str=NULL;
-    dbg(lvl_debug,"enter %s %p %p %p",function,in,out,valid);
+    dbg(lvl_debug,"enter %s %p %p",function,in,out);
     if (!in)
-        return;
+        return 0;
     while (*in) {
         str=gui_internal_append_attr(str, escape_mode_none, "", *in, "");
         in++;
@@ -980,6 +980,7 @@ static void gui_internal_cmd_write(struct gui_priv * this, char *function, struc
         gui_internal_html_parse_text(this, str);
     }
     g_free(str);
+    return 0;
 }
 
 static void gui_internal_onclick(struct attr ***in, char **onclick, char *set) {
@@ -1060,8 +1061,7 @@ error:
     return;
 }
 
-static void gui_internal_cmd_img(struct gui_priv * this, char *function, struct attr **in, struct attr ***out,
-                                 int *valid) {
+static int gui_internal_cmd_img(struct gui_priv * this, char *function, struct attr **in, struct attr ***out) {
     char *str=g_strdup("<img"),*suffix=NULL,*onclick=g_strdup(""),*html;
 
     if (ATTR_IS_STRING((*in)->type)) {
@@ -1108,11 +1108,10 @@ static void gui_internal_cmd_img(struct gui_priv * this, char *function, struct
 error:
     g_free(suffix);
     g_free(str);
-    return;
+    return 0;
 }
 
-static void gui_internal_cmd_debug(struct gui_priv * this, char *function, struct attr **in, struct attr ***out,
-                                   int *valid) {
+static int gui_internal_cmd_debug(struct gui_priv * this, char *function, struct attr **in, struct attr ***out) {
     char *str;
     dbg(lvl_debug,"begin");
     if (in) {
@@ -1124,9 +1123,10 @@ static void gui_internal_cmd_debug(struct gui_priv * this, char *function, struc
         }
     }
     dbg(lvl_debug,"done");
+    return 0;
 }
 
-static void gui_internal_cmd2(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+static int gui_internal_cmd2(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
     int entering=0;
     int ignore=1;
     if (in && in[0] && ATTR_IS_INT(in[0]->type)) {
@@ -1142,40 +1142,41 @@ static void gui_internal_cmd2(struct gui_priv *this, char *function, struct attr
     }
 
     if(!strcmp(function, "bookmarks"))
-        gui_internal_cmd2_bookmarks(this, function, in, out, valid);
+        gui_internal_cmd2_bookmarks(this, function, in, out);
     else if(!strcmp(function, "formerdests"))
-        gui_internal_cmd_formerdests(this, function, in, out, valid);
+        gui_internal_cmd_formerdests(this, function, in, out);
     else if(!strcmp(function, "locale"))
-        gui_internal_cmd2_locale(this, function, in, out, valid);
+        gui_internal_cmd2_locale(this, function, in, out);
     else if(!strcmp(function, "network_info"))
-        gui_internal_cmd2_network_info(this, function, in, out, valid);
+        gui_internal_cmd2_network_info(this, function, in, out);
     else if(!strcmp(function, "position"))
-        gui_internal_cmd2_position(this, function, in, out, valid);
+        gui_internal_cmd2_position(this, function, in, out);
     else if(!strcmp(function, "pois"))
-        gui_internal_cmd2_pois(this, function, in, out, valid);
+        gui_internal_cmd2_pois(this, function, in, out);
     else if(!strcmp(function, "route_description"))
-        gui_internal_cmd2_route_description(this, function, in, out, valid);
+        gui_internal_cmd2_route_description(this, function, in, out);
     else if(!strcmp(function, "route_height_profile"))
-        gui_internal_cmd2_route_height_profile(this, function, in, out, valid);
+        gui_internal_cmd2_route_height_profile(this, function, in, out);
     else if(!strcmp(function, "setting_layout"))
-        gui_internal_cmd2_setting_layout(this, function, in, out, valid);
+        gui_internal_cmd2_setting_layout(this, function, in, out);
     else if(!strcmp(function, "setting_maps"))
-        gui_internal_cmd2_setting_maps(this, function, in, out, valid);
+        gui_internal_cmd2_setting_maps(this, function, in, out);
     else if(!strcmp(function, "setting_rules"))
-        gui_internal_cmd2_setting_rules(this, function, in, out, valid);
+        gui_internal_cmd2_setting_rules(this, function, in, out);
     else if(!strcmp(function, "setting_vehicle"))
-        gui_internal_cmd2_setting_vehicle(this, function, in, out, valid);
+        gui_internal_cmd2_setting_vehicle(this, function, in, out);
     else if(!strcmp(function, "town"))
-        gui_internal_cmd2_town(this, function, in, out, valid);
+        gui_internal_cmd2_town(this, function, in, out);
     else if(!strcmp(function, "enter_coord"))
-        gui_internal_cmd_enter_coord(this, function, in, out, valid);
+        gui_internal_cmd_enter_coord(this, function, in, out);
     else if(!strcmp(function, "waypoints"))
-        gui_internal_cmd2_waypoints(this, function, in, out, valid);
+        gui_internal_cmd2_waypoints(this, function, in, out);
     else if(!strcmp(function, "about"))
-        gui_internal_cmd2_about(this, function, in, out, valid);
+        gui_internal_cmd2_about(this, function, in, out);
 
     if(entering)
         graphics_draw_mode(this->gra, draw_mode_end);
+    return 0;
 }
 
 static struct command_table commands[] = {
diff --git a/navit/gui/internal/gui_internal_command.h b/navit/gui/internal/gui_internal_command.h
index ff8a70f9c..206a5c2a0 100644
--- a/navit/gui/internal/gui_internal_command.h
+++ b/navit/gui/internal/gui_internal_command.h
@@ -3,6 +3,6 @@ struct attr;
 struct gui_priv;
 struct pcoord;
 char *gui_internal_coordinates(struct pcoord *pc, char sep);
-void gui_internal_cmd2_quit(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid);
+int gui_internal_cmd2_quit(struct gui_priv *this, char *function, struct attr **in, struct attr ***out);
 void gui_internal_command_init(struct gui_priv *this, struct attr **attrs);
 /* end of prototypes */