New upstream version 1.10.0+dfsgupstream/1.10.0+dfsg

1 files changed, 11 insertions, 10 deletions

diff --git a/src/proc_self_mountinfo.c b/src/proc_self_mountinfo.c
index bb031a9ab..4ccdddff1 100644
--- a/src/proc_self_mountinfo.c
+++ b/src/proc_self_mountinfo.c
@@ -103,20 +103,11 @@ struct mountinfo *mountinfo_find_by_filesystem_super_option(struct mountinfo *ro
     return NULL;
 }
 
-
-// free a linked list of mountinfo structures
-void mountinfo_free(struct mountinfo *mi) {
-    if(unlikely(!mi))
-        return;
-
-    if(likely(mi->next))
-        mountinfo_free(mi->next);
-
+static void mountinfo_free(struct mountinfo *mi) {
     freez(mi->root);
     freez(mi->mount_point);
     freez(mi->mount_options);
     freez(mi->persistent_id);
-
 /*
     if(mi->optional_fields_count) {
         int i;
@@ -131,6 +122,16 @@ void mountinfo_free(struct mountinfo *mi) {
     freez(mi);
 }
 
+// free a linked list of mountinfo structures
+void mountinfo_free_all(struct mountinfo *mi) {
+    while(mi) {
+        struct mountinfo *t = mi;
+        mi = mi->next;
+
+        mountinfo_free(t);
+    }
+}
+
 static char *strdupz_decoding_octal(const char *string) {
     char *buffer = strdupz(string);