diff options
| author | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2023-03-21 00:39:45 -0500 |
|---|---|---|
| committer | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2023-03-21 00:39:45 -0500 |
| commit | 1b4f76976e1a069831b98518588f587be79b122c (patch) | |
| tree | 0558873858c1d4b3fb27069c4932d729e3a7f397 /libpurple/request-datasheet.c | |
| parent | ae674f38b973f59afa38f5fbcb8b4c069188e59f (diff) | |
| download | pidgin-1b4f76976e1a069831b98518588f587be79b122c.tar.gz | |
Use g_clear_* helpers where useful
That is:
* when the variable is set to `NULL` right after freeing
* when the variable is checked for non-`NULL` before freeing
* when the variable is a global (because they should be set to `NULL`, even if we don't really claim that things can be re-init'd)
Testing Done:
Compiled, and ran tests in valgrind.
Reviewed at https://reviews.imfreedom.org/r/2369/
Diffstat (limited to 'libpurple/request-datasheet.c')
| -rw-r--r-- | libpurple/request-datasheet.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/libpurple/request-datasheet.c b/libpurple/request-datasheet.c index a096153949..b69403b1d6 100644 --- a/libpurple/request-datasheet.c +++ b/libpurple/request-datasheet.c @@ -109,8 +109,7 @@ purple_request_datasheet_free(PurpleRequestDatasheet *sheet) g_list_free_full(sheet->record_list, (GDestroyNotify)purple_request_datasheet_record_free); - if (sheet->marked_for_rem != NULL) - g_hash_table_destroy(sheet->marked_for_rem); + g_clear_pointer(&sheet->marked_for_rem, g_hash_table_destroy); g_free(sheet); } @@ -381,9 +380,8 @@ purple_request_datasheet_record_remove_all(PurpleRequestDatasheet *sheet) { g_return_if_fail(sheet != NULL); - g_list_free_full(sheet->record_list, - (GDestroyNotify)purple_request_datasheet_record_free); - sheet->record_list = NULL; + g_clear_list(&sheet->record_list, + (GDestroyNotify)purple_request_datasheet_record_free); g_hash_table_remove_all(sheet->record_li_by_key); purple_signal_emit(sheet, "record-changed", sheet, NULL); @@ -394,8 +392,7 @@ purple_request_datasheet_record_mark_all_for_rem(PurpleRequestDatasheet *sheet) { const GList *it; - if (sheet->marked_for_rem != NULL) - g_hash_table_destroy(sheet->marked_for_rem); + g_clear_pointer(&sheet->marked_for_rem, g_hash_table_destroy); sheet->marked_for_rem = g_hash_table_new(g_direct_hash, g_direct_equal); it = purple_request_datasheet_get_records(sheet); |