From: Cole Robinson <crobinso@redhat.com>
Date: Tue, 8 Oct 2019 15:50:55 +0000 (-0400)
Subject: security: apparmor: Drop disk_foreach_iterator
X-Git-Tag: v5.9.0-rc1~331
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=488fce1220c63ac904da2b08e81b2f163dcfd2ab;p=thirdparty%2Flibvirt.git

security: apparmor: Drop disk_foreach_iterator

There's only one caller, so open code the file_add_path behavior

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
---

diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 511443dd3e..7148e3c760 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -914,9 +914,8 @@ static int
 add_file_path(virDomainDiskDefPtr disk,
               const char *path,
               size_t depth,
-              void *opaque)
+              virBufferPtr buf)
 {
-    virBufferPtr buf = opaque;
     int ret;
 
     if (depth == 0) {
@@ -935,19 +934,9 @@ add_file_path(virDomainDiskDefPtr disk,
 }
 
 
-typedef int (*disk_foreach_iterator)(virDomainDiskDefPtr disk,
-                                     const char *path,
-                                     size_t depth,
-                                     void *opaque);
-
-
-/* Call iter(disk, name, depth, opaque) for each element of disk and
- * its backing chain in the pre-populated disk->src.backingStore.
- */
 static int
-disk_foreach_path(virDomainDiskDefPtr disk,
-                  disk_foreach_iterator iter,
-                  void *opaque)
+disk_add_files(virDomainDiskDefPtr disk,
+               virBufferPtr buf)
 {
     size_t depth = 0;
     virStorageSourcePtr tmp;
@@ -956,7 +945,7 @@ disk_foreach_path(virDomainDiskDefPtr disk,
         /* execute the callback only for local storage */
         if (virStorageSourceIsLocalStorage(tmp) &&
             tmp->path) {
-            if (iter(disk, tmp->path, depth, opaque) < 0)
+            if (add_file_path(disk, tmp->path, depth, buf) < 0)
                 return -1;
         }
 
@@ -1006,7 +995,7 @@ get_files(vahControl * ctl)
 
          /* XXX should handle open errors more careful than just ignoring them.
          */
-        if (disk_foreach_path(disk, add_file_path, &buf) < 0)
+        if (disk_add_files(disk, &buf) < 0)
             goto cleanup;
     }