Changeset 513be3b

Timestamp:

2015-05-15T10:17:12Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

63b017e

Parents:

600e09c

Message:

Don't use GLib 2.32+ g_hash_table_add/_contains functions.

File:

• protocols/rpc/rpc.c (modified) (2 diffs)

protocols/rpc/rpc.c

@@ -789 +789 @@
         ret->func = rpc_ ## func
 #define RPC_ADD_OPT_FUNC(func) \
-        if (g_hash_table_contains(methods, #func)) \
+        if (g_hash_table_lookup(methods, #func)) \
                 RPC_ADD_FUNC(func)
 
@@ -904 +904 @@
         JSON_Array *methods_a = json_object_get_array(isup, "method_list");
         GHashTable *methods = g_hash_table_new(g_str_hash, g_str_equal);
-        for (i = 0; i < json_array_get_count(methods_a); i++)
-                g_hash_table_add(methods, (void*) json_array_get_string(methods_a, i));
+        for (i = 0; i < json_array_get_count(methods_a); i++) {
+                gpointer func = (void*) json_array_get_string(methods_a, i);
+                g_hash_table_replace(methods, func, func);
+        }
 
         ret->init = rpc_init;