[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet-gtk] branch master updated: GNUNET_free_non_null -> GNUNET_free
From: |
gnunet |
Subject: |
[gnunet-gtk] branch master updated: GNUNET_free_non_null -> GNUNET_free |
Date: |
Sun, 05 Jul 2020 16:34:49 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet-gtk.
The following commit(s) were added to refs/heads/master by this push:
new b29810dc GNUNET_free_non_null -> GNUNET_free
b29810dc is described below
commit b29810dca94bb5e02feafb08cc06ff553819eb53
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Jul 5 16:29:06 2020 +0200
GNUNET_free_non_null -> GNUNET_free
---
src/conversation/gnunet-conversation-gtk_contacts.c | 2 +-
src/conversation/gnunet-conversation-gtk_get_label.c | 2 +-
src/conversation/gnunet-conversation-gtk_import.c | 4 ++--
src/fs/gnunet-fs-gtk.c | 6 +++---
src/fs/gnunet-fs-gtk_download-save-as.c | 6 +++---
src/fs/gnunet-fs-gtk_event-handler.c | 10 +++++-----
src/fs/gnunet-fs-gtk_main-window-search.c | 4 ++--
src/fs/gnunet-fs-gtk_open-uri.c | 2 +-
src/fs/gnunet-fs-gtk_publish-dialog.c | 10 +++++-----
src/fs/gnunet-fs-gtk_publish-edit-dialog.c | 4 ++--
src/fs/gnunet-fs-gtk_unindex.c | 2 +-
src/lib/about.c | 2 +-
src/lib/eventloop.c | 2 +-
src/namestore/gnunet-namestore-gtk.c | 10 +++++-----
src/peerinfo/gnunet-peerinfo-gtk.c | 6 +++---
src/setup/gnunet-setup-options.c | 4 ++--
src/setup/gnunet-setup.c | 2 +-
src/statistics/functions.c | 6 +++---
18 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/src/conversation/gnunet-conversation-gtk_contacts.c
b/src/conversation/gnunet-conversation-gtk_contacts.c
index 3b157297..28951dcb 100644
--- a/src/conversation/gnunet-conversation-gtk_contacts.c
+++ b/src/conversation/gnunet-conversation-gtk_contacts.c
@@ -231,7 +231,7 @@ display_record (void *cls,
/* remove */
gtk_list_store_remove (contacts_liststore, &iter);
g_free (lname);
- GNUNET_free_non_null (value);
+ GNUNET_free (value);
return;
}
/* update */
diff --git a/src/conversation/gnunet-conversation-gtk_get_label.c
b/src/conversation/gnunet-conversation-gtk_get_label.c
index 37daad42..0a2baea0 100644
--- a/src/conversation/gnunet-conversation-gtk_get_label.c
+++ b/src/conversation/gnunet-conversation-gtk_get_label.c
@@ -212,7 +212,7 @@ gnunet_conversation_gtk_enter_label_window_delete_event_cb
(GtkWidget *widget,
GtkBuilder *builder = GTK_BUILDER (user_data);
g_object_unref (G_OBJECT (builder));
- GNUNET_free_non_null (target);
+ GNUNET_free (target);
target = NULL;
return FALSE;
}
diff --git a/src/conversation/gnunet-conversation-gtk_import.c
b/src/conversation/gnunet-conversation-gtk_import.c
index 20bb8bd1..63e735eb 100644
--- a/src/conversation/gnunet-conversation-gtk_import.c
+++ b/src/conversation/gnunet-conversation-gtk_import.c
@@ -301,7 +301,7 @@ GSC_add_phone (const gchar *label, const struct
GNUNET_GNSRECORD_Data *rd)
if (NULL != phone_label)
GSC_remove_phone ();
GNUNET_break (NULL == phone_label);
- GNUNET_free_non_null (my_rd_data);
+ GNUNET_free (my_rd_data);
phone_label = GNUNET_strdup (label);
my_rd = *rd;
my_rd.expiration_time = expiration_time.rel_value_us;
@@ -342,7 +342,7 @@ static void
finish_shutdown ()
{
GNUNET_SCHEDULER_add_now (&async_disconnect, NULL);
- GNUNET_free_non_null (my_rd_data);
+ GNUNET_free (my_rd_data);
memset (&my_rd, 0, sizeof (my_rd));
GNUNET_CRYPTO_ecdsa_key_clear (&zone_pkey);
}
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)
kskuri = GNUNET_FS_uri_ksk_create (text, &emsg);
if (NULL == kskuri)
{
- GNUNET_free_non_null (emsg);
+ GNUNET_free (emsg);
return;
}
GNUNET_FS_GTK_handle_uri (kskuri, 1);
@@ -523,7 +523,7 @@ service_list_callback (void *cls,
return;
service_list = format_service_list (count, list);
GNUNET_FS_GTK_update_connection_indicator (cls, TRUE, service_list);
- GNUNET_free_non_null (service_list);
+ GNUNET_free (service_list);
}
@@ -536,7 +536,7 @@ arm_connection_state_change (void *cls, int connected)
{
service_list = format_service_list (0, NULL);
GNUNET_FS_GTK_update_connection_indicator (cls, TRUE, service_list);
- GNUNET_free_non_null (service_list);
+ GNUNET_free (service_list);
GNUNET_ARM_request_service_list (arm, &service_list_callback, cls);
}
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)
de->sr->download = NULL;
de->sr = NULL;
}
- GNUNET_free_non_null (de->filename);
+ GNUNET_free (de->filename);
GNUNET_FS_uri_destroy (de->uri);
if (NULL != de->rr)
{
@@ -170,7 +170,7 @@ GNUNET_GTK_save_as_dialog_response_cb (GtkDialog *dialog,
clean_up_download_as_context (dlc);
return;
}
- GNUNET_free_non_null (de->filename);
+ GNUNET_free (de->filename);
de->filename =
GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER (dlc->dialog));
cb = GTK_TOGGLE_BUTTON (
@@ -198,7 +198,7 @@ GNUNET_GTK_save_as_dialog_response_cb (GtkDialog *dialog,
GNUNET_FS_GTK_free_download_entry (de);
}
/* we were successful, do not remove the directory (if we created one) */
- GNUNET_free_non_null (dlc->dirname);
+ GNUNET_free (dlc->dirname);
dlc->dirname = NULL;
clean_up_download_as_context (dlc);
}
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,
(int) data_size,
data,
emsg);
- GNUNET_free_non_null (emsg);
+ GNUNET_free (emsg);
return 0;
}
result = ctx->cb (ctx->cls, uri);
@@ -1917,7 +1917,7 @@ GNUNET_FS_GTK_search_treeview_cursor_changed (GtkTreeView
*tv,
download_directory);
gtk_widget_show_all (GTK_WIDGET (mctx->download_panel));
- GNUNET_free_non_null (filename);
+ GNUNET_free (filename);
GNUNET_free (download_directory);
}
else
@@ -2295,7 +2295,7 @@ update_search_result (struct SearchResult *sr,
if (NULL != pixbuf)
g_object_unref (pixbuf);
GNUNET_free (desc);
- GNUNET_free_non_null (mime);
+ GNUNET_free (mime);
page = gtk_notebook_get_current_page (mctx->notebook);
if (gtk_notebook_get_nth_page (mctx->notebook, page) == sr->tab->frame)
@@ -2499,7 +2499,7 @@ GNUNET_GTK_add_search_result (struct SearchTab *tab,
g_object_unref (pixbuf);
GNUNET_free (uris);
GNUNET_free (desc);
- GNUNET_free_non_null (mime);
+ GNUNET_free (mime);
/* remember in 'sr' where we added the result */
tp = gtk_tree_model_get_path (GTK_TREE_MODEL (ts), &iter);
@@ -2566,7 +2566,7 @@ GNUNET_FS_GTK_set_item_downloaded_name (GtkTreeStore *ts,
gtk_entry_set_text (mctx->download_name_entry, suggested_filename !=
NULL ? suggested_filename : NULL);
gtk_file_chooser_set_current_folder (mctx->download_location_chooser,
download_directory);
- GNUNET_free_non_null (suggested_filename);
+ GNUNET_free (suggested_filename);
GNUNET_free (download_directory);
*/
/* 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)
keywords,
emsg);
g_free (keywords);
- GNUNET_free_non_null (emsg);
+ GNUNET_free (emsg);
return;
}
g_free (keywords);
@@ -342,7 +342,7 @@ end_pseu_lookup (void *cls)
GNUNET_NAMESTORE_disconnect (lctx->namestore);
lctx->namestore = NULL;
}
- GNUNET_free_non_null (lctx->nick);
+ GNUNET_free (lctx->nick);
GNUNET_free (lctx);
}
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 (
(uri == NULL) ? FALSE : TRUE);
if (uri != NULL)
GNUNET_FS_uri_destroy (uri);
- GNUNET_free_non_null (perr);
+ GNUNET_free (perr);
}
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,
PUBLISH_MC_REPLICATION_LEVEL,
(guint) bo->replication_level,
-1);
- GNUNET_free_non_null (name);
+ GNUNET_free (name);
return GNUNET_SYSERR;
}
@@ -2161,7 +2161,7 @@ close_master_publish_dialog (struct
MainPublishingDialogContext *ctx)
GNUNET_IDENTITY_disconnect (ctx->identity);
gtk_widget_destroy (GTK_WIDGET (ctx->master_pubdialog));
g_object_unref (G_OBJECT (ctx->builder));
- GNUNET_free_non_null (ctx->ns_name);
+ GNUNET_free (ctx->ns_name);
g_free (ctx->previous_id);
GNUNET_free (ctx);
return GNUNET_YES;
@@ -2609,7 +2609,7 @@ add_updateable_to_ts (void *cls,
GNUNET_CRYPTO_hash (hashbuf, hashbufsize, &hc);
GNUNET_free (uristring);
- GNUNET_free_non_null (mdbuf);
+ GNUNET_free (mdbuf);
GNUNET_free (hashbuf);
spath = NULL;
@@ -2733,7 +2733,7 @@ add_updateable_to_ts (void *cls,
/**
* Called by a hashmap iterator.
- * Frees its argument with GNUNET_free_non_null().
+ * Frees its argument with GNUNET_free().
*
* @param cls closure
* @param key key from the map
@@ -2743,7 +2743,7 @@ add_updateable_to_ts (void *cls,
static int
free_seen_paths (void *cls, const struct GNUNET_HashCode *key, void *value)
{
- GNUNET_free_non_null (value);
+ GNUNET_free (value);
return GNUNET_YES;
}
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 (
PUBLISH_METADATA_MC_VALUE,
ivalue,
-1);
- GNUNET_free_non_null (avalue);
+ GNUNET_free (avalue);
}
@@ -1141,7 +1141,7 @@ file_information_update (void *cls,
mime,
data,
data_size);
- GNUNET_free_non_null (mime);
+ GNUNET_free (mime);
}
g_object_unref (f);
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)
-1);
}
GNUNET_CONTAINER_DLL_remove (ue_head, ue_tail, ue);
- GNUNET_free_non_null (ue->emsg);
+ GNUNET_free (ue->emsg);
GNUNET_free (ue->filename);
GNUNET_free (ue);
}
diff --git a/src/lib/about.c b/src/lib/about.c
index f6d84f37..8181bc4b 100644
--- a/src/lib/about.c
+++ b/src/lib/about.c
@@ -127,7 +127,7 @@ GNUNET_GTK_about_window_realized (GtkWidget *widget,
gtk_text_buffer_set_text (ctx->license_contents, license, -1);
g_free (license);
}
- GNUNET_free_non_null (license_path);
+ GNUNET_free (license_path);
}
diff --git a/src/lib/eventloop.c b/src/lib/eventloop.c
index 1db9502f..84ad3974 100644
--- a/src/lib/eventloop.c
+++ b/src/lib/eventloop.c
@@ -958,7 +958,7 @@ GNUNET_GTK_main_loop_start (const char *binary_name,
GNUNET_CONFIGURATION_destroy (ml.cfg);
ml.cfg = NULL;
}
- GNUNET_free_non_null (ml.cfgfile);
+ GNUNET_free (ml.cfgfile);
return ret;
}
diff --git a/src/namestore/gnunet-namestore-gtk.c
b/src/namestore/gnunet-namestore-gtk.c
index a64b1eb0..34f80ca4 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -809,7 +809,7 @@ release_ri (void *cls, const struct GNUNET_HashCode *key,
void *value)
(void) cls;
gtk_tree_row_reference_free (ri->rr);
- GNUNET_free_non_null (ri->data);
+ GNUNET_free (ri->data);
GNUNET_free (ri->name);
GNUNET_break (GNUNET_YES ==
GNUNET_CONTAINER_multihashmap_remove (n2r, key, ri));
@@ -824,7 +824,7 @@ release_ri (void *cls, const struct GNUNET_HashCode *key,
void *value)
static void
clear_zone_view ()
{
- GNUNET_free_non_null (current_pseudonym);
+ GNUNET_free (current_pseudonym);
current_pseudonym = NULL;
GNUNET_CONTAINER_multihashmap_iterate (n2r, &release_ri, NULL);
gtk_widget_hide (GTK_WIDGET (zone_combo_box));
@@ -2472,7 +2472,7 @@ zone_iteration_proc (void *cls,
return;
}
/* update record info serialized version of the records */
- GNUNET_free_non_null (ri->data);
+ GNUNET_free (ri->data);
ri->rd_count = rd_count;
ri->data_size = GNUNET_GNSRECORD_records_get_size (rd_count, rd);
if (0 != ri->data_size)
@@ -2602,7 +2602,7 @@ load_zone (const char *name, struct GNUNET_IDENTITY_Ego
*ego)
GNUNET_NAMESTORE_zone_monitor_stop (zmon);
zmon = NULL;
}
- GNUNET_free_non_null (current_pseudonym);
+ GNUNET_free (current_pseudonym);
current_pseudonym = NULL;
gtk_tree_view_set_model (tv, NULL);
if (NULL == name)
@@ -3078,7 +3078,7 @@ identity_cb (void *cls,
GtkTreeIter act_iter;
/* identity was removed, remove from list */
- GNUNET_free_non_null (current_pseudonym);
+ GNUNET_free (current_pseudonym);
current_pseudonym = NULL;
gtk_list_store_remove (zone_liststore, &iter);
if (! gtk_combo_box_get_active_iter (zone_combo_box, &act_iter))
diff --git a/src/peerinfo/gnunet-peerinfo-gtk.c
b/src/peerinfo/gnunet-peerinfo-gtk.c
index ec1a0526..09e41991 100644
--- a/src/peerinfo/gnunet-peerinfo-gtk.c
+++ b/src/peerinfo/gnunet-peerinfo-gtk.c
@@ -467,9 +467,9 @@ free_peer_address (struct PeerInfo *info, struct
PeerAddress *pa)
pa->tos = NULL;
}
gtk_tree_row_reference_free (pa->rr);
- GNUNET_free_non_null (pa->plugin);
- GNUNET_free_non_null (pa->address_as_string);
- GNUNET_free_non_null (pa->country_name);
+ GNUNET_free (pa->plugin);
+ GNUNET_free (pa->address_as_string);
+ GNUNET_free (pa->country_name);
GNUNET_free (pa);
}
diff --git a/src/setup/gnunet-setup-options.c b/src/setup/gnunet-setup-options.c
index 5c4d10b7..d1505e80 100644
--- a/src/setup/gnunet-setup-options.c
+++ b/src/setup/gnunet-setup-options.c
@@ -598,7 +598,7 @@ validate_v4_policy (const void *cls, GObject *widget)
}
gtk_widget_set_tooltip_text (GTK_WIDGET (widget), "");
}
- GNUNET_free_non_null (r);
+ GNUNET_free (r);
}
@@ -656,7 +656,7 @@ validate_v6_policy (const void *cls, GObject *widget)
}
gtk_widget_set_tooltip_text (GTK_WIDGET (widget), "");
}
- GNUNET_free_non_null (r);
+ GNUNET_free (r);
}
diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index 77734ecc..a2c26f73 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -231,7 +231,7 @@ widget_state_change_callback (const struct
GNUNET_SETUP_OptionSpecification *os)
else
return;
update_visibility (os, value);
- GNUNET_free_non_null (value);
+ GNUNET_free (value);
}
diff --git a/src/statistics/functions.c b/src/statistics/functions.c
index f5149dd9..ca265b53 100644
--- a/src/statistics/functions.c
+++ b/src/statistics/functions.c
@@ -114,9 +114,9 @@ updateConnectionGoal (void *unused)
else
bandup = atol (availableUp);
- GNUNET_free_non_null (cmh);
- GNUNET_free_non_null (availableDown);
- GNUNET_free_non_null (availableUp);
+ GNUNET_free (cmh);
+ GNUNET_free (availableDown);
+ GNUNET_free (availableUp);
}
static int
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnunet-gtk] branch master updated: GNUNET_free_non_null -> GNUNET_free,
gnunet <=