pidgin/pidgin

Fix some new warnings in zephyr.

2021-01-26, Elliott Sales de Andrade
611ae5d8a232
Parents c2b876aa4c03
Children c3cb91c3b693
Fix some new warnings in zephyr.

* The `ZSubscription_t` struct uses non-const pointers, but we aren't doing anything with them really, so just cast the things we're inserting.
* The removed `zephyr` variable already exists higher up in the function.

Testing Done:
Compile

Reviewed at https://reviews.imfreedom.org/r/457/
1 files changed, 2 insertions(+), 3 deletions(-)
  • +2 -3
    libpurple/protocols/zephyr/zephyr.c
    • --- a/libpurple/protocols/zephyr/zephyr.c Tue Jan 26 02:01:37 2021 -0600
    +++ b/libpurple/protocols/zephyr/zephyr.c Tue Jan 26 03:16:56 2021 -0600
    @@ -470,12 +470,11 @@
    } else {
    ZSubscription_t sub = {
    .zsub_class = notice.z_class,
    - .zsub_classinst = notice.z_class_inst,
    - .zsub_recipient = notice.z_recipient
    + .zsub_classinst = (gchar *)notice.z_class_inst,
    + .zsub_recipient = (gchar *)notice.z_recipient
    };
    zephyr_triple *zt;
    gchar *send_inst_utf8;
    - zephyr_account *zephyr = purple_connection_get_protocol_data(gc);
    GSList *l = g_slist_find_custom(zephyr->subscrips, &sub, (GCompareFunc)zephyr_triple_subset);
    if (!l) {