Squashed 'shared/n-acd/' changes from 0237ba54bef7..5c43b8a010a6

5c43b8a010a6 all: fix minor typos

git-subtree-dir: shared/n-acd
git-subtree-split: 5c43b8a010a6f4585c98ea180759eb4bf9bb1509
This commit is contained in:
Thomas Haller 2020-08-05 16:34:45 +02:00
parent 2a30e4b75b
commit aef4332f7f
4 changed files with 6 additions and 6 deletions

View file

@ -682,7 +682,7 @@ _c_public_ void n_acd_probe_get_userdata(NAcdProbe *probe, void **userdatap) {
/**
* n_acd_probe_announce() - announce the configured IP address
* @probe: probe to operate on
* @defend: defence policy
* @defend: defense policy
*
* Announce the IP address on the local link, and start defending it according
* to the given policy, which mut be one of N_ACD_DEFEND_ONCE,
@ -691,7 +691,7 @@ _c_public_ void n_acd_probe_get_userdata(NAcdProbe *probe, void **userdatap) {
* This must be called in response to an N_ACD_EVENT_READY event, and only
* after the given address has been configured on the given network interface.
*
* Return: 0 on success, N_ACD_E_INVALID_ARGUMENT in case the defence policy
* Return: 0 on success, N_ACD_E_INVALID_ARGUMENT in case the defense policy
* is invalid, negative error code on failure.
*/
_c_public_ int n_acd_probe_announce(NAcdProbe *probe, unsigned int defend) {

View file

@ -578,11 +578,11 @@ static int n_acd_handle_timeout(NAcd *acd) {
int r;
/*
* Read the current time once, and handle all timouts that triggered
* Read the current time once, and handle all timeouts that triggered
* before the current time. Rereading the current time in each loop
* might risk creating a live-lock, and the fact that we read the
* time after reading the timer guarantees that the timeout which
* woke us up is hanlded.
* woke us up is handled.
*
* When there are no more timeouts to handle at the given time, we
* rearm the timer to potentially wake us up again in the future.

View file

@ -191,7 +191,7 @@ static inline void test_setup(void) {
/*
* Move into a new network and mount namespace both associated
* with a new user namespace where the current eUID is mapped to
* 0. Then create a a private instance of /run/netns. This ensures
* 0. Then create a private instance of /run/netns. This ensures
* that any network devices or network namespaces are private to
* the test process.
*/

View file

@ -55,7 +55,7 @@ void timer_rearm(Timer *timer) {
int r;
/*
* A timeout value of 0 clears the timer, we sholud only set that if
* A timeout value of 0 clears the timer, we should only set that if
* no timeout exists in the tree.
*/