Changeset 0c059f0

Timestamp:

Oct 7, 2017, 3:11:38 AM (7 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master

Children:

09530e6, d110d95

Parents:

a7250ee

git-author:

Anders Kaseorg <andersk@mit.edu> (10/07/17 02:09:19)

git-committer:

Anders Kaseorg <andersk@mit.edu> (10/07/17 03:11:38)

Message:

Rename owl_log_entry_free to owl_log_entry_delete

We use “_cleanup” for functions that free everything referenced by the
object and “_delete” for functions that also free the object itself,
avoiding the ambiguous “_free”.

Also remove the NULL check since the pointer can never be NULL.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

File:

• logging.c (modified) (4 diffs)

logging.c

@@ -105 +105 @@
 }
 
-static void owl_log_entry_free(void *data)
+static void owl_log_entry_delete(void *data)
 {
   owl_log_entry *msg = (owl_log_entry*)data;
-  if (msg) {
-    g_free(msg->message);
-    g_free(msg->filename);
-    g_slice_free(owl_log_entry, msg);
-  }
+  g_free(msg->message);
+  g_free(msg->filename);
+  g_slice_free(owl_log_entry, msg);
 }
 
 #if GLIB_CHECK_VERSION(2, 32, 0)
 #else
-static void owl_log_entry_free_gfunc(gpointer data, gpointer user_data)
-{
-  owl_log_entry_free(data);
+static void owl_log_entry_delete_gfunc(gpointer data, gpointer user_data)
+{
+  owl_log_entry_delete(data);
 }
 #endif
@@ -204 +202 @@
       }
     }
-    owl_log_entry_free(entry);
+    owl_log_entry_delete(entry);
   }
   if (logged_message_count > 0) {
@@ -242 +240 @@
   owl_log_entry *log_msg = owl_log_new_entry(buffer, filename);
   owl_select_post_task(owl_log_eventually_write_entry, log_msg,
-                       owl_log_entry_free, log_context);
+                       owl_log_entry_delete, log_context);
 }
 
@@ -296 +294 @@
   owl_log_write_deferred_entries(&opts);
 #if GLIB_CHECK_VERSION(2, 32, 0)
-  g_queue_free_full(deferred_entry_queue, owl_log_entry_free);
+  g_queue_free_full(deferred_entry_queue, owl_log_entry_delete);
 #else
-  g_queue_foreach(deferred_entry_queue, owl_log_entry_free_gfunc, NULL);
+  g_queue_foreach(deferred_entry_queue, owl_log_entry_delete_gfunc, NULL);
   g_queue_free(deferred_entry_queue);
 #endif