[vlc-commits] objects: remove header

Rémi Denis-Courmont git at videolan.org
Wed Feb 20 20:09:00 CET 2019


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Feb 20 20:53:52 2019 +0200| [10bf445c6cd20465ac50c5381e80468445eb15e9] | committer: Rémi Denis-Courmont

objects: remove header

This was only used in two cases.
A dedicated pointer is no longer needed for this.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=10bf445c6cd20465ac50c5381e80468445eb15e9
---

 include/vlc_objects.h | 7 -------
 src/misc/messages.c   | 7 -------
 src/misc/objects.c    | 2 --
 3 files changed, 16 deletions(-)

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index dd6458600a..4d59fcfd0b 100644
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -41,13 +41,6 @@ struct vlc_common_members
 {
     struct vlc_logger *logger;
 
-    /** Log messages header
-     *
-     * Human-readable header for log messages. This is not thread-safe and
-     * only used by VLM and Lua interfaces.
-     */
-    char *header;
-
     bool no_interact;
 
     /** Module probe flag
diff --git a/src/misc/messages.c b/src/misc/messages.c
index fbdbac4a5f..c184b9c6fe 100644
--- a/src/misc/messages.c
+++ b/src/misc/messages.c
@@ -109,13 +109,6 @@ void vlc_vaLog (vlc_object_t *obj, int type, const char *module,
     msg.func = func;
     msg.tid = vlc_thread_id();
 
-    for (vlc_object_t *o = obj; o != NULL; o = o->obj.parent)
-        if (o->obj.header != NULL)
-        {
-            msg.psz_header = o->obj.header;
-            break;
-        }
-
 #ifdef _WIN32
     va_list ap;
 
diff --git a/src/misc/objects.c b/src/misc/objects.c
index 2a0030bc79..07cd418231 100644
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -212,7 +212,6 @@ void *vlc_custom_create (vlc_object_t *parent, size_t length,
     priv->resources = NULL;
 
     vlc_object_t *obj = (vlc_object_t *)(priv + 1);
-    obj->obj.header = NULL;
     obj->obj.force = false;
     memset (obj + 1, 0, length - sizeof (*obj)); /* type-specific stuff */
 
@@ -341,7 +340,6 @@ static void vlc_object_destroy( vlc_object_t *p_this )
     vlc_mutex_destroy (&p_priv->tree_lock);
     vlc_cond_destroy( &p_priv->var_wait );
     vlc_mutex_destroy( &p_priv->var_lock );
-    free( p_this->obj.header );
     free( p_priv->psz_name );
     free( p_priv );
 }



More information about the vlc-commits mailing list