Remove browse_context_init()

Prefer to use designated initializers to avoid having to specify
unneeded parameters. Non-initialized members are zero-initialized
by the compiler.

Change-Id: Ia6a03c45cb3ef0b30f458d7d0ae1604a350c737c

6 files changed, 63 insertions, 51 deletions

diff --git a/apps/plugins/keyremap.c b/apps/plugins/keyremap.c
index 4fd792646e..3923cc40d0 100644
--- a/apps/plugins/keyremap.c
+++ b/apps/plugins/keyremap.c
@@ -613,13 +613,14 @@ static void keyremap_export_user_keys(void)
 static void keyremap_import_user_keys(void)
 {
     char buf[MAX_PATH];
-    struct browse_context browse;
-
-    rb->browse_context_init(&browse, SHOW_ALL, BROWSE_SELECTONLY, "Select Keymap",
-                         Icon_Plugin, "/", NULL);
-
-    browse.buf = buf;
-    browse.bufsize = sizeof(buf);
+    struct browse_context browse = {
+        .dirfilter = SHOW_ALL,
+        .flags = BROWSE_SELECTONLY,
+        .title = "Select Keymap",
+        .icon = Icon_Plugin,
+        .buf = buf,
+        .bufsize = sizeof(buf),
+    };
 
     if (rb->rockbox_browse(&browse) == GO_TO_PREVIOUS)
     {
diff --git a/apps/plugins/open_plugins.c b/apps/plugins/open_plugins.c
index 6deaf80f7d..9a2fa3593f 100644
--- a/apps/plugins/open_plugins.c
+++ b/apps/plugins/open_plugins.c
@@ -189,17 +189,20 @@ static void op_entry_set_name(void)
 static int op_entry_set_path(void)
 {
     int ret = 0;
-    struct browse_context browse;
     char tmp_buf[OPEN_PLUGIN_BUFSZ+1];
 
     if (op_entry.path[0] == '\0')
         rb->strcpy(op_entry.path, PLUGIN_DIR"/");
 
-    rb->browse_context_init(&browse, SHOW_ALL, BROWSE_SELECTONLY, rb->str(LANG_ADD),
-                         Icon_Plugin, op_entry.path, NULL);
-
-    browse.buf = tmp_buf;
-    browse.bufsize = OPEN_PLUGIN_BUFSZ;
+    struct browse_context browse = {
+        .dirfilter = SHOW_ALL,
+        .flags = BROWSE_SELECTONLY,
+        .title = rb->str(LANG_ADD),
+        .icon = Icon_Plugin,
+        .root = op_entry.path,
+        .buf = tmp_buf,
+        .bufsize = sizeof(tmp_buf),
+    };
 
     if (rb->rockbox_browse(&browse) == GO_TO_PREVIOUS)
     {
@@ -213,7 +216,6 @@ static int op_entry_set_path(void)
 static int op_entry_set_param_path(void)
 {
     int ret = 0;
-    struct browse_context browse;
     char tmp_buf[OPEN_PLUGIN_BUFSZ+1];
 
     if (op_entry.param[0] == '\0')
@@ -221,11 +223,15 @@ static int op_entry_set_param_path(void)
     else
         rb->strcpy(tmp_buf, op_entry.param);
 
-    rb->browse_context_init(&browse, SHOW_ALL, BROWSE_SELECTONLY, "",
-                         Icon_Plugin, tmp_buf, NULL);
-
-    browse.buf = tmp_buf;
-    browse.bufsize = OPEN_PLUGIN_BUFSZ;
+    struct browse_context browse = {
+        .dirfilter = SHOW_ALL,
+        .flags = BROWSE_SELECTONLY,
+        .title = rb->str(LANG_PARAMETER),
+        .icon = Icon_Plugin,
+        .root = tmp_buf,
+        .buf = tmp_buf,
+        .bufsize = sizeof(tmp_buf),
+    };
 
     if (rb->rockbox_browse(&browse) == GO_TO_PREVIOUS)
     {
diff --git a/apps/plugins/otp.c b/apps/plugins/otp.c
index 4d302563fb..356e1e5eb6 100644
--- a/apps/plugins/otp.c
+++ b/apps/plugins/otp.c
@@ -208,17 +208,16 @@ static int base32_encode(const uint8_t *data, int length, uint8_t *result,
 
 static bool browse( char *dst, int dst_size, const char *start )
 {
-    struct browse_context browse;
-
-    rb->browse_context_init(&browse, SHOW_ALL,
-                            BROWSE_SELECTONLY|BROWSE_NO_CONTEXT_MENU,
-                            NULL, NOICON, start, NULL);
-
-    browse.buf = dst;
-    browse.bufsize = dst_size;
+    struct browse_context browse = {
+        .dirfilter = SHOW_ALL,
+        .flags = BROWSE_SELECTONLY | BROWSE_NO_CONTEXT_MENU,
+        .icon = Icon_NOICON,
+        .root = start,
+        .buf = dst,
+        .bufsize = dst_size,
+    };
 
     rb->rockbox_browse(&browse);
-
     return (browse.flags & BROWSE_SELECTED);
 }
 
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c
index 09fa2c8c5f..cba1701eb6 100644
--- a/apps/plugins/rockpaint.c
+++ b/apps/plugins/rockpaint.c
@@ -1084,15 +1084,15 @@ static bool callback_show_item(char *name, int attr, struct tree_context *tc)
 
 static bool browse( char *dst, int dst_size, const char *start )
 {
-    struct browse_context browse;
-
-    rb->browse_context_init(&browse, SHOW_ALL,
-                            BROWSE_SELECTONLY|BROWSE_NO_CONTEXT_MENU,
-                            NULL, NOICON, start, NULL);
-
-    browse.callback_show_item = callback_show_item;
-    browse.buf = dst;
-    browse.bufsize = dst_size;
+    struct browse_context browse = {
+        .dirfilter = SHOW_ALL,
+        .flags = BROWSE_SELECTONLY | BROWSE_NO_CONTEXT_MENU,
+        .icon = Icon_NOICON,
+        .root = start,
+        .buf = dst,
+        .bufsize = dst_size,
+        .callback_show_item = callback_show_item,
+    };
 
     rb->rockbox_browse(&browse);
 
diff --git a/apps/plugins/speedread.c b/apps/plugins/speedread.c
index 55d8fd58e5..7a9ab61e7c 100644
--- a/apps/plugins/speedread.c
+++ b/apps/plugins/speedread.c
@@ -482,16 +482,19 @@ static void load_font(void)
 static void font_menu(void)
 {
     /* taken from text_viewer */
-    struct browse_context browse;
     char font[MAX_PATH], name[MAX_FILENAME+10];
-
     rb->snprintf(name, sizeof(name), "%s.fnt", rb->global_settings->font_file);
-    rb->browse_context_init(&browse, SHOW_FONT,
-                            BROWSE_SELECTONLY|BROWSE_NO_CONTEXT_MENU,
-                            "Font", Icon_Menu_setting, FONT_DIR, name);
 
-    browse.buf = font;
-    browse.bufsize = sizeof(font);
+    struct browse_context browse = {
+        .dirfilter = SHOW_FONT,
+        .flags = BROWSE_SELECTONLY | BROWSE_NO_CONTEXT_MENU,
+        .title = rb->str(LANG_CUSTOM_FONT),
+        .icon = Icon_Menu_setting,
+        .root = FONT_DIR,
+        .selected = name,
+        .buf = font,
+        .bufsize = sizeof(font),
+    };
 
     rb->rockbox_browse(&browse);
 
diff --git a/apps/plugins/text_viewer/tv_menu.c b/apps/plugins/text_viewer/tv_menu.c
index 3d22794f62..1cc471e207 100644
--- a/apps/plugins/text_viewer/tv_menu.c
+++ b/apps/plugins/text_viewer/tv_menu.c
@@ -200,16 +200,19 @@ static bool tv_statusbar_setting(void)
 
 static bool tv_font_setting(void)
 {
-    struct browse_context browse;
     char font[MAX_PATH], name[MAX_FILENAME+10];
-
     rb->snprintf(name, sizeof(name), "%s.fnt", new_prefs.font_name);
-    rb->browse_context_init(&browse, SHOW_FONT,
-                            BROWSE_SELECTONLY|BROWSE_NO_CONTEXT_MENU,
-                            "Font", Icon_Menu_setting, FONT_DIR, name);
 
-    browse.buf = font;
-    browse.bufsize = sizeof(font);
+    struct browse_context browse = {
+        .dirfilter = SHOW_FONT,
+        .flags = BROWSE_SELECTONLY | BROWSE_NO_CONTEXT_MENU,
+        .title = "Font", /* XXX: Translate? */
+        .icon = Icon_Menu_setting,
+        .root = FONT_DIR,
+        .selected = name,
+        .buf = font,
+        .bufsize = sizeof(font),
+    };
 
     rb->rockbox_browse(&browse);