diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-01-22 14:29:43 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-02-04 18:45:22 +0100 |
| commit | 773b1a7916bfce3aa2a21ecf534d475032e8528e (patch) | |
| tree | b448686289da24f983a919dd748069a069c38037 /src/shared/bus-polkit.c | |
| parent | Merge pull request #14398 from poettering/mount-prep (diff) | |
| download | systemd-773b1a7916bfce3aa2a21ecf534d475032e8528e.tar.xz systemd-773b1a7916bfce3aa2a21ecf534d475032e8528e.zip | |
bus-polkit: rename return error parameter to ret_error
Diffstat (limited to '')
| -rw-r--r-- | src/shared/bus-polkit.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/shared/bus-polkit.c b/src/shared/bus-polkit.c index da4aee5086..f93aa17046 100644 --- a/src/shared/bus-polkit.c +++ b/src/shared/bus-polkit.c @@ -37,7 +37,7 @@ int bus_test_polkit( const char **details, uid_t good_user, bool *_challenge, - sd_bus_error *e) { + sd_bus_error *ret_error) { int r; @@ -102,11 +102,11 @@ int bus_test_polkit( if (r < 0) return r; - r = sd_bus_call(call->bus, request, 0, e, &reply); + r = sd_bus_call(call->bus, request, 0, ret_error, &reply); if (r < 0) { /* Treat no PK available as access denied */ - if (sd_bus_error_has_name(e, SD_BUS_ERROR_SERVICE_UNKNOWN)) { - sd_bus_error_free(e); + if (sd_bus_error_has_name(ret_error, SD_BUS_ERROR_SERVICE_UNKNOWN)) { + sd_bus_error_free(ret_error); return -EACCES; } @@ -196,7 +196,7 @@ int bus_verify_polkit_async( bool interactive, uid_t good_user, Hashmap **registry, - sd_bus_error *error) { + sd_bus_error *ret_error) { #if ENABLE_POLKIT _cleanup_(sd_bus_message_unrefp) sd_bus_message *pk = NULL; @@ -237,7 +237,7 @@ int bus_verify_polkit_async( return -EACCES; /* Copy error from polkit reply */ - sd_bus_error_copy(error, e); + sd_bus_error_copy(ret_error, e); return -sd_bus_error_get_errno(e); } @@ -251,7 +251,7 @@ int bus_verify_polkit_async( return 1; if (challenge) - return sd_bus_error_set(error, SD_BUS_ERROR_INTERACTIVE_AUTHORIZATION_REQUIRED, "Interactive authentication required."); + return sd_bus_error_set(ret_error, SD_BUS_ERROR_INTERACTIVE_AUTHORIZATION_REQUIRED, "Interactive authentication required."); return -EACCES; } |