shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-03 05:18:09 +03:00
Code

machine: adjust operation callback logic for varlink

Browse Source 
This is to simplyfy varlink callback. There is no use of this logic atm.
So, no harm.
This commit is contained in:
Ivan Kruglov 2024-11-06 14:31:29 +01:00
parent 8d08f18b52
commit bf4066ece0
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/machine/operation.c
View File

@ -46,10 +46,12 @@ static int operation_done(sd_event_source *s, const siginfo_t *si, void *userdat
if (r < 0)
log_debug_errno(r, "Operation failed: %m");
/* If a completion routine (o->done) is set for this operation, call it. It sends a response, but can return an error in which case it expect us to reply.
* Otherwise, the default action is to simply return an error on failure or an empty success message on success. */
if (o->message) {
/* If o->done set, call it. It sends a response, but can return
* an error in which case it expect this code to reply.
* If o->done is not set, the default action is to simply return
* an error on failure or an empty success message on success.*/
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
if (o->done)
r = o->done(o, r, &error);
@ -68,13 +70,16 @@ static int operation_done(sd_event_source *s, const siginfo_t *si, void *userdat
log_error_errno(r, "Failed to reply to dbus message: %m");
}
} else if (o->link) {
if (o->done)
r = o->done(o, r, /* error = */ NULL);
/* If o->done set, call it. Unlike o->message case above, this
* code expect o->done to reply in all cases.
* If o->done is not set, the default action is to simply return
* an error on failure or an empty success message on success.*/
if (r < 0)
if (o->done)
(void) o->done(o, r, /* error = */ NULL);
else if (r < 0)
(void) sd_varlink_error_errno(o->link, r);
else if (!o->done)
/* when o->done set it's responsible for sending reply in a happy-path case */
else
(void) sd_varlink_reply(o->link, NULL);
} else
assert_not_reached();