[vlc-commits] objects: rename DumpStructure to DumpStructureLocked

Steve Lhomme git at videolan.org
Thu Mar 14 11:13:43 CET 2019


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Mar 13 08:34:24 2019 +0100| [6beff09fac588a1a2b68e805e2cd15a9425f08fc] | committer: Steve Lhomme

objects: rename DumpStructure to DumpStructureLocked

and remove the assert on the locked state

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

 src/misc/objects.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/misc/objects.c b/src/misc/objects.c
index 574478f6ce..52dc3cf36c 100644
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -125,7 +125,7 @@ static void PrintObject(vlc_object_t *obj, FILE *output)
     vlc_restorecancel (canc);
 }
 
-static void DumpStructure(vlc_object_t *obj, FILE *output, unsigned level)
+static void DumpStructureLocked(vlc_object_t *obj, FILE *output, unsigned level)
 {
     PrintObject(obj, output);
 
@@ -137,9 +137,8 @@ static void DumpStructure(vlc_object_t *obj, FILE *output, unsigned level)
 
     vlc_object_internals_t *priv;
 
-    vlc_mutex_assert(&tree_lock);
     vlc_children_foreach(priv, vlc_internals(obj))
-        DumpStructure(vlc_externals(priv), output, level + 1);
+        DumpStructureLocked(vlc_externals(priv), output, level + 1);
 }
 
 /**
@@ -156,7 +155,7 @@ static int TreeCommand (vlc_object_t *obj, char const *cmd,
 
     flockfile(stdout);
     vlc_mutex_lock(&tree_lock);
-    DumpStructure(obj, stdout, 0);
+    DumpStructureLocked(obj, stdout, 0);
     vlc_mutex_unlock(&tree_lock);
     funlockfile(stdout);
     return VLC_SUCCESS;



More information about the vlc-commits mailing list