diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-07-05 16:29:06 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-07-05 16:29:06 +0200 |
commit | b29810dca94bb5e02feafb08cc06ff553819eb53 (patch) | |
tree | 0c871465286a60b5fa17b25d2e5b545023b244c8 /src/fs | |
parent | 0256fb8e08ee3e61ba9869821b897eae62d5ceef (diff) | |
download | gnunet-gtk-b29810dca94bb5e02feafb08cc06ff553819eb53.tar.gz gnunet-gtk-b29810dca94bb5e02feafb08cc06ff553819eb53.zip |
GNUNET_free_non_null -> GNUNET_free
Diffstat (limited to 'src/fs')
-rw-r--r-- | src/fs/gnunet-fs-gtk.c | 6 | ||||
-rw-r--r-- | src/fs/gnunet-fs-gtk_download-save-as.c | 6 | ||||
-rw-r--r-- | src/fs/gnunet-fs-gtk_event-handler.c | 10 | ||||
-rw-r--r-- | src/fs/gnunet-fs-gtk_main-window-search.c | 4 | ||||
-rw-r--r-- | src/fs/gnunet-fs-gtk_open-uri.c | 2 | ||||
-rw-r--r-- | src/fs/gnunet-fs-gtk_publish-dialog.c | 10 | ||||
-rw-r--r-- | src/fs/gnunet-fs-gtk_publish-edit-dialog.c | 4 | ||||
-rw-r--r-- | src/fs/gnunet-fs-gtk_unindex.c | 2 |
8 files changed, 22 insertions, 22 deletions
diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c index e1c5a955..fecb84e1 100644 --- a/src/fs/gnunet-fs-gtk.c +++ b/src/fs/gnunet-fs-gtk.c | |||
@@ -366,7 +366,7 @@ process_paste (GtkClipboard *cb, const gchar *text, gpointer data) | |||
366 | kskuri = GNUNET_FS_uri_ksk_create (text, &emsg); | 366 | kskuri = GNUNET_FS_uri_ksk_create (text, &emsg); |
367 | if (NULL == kskuri) | 367 | if (NULL == kskuri) |
368 | { | 368 | { |
369 | GNUNET_free_non_null (emsg); | 369 | GNUNET_free (emsg); |
370 | return; | 370 | return; |
371 | } | 371 | } |
372 | GNUNET_FS_GTK_handle_uri (kskuri, 1); | 372 | GNUNET_FS_GTK_handle_uri (kskuri, 1); |
@@ -523,7 +523,7 @@ service_list_callback (void *cls, | |||
523 | return; | 523 | return; |
524 | service_list = format_service_list (count, list); | 524 | service_list = format_service_list (count, list); |
525 | GNUNET_FS_GTK_update_connection_indicator (cls, TRUE, service_list); | 525 | GNUNET_FS_GTK_update_connection_indicator (cls, TRUE, service_list); |
526 | GNUNET_free_non_null (service_list); | 526 | GNUNET_free (service_list); |
527 | } | 527 | } |
528 | 528 | ||
529 | 529 | ||
@@ -536,7 +536,7 @@ arm_connection_state_change (void *cls, int connected) | |||
536 | { | 536 | { |
537 | service_list = format_service_list (0, NULL); | 537 | service_list = format_service_list (0, NULL); |
538 | GNUNET_FS_GTK_update_connection_indicator (cls, TRUE, service_list); | 538 | GNUNET_FS_GTK_update_connection_indicator (cls, TRUE, service_list); |
539 | GNUNET_free_non_null (service_list); | 539 | GNUNET_free (service_list); |
540 | GNUNET_ARM_request_service_list (arm, &service_list_callback, cls); | 540 | GNUNET_ARM_request_service_list (arm, &service_list_callback, cls); |
541 | } | 541 | } |
542 | else | 542 | else |
diff --git a/src/fs/gnunet-fs-gtk_download-save-as.c b/src/fs/gnunet-fs-gtk_download-save-as.c index cc5592dd..94c257ce 100644 --- a/src/fs/gnunet-fs-gtk_download-save-as.c +++ b/src/fs/gnunet-fs-gtk_download-save-as.c | |||
@@ -106,7 +106,7 @@ GNUNET_FS_GTK_free_download_entry (struct DownloadEntry *de) | |||
106 | de->sr->download = NULL; | 106 | de->sr->download = NULL; |
107 | de->sr = NULL; | 107 | de->sr = NULL; |
108 | } | 108 | } |
109 | GNUNET_free_non_null (de->filename); | 109 | GNUNET_free (de->filename); |
110 | GNUNET_FS_uri_destroy (de->uri); | 110 | GNUNET_FS_uri_destroy (de->uri); |
111 | if (NULL != de->rr) | 111 | if (NULL != de->rr) |
112 | { | 112 | { |
@@ -170,7 +170,7 @@ GNUNET_GTK_save_as_dialog_response_cb (GtkDialog *dialog, | |||
170 | clean_up_download_as_context (dlc); | 170 | clean_up_download_as_context (dlc); |
171 | return; | 171 | return; |
172 | } | 172 | } |
173 | GNUNET_free_non_null (de->filename); | 173 | GNUNET_free (de->filename); |
174 | de->filename = | 174 | de->filename = |
175 | GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER (dlc->dialog)); | 175 | GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER (dlc->dialog)); |
176 | cb = GTK_TOGGLE_BUTTON ( | 176 | cb = GTK_TOGGLE_BUTTON ( |
@@ -198,7 +198,7 @@ GNUNET_GTK_save_as_dialog_response_cb (GtkDialog *dialog, | |||
198 | GNUNET_FS_GTK_free_download_entry (de); | 198 | GNUNET_FS_GTK_free_download_entry (de); |
199 | } | 199 | } |
200 | /* we were successful, do not remove the directory (if we created one) */ | 200 | /* we were successful, do not remove the directory (if we created one) */ |
201 | GNUNET_free_non_null (dlc->dirname); | 201 | GNUNET_free (dlc->dirname); |
202 | dlc->dirname = NULL; | 202 | dlc->dirname = NULL; |
203 | clean_up_download_as_context (dlc); | 203 | clean_up_download_as_context (dlc); |
204 | } | 204 | } |
diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c index 1f65672f..d066ea57 100644 --- a/src/fs/gnunet-fs-gtk_event-handler.c +++ b/src/fs/gnunet-fs-gtk_event-handler.c | |||
@@ -1195,7 +1195,7 @@ check_for_embedded_uri (void *cls, | |||
1195 | (int) data_size, | 1195 | (int) data_size, |
1196 | data, | 1196 | data, |
1197 | emsg); | 1197 | emsg); |
1198 | GNUNET_free_non_null (emsg); | 1198 | GNUNET_free (emsg); |
1199 | return 0; | 1199 | return 0; |
1200 | } | 1200 | } |
1201 | result = ctx->cb (ctx->cls, uri); | 1201 | result = ctx->cb (ctx->cls, uri); |
@@ -1917,7 +1917,7 @@ GNUNET_FS_GTK_search_treeview_cursor_changed (GtkTreeView *tv, | |||
1917 | download_directory); | 1917 | download_directory); |
1918 | 1918 | ||
1919 | gtk_widget_show_all (GTK_WIDGET (mctx->download_panel)); | 1919 | gtk_widget_show_all (GTK_WIDGET (mctx->download_panel)); |
1920 | GNUNET_free_non_null (filename); | 1920 | GNUNET_free (filename); |
1921 | GNUNET_free (download_directory); | 1921 | GNUNET_free (download_directory); |
1922 | } | 1922 | } |
1923 | else | 1923 | else |
@@ -2295,7 +2295,7 @@ update_search_result (struct SearchResult *sr, | |||
2295 | if (NULL != pixbuf) | 2295 | if (NULL != pixbuf) |
2296 | g_object_unref (pixbuf); | 2296 | g_object_unref (pixbuf); |
2297 | GNUNET_free (desc); | 2297 | GNUNET_free (desc); |
2298 | GNUNET_free_non_null (mime); | 2298 | GNUNET_free (mime); |
2299 | 2299 | ||
2300 | page = gtk_notebook_get_current_page (mctx->notebook); | 2300 | page = gtk_notebook_get_current_page (mctx->notebook); |
2301 | if (gtk_notebook_get_nth_page (mctx->notebook, page) == sr->tab->frame) | 2301 | if (gtk_notebook_get_nth_page (mctx->notebook, page) == sr->tab->frame) |
@@ -2499,7 +2499,7 @@ GNUNET_GTK_add_search_result (struct SearchTab *tab, | |||
2499 | g_object_unref (pixbuf); | 2499 | g_object_unref (pixbuf); |
2500 | GNUNET_free (uris); | 2500 | GNUNET_free (uris); |
2501 | GNUNET_free (desc); | 2501 | GNUNET_free (desc); |
2502 | GNUNET_free_non_null (mime); | 2502 | GNUNET_free (mime); |
2503 | 2503 | ||
2504 | /* remember in 'sr' where we added the result */ | 2504 | /* remember in 'sr' where we added the result */ |
2505 | tp = gtk_tree_model_get_path (GTK_TREE_MODEL (ts), &iter); | 2505 | tp = gtk_tree_model_get_path (GTK_TREE_MODEL (ts), &iter); |
@@ -2566,7 +2566,7 @@ GNUNET_FS_GTK_set_item_downloaded_name (GtkTreeStore *ts, | |||
2566 | gtk_entry_set_text (mctx->download_name_entry, suggested_filename != NULL ? suggested_filename : NULL); | 2566 | gtk_entry_set_text (mctx->download_name_entry, suggested_filename != NULL ? suggested_filename : NULL); |
2567 | gtk_file_chooser_set_current_folder (mctx->download_location_chooser, download_directory); | 2567 | gtk_file_chooser_set_current_folder (mctx->download_location_chooser, download_directory); |
2568 | 2568 | ||
2569 | GNUNET_free_non_null (suggested_filename); | 2569 | GNUNET_free (suggested_filename); |
2570 | GNUNET_free (download_directory); | 2570 | GNUNET_free (download_directory); |
2571 | */ | 2571 | */ |
2572 | /* This code relies on download panel contents NOT being re-populated every 0.2 seconds, | 2572 | /* This code relies on download panel contents NOT being re-populated every 0.2 seconds, |
diff --git a/src/fs/gnunet-fs-gtk_main-window-search.c b/src/fs/gnunet-fs-gtk_main-window-search.c index b79150fd..98db564d 100644 --- a/src/fs/gnunet-fs-gtk_main-window-search.c +++ b/src/fs/gnunet-fs-gtk_main-window-search.c | |||
@@ -256,7 +256,7 @@ start_search (struct GNUNET_GTK_MainWindowContext *main_ctx) | |||
256 | keywords, | 256 | keywords, |
257 | emsg); | 257 | emsg); |
258 | g_free (keywords); | 258 | g_free (keywords); |
259 | GNUNET_free_non_null (emsg); | 259 | GNUNET_free (emsg); |
260 | return; | 260 | return; |
261 | } | 261 | } |
262 | g_free (keywords); | 262 | g_free (keywords); |
@@ -342,7 +342,7 @@ end_pseu_lookup (void *cls) | |||
342 | GNUNET_NAMESTORE_disconnect (lctx->namestore); | 342 | GNUNET_NAMESTORE_disconnect (lctx->namestore); |
343 | lctx->namestore = NULL; | 343 | lctx->namestore = NULL; |
344 | } | 344 | } |
345 | GNUNET_free_non_null (lctx->nick); | 345 | GNUNET_free (lctx->nick); |
346 | GNUNET_free (lctx); | 346 | GNUNET_free (lctx); |
347 | } | 347 | } |
348 | 348 | ||
diff --git a/src/fs/gnunet-fs-gtk_open-uri.c b/src/fs/gnunet-fs-gtk_open-uri.c index 63b0105c..d46a6b09 100644 --- a/src/fs/gnunet-fs-gtk_open-uri.c +++ b/src/fs/gnunet-fs-gtk_open-uri.c | |||
@@ -209,7 +209,7 @@ GNUNET_GTK_open_url_dialog_url_textview_buffer_changed_cb ( | |||
209 | (uri == NULL) ? FALSE : TRUE); | 209 | (uri == NULL) ? FALSE : TRUE); |
210 | if (uri != NULL) | 210 | if (uri != NULL) |
211 | GNUNET_FS_uri_destroy (uri); | 211 | GNUNET_FS_uri_destroy (uri); |
212 | GNUNET_free_non_null (perr); | 212 | GNUNET_free (perr); |
213 | } | 213 | } |
214 | 214 | ||
215 | 215 | ||
diff --git a/src/fs/gnunet-fs-gtk_publish-dialog.c b/src/fs/gnunet-fs-gtk_publish-dialog.c index 4ad1c091..aafcce9b 100644 --- a/src/fs/gnunet-fs-gtk_publish-dialog.c +++ b/src/fs/gnunet-fs-gtk_publish-dialog.c | |||
@@ -2009,7 +2009,7 @@ update_treeview_after_edit (void *cls, | |||
2009 | PUBLISH_MC_REPLICATION_LEVEL, | 2009 | PUBLISH_MC_REPLICATION_LEVEL, |
2010 | (guint) bo->replication_level, | 2010 | (guint) bo->replication_level, |
2011 | -1); | 2011 | -1); |
2012 | GNUNET_free_non_null (name); | 2012 | GNUNET_free (name); |
2013 | return GNUNET_SYSERR; | 2013 | return GNUNET_SYSERR; |
2014 | } | 2014 | } |
2015 | 2015 | ||
@@ -2161,7 +2161,7 @@ close_master_publish_dialog (struct MainPublishingDialogContext *ctx) | |||
2161 | GNUNET_IDENTITY_disconnect (ctx->identity); | 2161 | GNUNET_IDENTITY_disconnect (ctx->identity); |
2162 | gtk_widget_destroy (GTK_WIDGET (ctx->master_pubdialog)); | 2162 | gtk_widget_destroy (GTK_WIDGET (ctx->master_pubdialog)); |
2163 | g_object_unref (G_OBJECT (ctx->builder)); | 2163 | g_object_unref (G_OBJECT (ctx->builder)); |
2164 | GNUNET_free_non_null (ctx->ns_name); | 2164 | GNUNET_free (ctx->ns_name); |
2165 | g_free (ctx->previous_id); | 2165 | g_free (ctx->previous_id); |
2166 | GNUNET_free (ctx); | 2166 | GNUNET_free (ctx); |
2167 | return GNUNET_YES; | 2167 | return GNUNET_YES; |
@@ -2609,7 +2609,7 @@ add_updateable_to_ts (void *cls, | |||
2609 | GNUNET_CRYPTO_hash (hashbuf, hashbufsize, &hc); | 2609 | GNUNET_CRYPTO_hash (hashbuf, hashbufsize, &hc); |
2610 | 2610 | ||
2611 | GNUNET_free (uristring); | 2611 | GNUNET_free (uristring); |
2612 | GNUNET_free_non_null (mdbuf); | 2612 | GNUNET_free (mdbuf); |
2613 | GNUNET_free (hashbuf); | 2613 | GNUNET_free (hashbuf); |
2614 | 2614 | ||
2615 | spath = NULL; | 2615 | spath = NULL; |
@@ -2733,7 +2733,7 @@ add_updateable_to_ts (void *cls, | |||
2733 | 2733 | ||
2734 | /** | 2734 | /** |
2735 | * Called by a hashmap iterator. | 2735 | * Called by a hashmap iterator. |
2736 | * Frees its argument with GNUNET_free_non_null(). | 2736 | * Frees its argument with GNUNET_free(). |
2737 | * | 2737 | * |
2738 | * @param cls closure | 2738 | * @param cls closure |
2739 | * @param key key from the map | 2739 | * @param key key from the map |
@@ -2743,7 +2743,7 @@ add_updateable_to_ts (void *cls, | |||
2743 | static int | 2743 | static int |
2744 | free_seen_paths (void *cls, const struct GNUNET_HashCode *key, void *value) | 2744 | free_seen_paths (void *cls, const struct GNUNET_HashCode *key, void *value) |
2745 | { | 2745 | { |
2746 | GNUNET_free_non_null (value); | 2746 | GNUNET_free (value); |
2747 | return GNUNET_YES; | 2747 | return GNUNET_YES; |
2748 | } | 2748 | } |
2749 | 2749 | ||
diff --git a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c index b988fc3a..aff28a5c 100644 --- a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c +++ b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c | |||
@@ -539,7 +539,7 @@ GNUNET_GTK_edit_publication_metadata_tree_view_value_renderer_edited_cb ( | |||
539 | PUBLISH_METADATA_MC_VALUE, | 539 | PUBLISH_METADATA_MC_VALUE, |
540 | ivalue, | 540 | ivalue, |
541 | -1); | 541 | -1); |
542 | GNUNET_free_non_null (avalue); | 542 | GNUNET_free (avalue); |
543 | } | 543 | } |
544 | 544 | ||
545 | 545 | ||
@@ -1141,7 +1141,7 @@ file_information_update (void *cls, | |||
1141 | mime, | 1141 | mime, |
1142 | data, | 1142 | data, |
1143 | data_size); | 1143 | data_size); |
1144 | GNUNET_free_non_null (mime); | 1144 | GNUNET_free (mime); |
1145 | } | 1145 | } |
1146 | g_object_unref (f); | 1146 | g_object_unref (f); |
1147 | g_free (fn); | 1147 | g_free (fn); |
diff --git a/src/fs/gnunet-fs-gtk_unindex.c b/src/fs/gnunet-fs-gtk_unindex.c index 4c488c2e..b765fb9f 100644 --- a/src/fs/gnunet-fs-gtk_unindex.c +++ b/src/fs/gnunet-fs-gtk_unindex.c | |||
@@ -500,7 +500,7 @@ GNUNET_FS_GTK_unindex_handle_stop_ (struct UnindexEntry *ue) | |||
500 | -1); | 500 | -1); |
501 | } | 501 | } |
502 | GNUNET_CONTAINER_DLL_remove (ue_head, ue_tail, ue); | 502 | GNUNET_CONTAINER_DLL_remove (ue_head, ue_tail, ue); |
503 | GNUNET_free_non_null (ue->emsg); | 503 | GNUNET_free (ue->emsg); |
504 | GNUNET_free (ue->filename); | 504 | GNUNET_free (ue->filename); |
505 | GNUNET_free (ue); | 505 | GNUNET_free (ue); |
506 | } | 506 | } |