From ea58a6ebd398a3643a198f7d3e5066165d223339 Mon Sep 17 00:00:00 2001 From: Robby Zambito Date: Sun, 3 Mar 2024 15:04:01 -0500 Subject: [PATCH] Do not use redundant pointer to pointer --- guestfs-inspectd.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/guestfs-inspectd.c b/guestfs-inspectd.c index 9969b88..4bf816c 100644 --- a/guestfs-inspectd.c +++ b/guestfs-inspectd.c @@ -37,7 +37,7 @@ static void cat_file(guestfs_h *g, char *file_path, char **file_content, size_t return; } -static void init_guestfs(guestfs_h **g, char *disk_path) { +static void init_guestfs(guestfs_h *g, char *disk_path) { char **roots, **mountpoints; char *root; size_t i, j; @@ -46,23 +46,23 @@ static void init_guestfs(guestfs_h **g, char *disk_path) { //size_t file_size; // Create a connection handle - (*g) = guestfs_create(); + g = guestfs_create(); if (g == NULL) { exit(EXIT_FAILURE); } // Adding disk_path to connection handle - if (guestfs_add_drive_opts((*g), disk_path, GUESTFS_ADD_DRIVE_OPTS_READONLY, 1, -1) == -1) { + if (guestfs_add_drive_opts(g, disk_path, GUESTFS_ADD_DRIVE_OPTS_READONLY, 1, -1) == -1) { exit(EXIT_FAILURE); } // Launching connection handle - if (guestfs_launch((*g)) == -1) { + if (guestfs_launch(g) == -1) { exit(EXIT_FAILURE); } // Pulling rootfs information - roots = guestfs_inspect_os((*g)); + roots = guestfs_inspect_os(g); if (roots == NULL) { exit(EXIT_FAILURE); } @@ -70,14 +70,14 @@ static void init_guestfs(guestfs_h **g, char *disk_path) { // Looping through roots to mount mountpoints for (j = 0; roots[j] != NULL; j++) { root = roots[j]; - mountpoints = guestfs_inspect_get_mountpoints((*g), root); + mountpoints = guestfs_inspect_get_mountpoints(g, root); if (mountpoints == NULL) { exit(EXIT_FAILURE); } // Sorting mountpoints to be in {'${device_path}', '${mount_path}'} format qsort(mountpoints, count_mountpoints(mountpoints) / 2, 2 * sizeof (char*), compare_key_len); for (i = 0; mountpoints[i] != NULL; i += 2) { - guestfs_mount_ro((*g), mountpoints[i+1], mountpoints[i]); + guestfs_mount_ro(g, mountpoints[i+1], mountpoints[i]); free(mountpoints[i]); free(mountpoints[i+1]); } @@ -90,7 +90,7 @@ static void init_guestfs(guestfs_h **g, char *disk_path) { static void *worker_task(zsock_t *pipe, char *disk_path) { guestfs_h *g = NULL; - init_guestfs(&g, disk_path); + init_guestfs(g, disk_path); // ZeroMQ Opens here zsock_signal(pipe, 0);