shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-27 10:25:37 +03:00
Code

Merge pull request #32677 from keszybz/wording-fixes

Browse Source 
Wording fixes
This commit is contained in:
Luca Boccassi 2024-05-07 11:03:44 +02:00 committed by GitHub
commit 5dbc2b21dc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
man/sd_event_add_io.xml
View File

@ -218,18 +218,17 @@
<para><function>sd_event_source_set_io_fd()</function> changes the UNIX file descriptor of an I/O event <para><function>sd_event_source_set_io_fd()</function> changes the UNIX file descriptor of an I/O event
source created previously with <function>sd_event_add_io()</function>. It takes the event source object source created previously with <function>sd_event_add_io()</function>. It takes the event source object
and the new file descriptor. If the event source takes the ownership of the previous file descriptor, and the new file descriptor as parameters. If the event source owned the previous file descriptor, that
that is, <function>sd_event_source_set_io_fd_own()</function> was called for the event source with a is if <function>sd_event_source_set_io_fd_own()</function> had been called for the event source with a
non-zero value, then the previous file descriptor will be closed and the event source will also take the non-zero value, then the previous file descriptor will be closed and the event source will also take the
ownership of the new file descriptor on success.</para> ownership of the new file descriptor on success.</para>
<para><function>sd_event_source_set_io_fd_own()</function> controls whether the file descriptor of the <para><function>sd_event_source_set_io_fd_own()</function> controls whether the file descriptor of the
event source shall be closed automatically when the event source is freed (or when the file descriptor event source shall take ownership of the file descriptor. Takes a boolean parameter
assigned to the event source is replaced by <function>sd_event_source_set_io_fd()</function>), i.e. <parameter>b</parameter>. When true (nonzero), the file descriptor will be closed automatically when the
whether it shall be considered 'owned' by the event source object. By default it is not closed event source is freed or when the file descriptor is replaced by
automatically, and the application has to do this on its own. The <parameter>b</parameter> parameter is a <function>sd_event_source_set_io_fd()</function>. By default the descriptor is not owned by the event
boolean parameter: if zero, the file descriptor is not closed automatically when the event source is source, and the application has to do close it on its own if needed.</para>
freed, otherwise it is closed.</para>
<para><function>sd_event_source_get_io_fd_own()</function> may be used to query the current setting of the file <para><function>sd_event_source_get_io_fd_own()</function> may be used to query the current setting of the file
descriptor ownership boolean flag as set with <function>sd_event_source_set_io_fd_own()</function>. It returns descriptor ownership boolean flag as set with <function>sd_event_source_set_io_fd_own()</function>. It returns

6
src/core/dbus-manager.c
View File

@ -1596,7 +1596,7 @@ static int method_reload(sd_bus_message *message, void *userdata, sd_bus_error *
return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */ return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */
/* Write a log message noting the unit or process who requested the Reload() */ /* Write a log message noting the unit or process who requested the Reload() */
log_caller(message, m, "Reloading"); log_caller(message, m, "Reload");
/* Check the rate limit after the authorization succeeds, to avoid denial-of-service issues. */ /* Check the rate limit after the authorization succeeds, to avoid denial-of-service issues. */
if (!ratelimit_below(&m->reload_reexec_ratelimit)) { if (!ratelimit_below(&m->reload_reexec_ratelimit)) {
@ -1642,11 +1642,11 @@ static int method_reexecute(sd_bus_message *message, void *userdata, sd_bus_erro
return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */ return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */
/* Write a log message noting the unit or process who requested the Reexecute() */ /* Write a log message noting the unit or process who requested the Reexecute() */
log_caller(message, m, "Reexecuting"); log_caller(message, m, "Reexecution");
/* Check the rate limit after the authorization succeeds, to avoid denial-of-service issues. */ /* Check the rate limit after the authorization succeeds, to avoid denial-of-service issues. */
if (!ratelimit_below(&m->reload_reexec_ratelimit)) { if (!ratelimit_below(&m->reload_reexec_ratelimit)) {
log_warning("Reexecuting request rejected due to rate limit."); log_warning("Reexecution request rejected due to rate limit.");
return sd_bus_error_setf(error, return sd_bus_error_setf(error,
SD_BUS_ERROR_LIMITS_EXCEEDED, SD_BUS_ERROR_LIMITS_EXCEEDED,
"Reexecute() request rejected due to rate limit."); "Reexecute() request rejected due to rate limit.");