pidgin/pidgin

Replace struct _purple_logsize_user with PurpleKeyValuePair

2021-02-28, Arkadiy Illarionov
1311bfd4c79a
Parents 0a69216b0b3f
Children 1b672557ad9f
Replace struct _purple_logsize_user with PurpleKeyValuePair

Replace `struct _purple_logsize_user` with `PurpleKeyValuePair`.

Testing Done:
Compile, run.

Reviewed at https://reviews.imfreedom.org/r/546/
1 files changed, 20 insertions(+), 45 deletions(-)
  • +20 -45
    libpurple/log.c
    • --- a/libpurple/log.c Sun Feb 28 21:46:06 2021 -0600
    +++ b/libpurple/log.c Sun Feb 28 21:49:40 2021 -0600
    @@ -41,10 +41,6 @@
    static PurpleLogLogger *html_logger;
    static PurpleLogLogger *txt_logger;
    -struct _purple_logsize_user {
    - char *name;
    - PurpleAccount *account;
    -};
    static GHashTable *logsize_users = NULL;
    static GHashTable *logsize_users_decayed = NULL;
    @@ -109,7 +105,7 @@
    void purple_log_write(PurpleLog *log, PurpleMessageFlags type,
    const char *from, GDateTime *time, const char *message)
    {
    - struct _purple_logsize_user *lu;
    + PurpleKeyValuePair *lu;
    gsize written, total = 0;
    gpointer ptrsize;
    @@ -119,23 +115,16 @@
    written = (log->logger->write)(log, type, from, time, message);
    - lu = g_new(struct _purple_logsize_user, 1);
    -
    - lu->name = g_strdup(purple_normalize(log->account, log->name));
    - lu->account = log->account;
    + lu = purple_key_value_pair_new(purple_normalize(log->account, log->name), log->account);
    if(g_hash_table_lookup_extended(logsize_users, lu, NULL, &ptrsize)) {
    - char *tmp = lu->name;
    -
    total = GPOINTER_TO_INT(ptrsize);
    total += written;
    g_hash_table_replace(logsize_users, lu, GINT_TO_POINTER(total));
    /* The hash table takes ownership of lu, so create a new one
    * for the logsize_users_decayed check below. */
    - lu = g_new(struct _purple_logsize_user, 1);
    - lu->name = g_strdup(tmp);
    - lu->account = log->account;
    + lu = purple_key_value_pair_new(lu->key, log->account);
    }
    if(g_hash_table_lookup_extended(logsize_users_decayed, lu, NULL, &ptrsize)) {
    @@ -143,8 +132,7 @@
    total += written;
    g_hash_table_replace(logsize_users_decayed, lu, GINT_TO_POINTER(total));
    } else {
    - g_free(lu->name);
    - g_free(lu);
    + purple_key_value_pair_free(lu);
    }
    }
    @@ -169,21 +157,16 @@
    return 0;
    }
    -static guint _purple_logsize_user_hash(struct _purple_logsize_user *lu)
    +static guint
    +_purple_logsize_user_hash(PurpleKeyValuePair *lu)
    {
    - return g_str_hash(lu->name);
    + return g_str_hash(lu->key);
    }
    -static guint _purple_logsize_user_equal(struct _purple_logsize_user *lu1,
    - struct _purple_logsize_user *lu2)
    +static guint
    +_purple_logsize_user_equal(PurpleKeyValuePair *lu1, PurpleKeyValuePair *lu2)
    {
    - return (lu1->account == lu2->account && purple_strequal(lu1->name, lu2->name));
    -}
    -
    -static void _purple_logsize_user_free_key(struct _purple_logsize_user *lu)
    -{
    - g_free(lu->name);
    - g_free(lu);
    + return (lu1->value == lu2->value && purple_strequal(lu1->key, lu2->key));
    }
    int purple_log_get_total_size(PurpleLogType type, const char *name, PurpleAccount *account)
    @@ -191,16 +174,12 @@
    gpointer ptrsize;
    int size = 0;
    GSList *n;
    - struct _purple_logsize_user *lu;
    + PurpleKeyValuePair *lu;
    - lu = g_new(struct _purple_logsize_user, 1);
    - lu->name = g_strdup(purple_normalize(account, name));
    - lu->account = account;
    -
    + lu = purple_key_value_pair_new(purple_normalize(account, name), account);
    if(g_hash_table_lookup_extended(logsize_users, lu, NULL, &ptrsize)) {
    size = GPOINTER_TO_INT(ptrsize);
    - g_free(lu->name);
    - g_free(lu);
    + purple_key_value_pair_free(lu);
    } else {
    for (n = loggers; n; n = n->next) {
    PurpleLogLogger *logger = n->data;
    @@ -232,16 +211,12 @@
    gpointer ptrscore;
    int score;
    GSList *n;
    - struct _purple_logsize_user *lu;
    + PurpleKeyValuePair *lu;
    - lu = g_new(struct _purple_logsize_user, 1);
    - lu->name = g_strdup(purple_normalize(account, name));
    - lu->account = account;
    -
    + lu = purple_key_value_pair_new(purple_normalize(account, name), account);
    if(g_hash_table_lookup_extended(logsize_users_decayed, lu, NULL, &ptrscore)) {
    score = GPOINTER_TO_INT(ptrscore);
    - g_free(lu->name);
    - g_free(lu);
    + purple_key_value_pair_free(lu);
    } else {
    GDateTime *now = g_date_time_new_now_utc();
    double score_double = 0.0;
    @@ -647,11 +622,11 @@
    purple_prefs_trigger_callback("/purple/logging/format");
    logsize_users = g_hash_table_new_full((GHashFunc)_purple_logsize_user_hash,
    - (GEqualFunc)_purple_logsize_user_equal,
    - (GDestroyNotify)_purple_logsize_user_free_key, NULL);
    + (GEqualFunc)_purple_logsize_user_equal,
    + (GDestroyNotify)purple_key_value_pair_free, NULL);
    logsize_users_decayed = g_hash_table_new_full((GHashFunc)_purple_logsize_user_hash,
    - (GEqualFunc)_purple_logsize_user_equal,
    - (GDestroyNotify)_purple_logsize_user_free_key, NULL);
    + (GEqualFunc)_purple_logsize_user_equal,
    + (GDestroyNotify)purple_key_value_pair_free, NULL);
    }
    void