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

tree-wide: make bus_map_all_properties return a proper sd_bus_error

Browse Source 
And then show it, to make things a bit friendlier to the user if we fail
acquiring some props.

In fact, this fixes a number of actual bugs, where we used an error
structure for output that we actually never got an error in.
This commit is contained in:
Lennart Poettering
2017-02-09 16:13:07 +01:00
parent 4dae8ae6df
commit f9e0eefc7c
11 changed files with 74 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resolve/resolve-tool.c
+6 -2
View File
@@ -1186,6 +1186,7 @@ static int status_ifindex(sd_bus *bus, int ifindex, const char *name, bool *empt
{}
};
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_free_ char *ifi = NULL, *p = NULL;
char ifname[IF_NAMESIZE] = "";
char **i;
@@ -1213,9 +1214,10 @@ static int status_ifindex(sd_bus *bus, int ifindex, const char *name, bool *empt
"org.freedesktop.resolve1",
p,
property_map,
&error,
&link_info);
if (r < 0) {
log_error_errno(r, "Failed to get link data for %i: %m", ifindex);
log_error_errno(r, "Failed to get link data for %i: %s", ifindex, bus_error_message(&error, r));
goto finish;
}
@@ -1405,6 +1407,7 @@ static int status_global(sd_bus *bus, bool *empty_line) {
{}
};
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
char **i;
int r;
@@ -1415,9 +1418,10 @@ static int status_global(sd_bus *bus, bool *empty_line) {
"org.freedesktop.resolve1",
"/org/freedesktop/resolve1",
property_map,
&error,
&global_info);
if (r < 0) {
log_error_errno(r, "Failed to get global data: %m");
log_error_errno(r, "Failed to get global data: %s", bus_error_message(&error, r));
goto finish;
}