pidgin/pidgin

Fix some minor new warnings.

2019-10-08, Elliott Sales de Andrade
54284ab06efd
Parents df567aa3b2d5
Children 95d1e40d7de569d398c30f7d
Fix some minor new warnings.
2 files changed, 7 insertions(+), 7 deletions(-)
  • +3 -3
    libpurple/purpleaccountoption.c
  • +4 -4
    libpurple/tests/test_circular_buffer.c
    • --- a/libpurple/purpleaccountoption.c Wed Oct 09 03:07:30 2019 +0000
    +++ b/libpurple/purpleaccountoption.c Tue Oct 08 23:55:59 2019 -0400
    @@ -100,7 +100,7 @@
    if(opt->type == PURPLE_PREF_STRING) {
    opt->default_value.string = g_strdup(option->default_value.string);
    - opt->params.string.hints = g_list_copy(option->params.string.hints);
    + opt->params.string.hints = g_slist_copy(option->params.string.hints);
    }
    return opt;
    @@ -361,8 +361,8 @@
    const GSList *
    purple_account_option_string_get_hints(const PurpleAccountOption *option)
    {
    - g_return_val_if_fail(option != NULL, FALSE);
    - g_return_val_if_fail(option->type == PURPLE_PREF_STRING, FALSE);
    + g_return_val_if_fail(option != NULL, NULL);
    + g_return_val_if_fail(option->type == PURPLE_PREF_STRING, NULL);
    return option->params.string.hints;
    }
    --- a/libpurple/tests/test_circular_buffer.c Wed Oct 09 03:07:30 2019 +0000
    +++ b/libpurple/tests/test_circular_buffer.c Tue Oct 08 23:55:59 2019 -0400
    @@ -51,7 +51,7 @@
    static void
    test_circular_buffer_reset(void) {
    PurpleCircularBuffer *buffer = purple_circular_buffer_new(0);
    - const guchar *data;
    + const gchar *data;
    purple_circular_buffer_append(buffer, "abc\0", 4);
    g_assert_cmpuint(4, ==, purple_circular_buffer_get_used(buffer));
    @@ -75,7 +75,7 @@
    static void
    test_circular_buffer_mark_read(void) {
    PurpleCircularBuffer *buffer = purple_circular_buffer_new(0);
    - const guchar *data;
    + const gchar *data;
    purple_circular_buffer_append(buffer, "abc\0", 4);
    g_assert_cmpuint(4, ==, purple_circular_buffer_get_used(buffer));
    @@ -98,7 +98,7 @@
    static void
    test_circular_buffer_single_default_grow(void) {
    PurpleCircularBuffer *buffer = purple_circular_buffer_new(0);
    - const guchar *data;
    + const gchar *data;
    purple_circular_buffer_append(buffer, "abc\0", 4);
    @@ -145,4 +145,4 @@
    g_test_add_func("/circular_buffer/multiple_grows", test_circular_buffer_multiple_grows);
    return g_test_run();
    -}
    \ No newline at end of file
    +}