SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shared: add optional error parameter in bus_print_all_properties()

Browse Source 
While here, remove the unused found_properties parameter.

This is preparation for another commit.
This commit is contained in:
Nick Rosbrook
2025-05-28 04:40:08 +09:00
committed by Yu Watanabe
parent ae6420c923
commit 906145d53f
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/bus-print-properties.c
+3 -4
View File
@@ -428,10 +428,9 @@ int bus_print_all_properties(
bus_message_print_t func,
char **filter,
BusPrintPropertyFlags flags,
Set **found_properties) {
sd_bus_error *reterr) {
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
int r;
assert(bus);
@@ -442,11 +441,11 @@ int bus_print_all_properties(
path,
"org.freedesktop.DBus.Properties",
"GetAll",
&error,
reterr,
&reply,
"s", "");
if (r < 0)
return r;
return bus_message_print_all_properties(reply, func, filter, flags, found_properties);
return bus_message_print_all_properties(reply, func, filter, flags, NULL);
}
src/shared/bus-print-properties.h
+1 -1
View File
@@ -13,4 +13,4 @@ typedef int (*bus_message_print_t) (const char *name, const char *expected_value
int bus_print_property_value(const char *name, const char *expected_value, BusPrintPropertyFlags flags, const char *value);
int bus_print_property_valuef(const char *name, const char *expected_value, BusPrintPropertyFlags flags, const char *fmt, ...) _printf_(4,5);
int bus_message_print_all_properties(sd_bus_message *m, bus_message_print_t func, char **filter, BusPrintPropertyFlags flags, Set **found_properties);
int bus_print_all_properties(sd_bus *bus, const char *dest, const char *path, bus_message_print_t func, char **filter, BusPrintPropertyFlags flags, Set **found_properties);
int bus_print_all_properties(sd_bus *bus, const char *dest, const char *path, bus_message_print_t func, char **filter, BusPrintPropertyFlags flags, sd_bus_error *reterr);