diff options
| author | Michael Biebl <biebl@debian.org> | 2020-10-05 22:27:18 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2020-10-05 22:27:18 +0200 |
| commit | aafc1dbe4712c86189bbc1d4d54ad8cb4c69be7e (patch) | |
| tree | a2a9bb4d007339a0b1304540388230ccedac32bd /shared/n-acd/src | |
| parent | e7b44ef4c80907346ec7492a09c45277459924fc (diff) | |
New upstream version 1.27.90 upstream/1.27.90
Diffstat (limited to 'shared/n-acd/src')
| -rw-r--r-- | shared/n-acd/src/n-acd-probe.c | 4 | ||||
| -rw-r--r-- | shared/n-acd/src/n-acd.c | 4 | ||||
| -rw-r--r-- | shared/n-acd/src/util/timer.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/shared/n-acd/src/n-acd-probe.c b/shared/n-acd/src/n-acd-probe.c index 43dd344c..2a5c6451 100644 --- a/shared/n-acd/src/n-acd-probe.c +++ b/shared/n-acd/src/n-acd-probe.c @@ -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) { diff --git a/shared/n-acd/src/n-acd.c b/shared/n-acd/src/n-acd.c index af3328c1..c1d92865 100644 --- a/shared/n-acd/src/n-acd.c +++ b/shared/n-acd/src/n-acd.c @@ -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. diff --git a/shared/n-acd/src/util/timer.c b/shared/n-acd/src/util/timer.c index 3c9570a1..af2a887c 100644 --- a/shared/n-acd/src/util/timer.c +++ b/shared/n-acd/src/util/timer.c @@ -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. */ |