[Libguestfs] [p2v PATCH 06/11] gui: flatten get_phys_topo_from_conv_dlg()
At this point, the get_phys_topo_from_conv_dlg() function has become
useless -- it doesn't save any work, so flatten (inline) its definition at
all call sites, and remove the declaration and the definition.
Cc: Alban Lecorps <alban.lecorps(a)ubisoft.com>
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1792141
Signed-off-by: Laszlo Ersek <lersek(a)redhat.com>
---
gui.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/gui.c b/gui.c
index 3c0f21ca87d0..e29a9534a195 100644
--- a/gui.c
+++ b/gui.c
@@ -686,7 +686,6 @@ static void start_conversion_clicked (GtkWidget *w, gpointer data);
static void vcpu_topo_toggled (GtkWidget *w, gpointer data);
static void vcpus_or_memory_check_callback (GtkWidget *w, gpointer data);
static void notify_ui_callback (int type, const char *data);
-static bool get_phys_topo_from_conv_dlg (void);
static int get_vcpus_from_conv_dlg (void);
static uint64_t get_memory_from_conv_dlg (void);
@@ -1662,7 +1661,7 @@ vcpu_topo_toggled (GtkWidget *w, gpointer data)
unsigned vcpus;
char vcpus_str[64];
- phys_topo = get_phys_topo_from_conv_dlg ();
+ phys_topo = tgl_btn_is_act (vcpu_topo);
if (phys_topo) {
struct cpu_topo topo;
@@ -1720,12 +1719,6 @@ vcpus_or_memory_check_callback (GtkWidget *w, gpointer data)
gtk_label_set_text (GTK_LABEL (target_warning_label), "");
}
-static bool
-get_phys_topo_from_conv_dlg (void)
-{
- return tgl_btn_is_act (vcpu_topo);
-}
-
static int
get_vcpus_from_conv_dlg (void)
{
@@ -2099,7 +2092,7 @@ start_conversion_clicked (GtkWidget *w, gpointer data)
return;
}
- config->vcpu.phys_topo = get_phys_topo_from_conv_dlg ();
+ config->vcpu.phys_topo = tgl_btn_is_act (vcpu_topo);
config->vcpu.cores = get_vcpus_from_conv_dlg ();
config->memory = get_memory_from_conv_dlg ();