pidgin/pidgin

Simplify hash tables that are used as sets

16 months ago, Elliott Sales de Andrade
92c8a7e3aaf5
Parents 620d1adf91f2
Children d3c594113fe1
Simplify hash tables that are used as sets

Testing Done:
Compiled only.

Reviewed at https://reviews.imfreedom.org/r/2179/
5 files changed, 20 insertions(+), 31 deletions(-)
  • +2 -3
    libpurple/protocols/facebook/data.c
  • +4 -7
    libpurple/protocols/gg/edisc.c
  • +5 -6
    libpurple/purpleconversationmanager.c
  • +7 -12
    libpurple/request.c
  • +2 -3
    pidgin/plugins/spellchk/spellchk.c
    • --- a/libpurple/protocols/facebook/data.c Thu Jan 05 22:39:17 2023 -0600
    +++ b/libpurple/protocols/facebook/data.c Thu Jan 05 22:40:46 2023 -0600
    @@ -421,7 +421,7 @@
    img->data = data;
    img->dunc = dunc;
    - g_hash_table_insert(fata->imgs, img, img);
    + g_hash_table_add(fata->imgs, img);
    return img;
    }
    @@ -522,8 +522,8 @@
    guint active = 0;
    g_return_if_fail(FB_IS_DATA(fata));
    +
    g_hash_table_iter_init(&iter, fata->imgs);
    -
    while (g_hash_table_iter_next(&iter, (gpointer *) &img, NULL)) {
    if (fb_data_image_get_active(img)) {
    active++;
    @@ -535,7 +535,6 @@
    }
    g_hash_table_iter_init(&iter, fata->imgs);
    -
    while (g_hash_table_iter_next(&iter, (gpointer *) &img, NULL)) {
    SoupMessage *msg;
    --- a/libpurple/protocols/gg/edisc.c Thu Jan 05 22:39:17 2023 -0600
    +++ b/libpurple/protocols/gg/edisc.c Thu Jan 05 22:40:46 2023 -0600
    @@ -548,10 +548,8 @@
    purple_debug_info("gg", "ggp_edisc_xfer_send_init_ticket_created: "
    "ticket \"%s\" created\n", edisc_xfer->ticket_id);
    - g_hash_table_insert(sdata->xfers_initialized,
    - edisc_xfer->ticket_id, xfer);
    - g_hash_table_insert(sdata->xfers_history,
    - g_strdup(edisc_xfer->ticket_id), GINT_TO_POINTER(1));
    + g_hash_table_insert(sdata->xfers_initialized, edisc_xfer->ticket_id, xfer);
    + g_hash_table_add(sdata->xfers_history, g_strdup(edisc_xfer->ticket_id));
    if (ack_status != GGP_EDISC_XFER_ACK_STATUS_UNKNOWN)
    ggp_edisc_xfer_send_ticket_changed(edisc_xfer->gc, xfer,
    @@ -1298,8 +1296,7 @@
    edisc_xfer = GGP_XFER(xfer);
    edisc_xfer->ticket_id = g_strdup(ticket_id);
    g_hash_table_insert(sdata->xfers_initialized, edisc_xfer->ticket_id, xfer);
    - g_hash_table_insert(sdata->xfers_history, g_strdup(ticket_id),
    - GINT_TO_POINTER(1));
    + g_hash_table_add(sdata->xfers_history, g_strdup(ticket_id));
    g_object_unref(parser);
    }
    @@ -1348,7 +1345,7 @@
    g_return_if_fail(sdata != NULL);
    - if (g_hash_table_lookup(sdata->xfers_history, ticket_id)) {
    + if (g_hash_table_contains(sdata->xfers_history, ticket_id)) {
    return;
    }
    --- a/libpurple/purpleconversationmanager.c Thu Jan 05 22:39:17 2023 -0600
    +++ b/libpurple/purpleconversationmanager.c Thu Jan 05 22:40:46 2023 -0600
    @@ -214,12 +214,12 @@
    g_return_val_if_fail(PURPLE_IS_CONVERSATION_MANAGER(manager), FALSE);
    g_return_val_if_fail(PURPLE_IS_CONVERSATION(conversation), FALSE);
    - /* g_hash_table_insert calls the key_destroy_func if the key already exists
    + /* g_hash_table_add calls the key_destroy_func if the key already exists
    * which means we don't need to worry about the reference we're creating
    - * during the insertion.
    + * during the addition.
    */
    - registered = g_hash_table_insert(manager->conversations,
    - g_object_ref(conversation), NULL);
    + registered = g_hash_table_add(manager->conversations,
    + g_object_ref(conversation));
    if(registered) {
    g_signal_emit(manager, signals[SIG_REGISTERED], 0, conversation);
    @@ -252,8 +252,7 @@
    g_return_val_if_fail(PURPLE_IS_CONVERSATION_MANAGER(manager), FALSE);
    g_return_val_if_fail(PURPLE_IS_CONVERSATION(conversation), FALSE);
    - return g_hash_table_lookup_extended(manager->conversations, conversation,
    - NULL, NULL);
    + return g_hash_table_contains(manager->conversations, conversation);
    }
    void
    --- a/libpurple/request.c Thu Jan 05 22:39:17 2023 -0600
    +++ b/libpurple/request.c Thu Jan 05 22:40:46 2023 -0600
    @@ -1566,7 +1566,7 @@
    field->u.list.selected = g_list_append(field->u.list.selected,
    g_strdup(item));
    - g_hash_table_insert(field->u.list.selected_table, g_strdup(item), NULL);
    + g_hash_table_add(field->u.list.selected_table, g_strdup(item));
    }
    void
    @@ -1581,10 +1581,7 @@
    field->u.list.selected = NULL;
    }
    - g_hash_table_destroy(field->u.list.selected_table);
    -
    - field->u.list.selected_table =
    - g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
    + g_hash_table_remove_all(field->u.list.selected_table);
    }
    void
    @@ -1606,12 +1603,11 @@
    return;
    }
    - for (l = items; l != NULL; l = l->next)
    - {
    + for (l = items; l != NULL; l = l->next) {
    + char *selected = l->data;
    field->u.list.selected = g_list_append(field->u.list.selected,
    - g_strdup(l->data));
    - g_hash_table_insert(field->u.list.selected_table,
    - g_strdup((char *)l->data), NULL);
    + g_strdup(selected));
    + g_hash_table_add(field->u.list.selected_table, g_strdup(selected));
    }
    }
    @@ -1623,8 +1619,7 @@
    g_return_val_if_fail(item != NULL, FALSE);
    g_return_val_if_fail(field->type == PURPLE_REQUEST_FIELD_LIST, FALSE);
    - return g_hash_table_lookup_extended(field->u.list.selected_table,
    - item, NULL, NULL);
    + return g_hash_table_contains(field->u.list.selected_table, item);
    }
    GList *
    --- a/pidgin/plugins/spellchk/spellchk.c Thu Jan 05 22:39:17 2023 -0600
    +++ b/pidgin/plugins/spellchk/spellchk.c Thu Jan 05 22:40:46 2023 -0600
    @@ -1808,14 +1808,13 @@
    {
    strncpy(good, buf + 5, 255);
    - if (*bad && *good && g_hash_table_lookup(hashes, bad) == NULL) {
    + if (*bad && *good && !g_hash_table_contains(hashes, bad)) {
    GtkTreeIter iter;
    /* We don't actually need to store the good string, since this
    * hash is just being used to eliminate duplicate bad strings.
    - * The value has to be non-NULL so the lookup above will work.
    */
    - g_hash_table_insert(hashes, g_strdup(bad), GINT_TO_POINTER(1));
    + g_hash_table_add(hashes, g_strdup(bad));
    if (!complete)
    case_sensitive = TRUE;