From 45a61a6438e4fae1cdcf808582aa4791aecf2fc1 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 30 Sep 2025 16:37:51 +0000 Subject: [PATCH] graphs: Take the object name as first (and only) argument Signed-off-by: Michael Tremer --- src/daemon/graph-bus.c | 12 ++++++++---- src/daemon/graph.c | 2 +- src/daemon/graph.h | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/daemon/graph-bus.c b/src/daemon/graph-bus.c index b26ef6d..f610fe3 100644 --- a/src/daemon/graph-bus.c +++ b/src/daemon/graph-bus.c @@ -98,18 +98,22 @@ ERROR: static int collecty_graph_bus_render(sd_bus_message* m, void* data, sd_bus_error* error) { collecty_graph* graph = data; sd_bus_message* reply = NULL; - const char* format = NULL; + const char* object = NULL; char* buffer = NULL; size_t length = 0; int r; // Parse the arguments - r = sd_bus_message_read(m, "s", &format); + r = sd_bus_message_read(m, "s", &object); if (r < 0) goto ERROR; + // If an empty string has been sent, set it to NULL + if (object && !*object) + object = NULL; + // Render the graph - r = collecty_graph_render(graph, format, &buffer, &length); + r = collecty_graph_render(graph, object, &buffer, &length); if (r < 0) goto ERROR; @@ -140,7 +144,7 @@ static const sd_bus_vtable collecty_graph_vtable[] = { SD_BUS_VTABLE_START(0), // Operations - SD_BUS_METHOD_WITH_ARGS("Render", SD_BUS_ARGS("s", format), SD_BUS_RESULT("ay", graph), + SD_BUS_METHOD_WITH_ARGS("Render", SD_BUS_ARGS("s", object), SD_BUS_RESULT("ay", graph), collecty_graph_bus_render, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_VTABLE_END diff --git a/src/daemon/graph.c b/src/daemon/graph.c index 888a45e..696ad4b 100644 --- a/src/daemon/graph.c +++ b/src/daemon/graph.c @@ -106,7 +106,7 @@ char* collecty_graph_get_bus_path(collecty_graph* self) { } int collecty_graph_render(collecty_graph* self, - const char* format, char** buffer, size_t* length) { + const char* object, char** buffer, size_t* length) { char* p = NULL; int r; diff --git a/src/daemon/graph.h b/src/daemon/graph.h index 01509be..da4856c 100644 --- a/src/daemon/graph.h +++ b/src/daemon/graph.h @@ -43,6 +43,6 @@ const char* collecty_graph_get_name(collecty_graph* self); char* collecty_graph_get_bus_path(collecty_graph* self); int collecty_graph_render(collecty_graph* self, - const char* format, char** buffer, size_t* length); + const char* object, char** buffer, size_t* length); #endif /* COLLECTY_GRAPH_H */ -- 2.47.3