[PATCH v2 08/13] client: separate property header and values into two functions

James Prestwood
2024-08-08T17:42:46Z

There are certain cases where we may not want to display the entire
header for a given set of properties. For example displaying a list
of proxy interfaces. Add finer control by separating out the header
and the prop/value display into two functions.
---
client/dbus-proxy.c | 38 +++++++++++++++++++++++++++++---------
client/dbus-proxy.h | 7 +++++++
2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/client/dbus-proxy.c b/client/dbus-proxy.c
index 42b8427f..1e50d902 100644
--- a/client/dbus-proxy.c
+++ b/client/dbus-proxy.c
@@ -47,10 +47,10 @@ static struct l_dbus *dbus;
static struct l_queue *proxy_interfaces;
static struct l_queue *proxy_interface_types;

-void proxy_properties_display(const struct proxy_interface *proxy,
- const char *caption, const char *margin,
- unsigned int name_column_width,
- unsigned int value_column_width)
+void proxy_properties_display_inline(const struct proxy_interface *proxy,
+ const char *margin,
+ unsigned int name_column_width,
+ unsigned int value_column_width)
{
const void *data;
const struct proxy_interface_property *properties;
@@ -59,11 +59,6 @@ void proxy_properties_display(const struct proxy_interface *proxy,
if (!proxy->type->properties)
return;

- display_table_header(caption, "%s%-*s %-*s %-*s", margin,
- 8, "Settable",
- name_column_width, "Property",
- value_column_width, "Value");
-
data = proxy_interface_get_data(proxy);
properties = proxy->type->properties;

@@ -82,6 +77,31 @@ void proxy_properties_display(const struct proxy_interface *proxy,
}
}

+void proxy_properties_display_header(const char *caption, const char *margin,
+ unsigned int name_column_width,
+ unsigned int value_column_width)
+{
+ display_table_header(caption, "%s%-*s %-*s %-*s", margin,
+ 8, "Settable",
+ name_column_width, "Property",
+ value_column_width, "Value");
+}
+
+void proxy_properties_display(const struct proxy_interface *proxy,
+ const char *caption, const char *margin,
+ unsigned int name_column_width,
+ unsigned int value_column_width)
+{
+ if (!proxy->type->properties)
+ return;
+
+ proxy_properties_display_header(caption, margin, name_column_width,
+ value_column_width);
+
+ proxy_properties_display_inline(proxy, margin, name_column_width,
+ value_column_width);
+}
+
static const void *proxy_interface_property_tostr(
const struct proxy_interface *proxy,
const char *name)
diff --git a/client/dbus-proxy.h b/client/dbus-proxy.h
index 98b0a2a4..f0a5d38a 100644
--- a/client/dbus-proxy.h
+++ b/client/dbus-proxy.h
@@ -95,6 +95,13 @@ void proxy_properties_display(const struct proxy_interface *proxy,
const char *caption, const char *margin,
unsigned int name_column_width,
unsigned int value_column_width);
+void proxy_properties_display_inline(const struct proxy_interface *proxy,
+ const char *margin,
+ unsigned int name_column_width,
+ unsigned int value_column_width);
+void proxy_properties_display_header(const char *caption, const char *margin,
+ unsigned int name_column_width,
+ unsigned int value_column_width);

char *proxy_property_str_completion(const struct proxy_interface_type *type,
proxy_property_match_func_t function,
--
2.34.1