Jacek Caban : winemenubuilder: Use static initalizer for mimeProgidTree and nativeMimeTypes.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: fe6a1d89919a86f2c1fcc1088f75d8486ffbdba6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fe6a1d89919a86f2c1fcc1088f75d8486ffbdba6

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Tue Aug 30 21:30:41 2016 +0200

winemenubuilder: Use static initalizer for mimeProgidTree and nativeMimeTypes.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 programs/winemenubuilder/winemenubuilder.c | 34 ++----------------------------
 1 file changed, 2 insertions(+), 32 deletions(-)

diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
index e0c6ba2..154b575 100644
--- a/programs/winemenubuilder/winemenubuilder.c
+++ b/programs/winemenubuilder/winemenubuilder.c
@@ -262,21 +262,6 @@ static int winemenubuilder_rb_string_compare(const void *key, const struct wine_
     return strcmp((char*)key, t->string);
 }
 
-static void *winemenubuilder_rb_alloc(size_t size)
-{
-    return HeapAlloc(GetProcessHeap(), 0, size);
-}
-
-static void *winemenubuilder_rb_realloc(void *ptr, size_t size)
-{
-    return HeapReAlloc(GetProcessHeap(), 0, ptr, size);
-}
-
-static void winemenubuilder_rb_free(void *ptr)
-{
-    HeapFree(GetProcessHeap(), 0, ptr);
-}
-
 static void winemenubuilder_rb_destroy(struct wine_rb_entry *entry, void *context)
 {
     struct rb_string_entry *t = WINE_RB_ENTRY_VALUE(entry, struct rb_string_entry, entry);
@@ -284,14 +269,6 @@ static void winemenubuilder_rb_destroy(struct wine_rb_entry *entry, void *contex
     HeapFree(GetProcessHeap(), 0, t);
 }
 
-static const struct wine_rb_functions winemenubuilder_rb_functions =
-{
-    winemenubuilder_rb_alloc,
-    winemenubuilder_rb_realloc,
-    winemenubuilder_rb_free,
-    winemenubuilder_rb_string_compare,
-};
-
 static void write_xml_text(FILE *file, const char *text)
 {
     int i;
@@ -2538,19 +2515,12 @@ static BOOL write_freedesktop_association_entry(const char *desktopPath, const c
 static BOOL generate_associations(const char *xdg_data_home, const char *packages_dir, const char *applications_dir)
 {
     static const WCHAR openW[] = {'o','p','e','n',0};
-    struct wine_rb_tree mimeProgidTree;
-    struct list nativeMimeTypes;
+    struct wine_rb_tree mimeProgidTree = { winemenubuilder_rb_string_compare };
+    struct list nativeMimeTypes = LIST_INIT(nativeMimeTypes);
     LSTATUS ret = 0;
     int i;
     BOOL hasChanged = FALSE;
 
-    if (wine_rb_init(&mimeProgidTree, &winemenubuilder_rb_functions))
-    {
-        WINE_ERR("wine_rb_init failed\n");
-        return FALSE;
-    }
-
-    list_init(&nativeMimeTypes);
     if (!build_native_mime_types(xdg_data_home, &nativeMimeTypes))
     {
         WINE_ERR("could not build native MIME types\n");