Fixed some typos, courtesy of codespell

Main change is the conversion from the British cancelling/-ed to the
American canceling/-ed.
This commit is contained in:
Tobias Brunner
2021-06-25 11:32:29 +02:00
parent 30fab57124
commit f6aafb3005
36 changed files with 67 additions and 67 deletions
+1 -1
View File
@@ -117,7 +117,7 @@ struct fetcher_t {
*
* The fetcher returns NOT_SUPPORTED to indicate that it is uncappable
* to handle such URLs. Other return values indicate a failure, and
* fetching of that URL gets cancelled.
* fetching of that URL gets canceled.
* If no FETCH_CALLBACK function is set as option, userdata must be
* a chunk_t*. This chunk gets allocated, accumulated data using the
* fetcher_default_callback() function.
@@ -148,7 +148,7 @@ static job_requeue_t monitor_changes(private_keychain_creds_t *this)
{
this->loop = CFRunLoopGetCurrent();
/* does not return until cancelled */
/* does not return until canceled */
CFRunLoopRun();
this->loop = NULL;
@@ -173,7 +173,7 @@ CALLBACK(dispatch_slot_events, job_requeue_t,
rv = entry->lib->f->C_WaitForSlotEvent(0, &slot, NULL);
if (rv == CKR_FUNCTION_NOT_SUPPORTED || rv == CKR_NO_EVENT)
{
DBG1(DBG_CFG, "module '%s' does not support hot-plugging, cancelled",
DBG1(DBG_CFG, "module '%s' does not support hot-plugging, canceled",
entry->lib->get_name(entry->lib));
return JOB_REQUEUE_NONE;
}
@@ -165,7 +165,7 @@ static bool read_result(private_winhttp_fetcher_t *this, HINTERNET request,
}
if (!this->cb(user, chunk_create(buf, received)))
{
DBG1(DBG_LIB, "processing response failed or cancelled");
DBG1(DBG_LIB, "processing response failed or canceled");
return FALSE;
}
}
+5 -5
View File
@@ -186,12 +186,12 @@ static void update(private_watcher_t *this)
}
/**
* Cleanup function if callback gets cancelled
* Cleanup function if callback gets canceled
*/
static void unregister(notify_data_t *data)
{
/* if a thread processing a callback gets cancelled, we mark the entry
* as cancelled, like the callback would return FALSE. This is required
/* if a thread processing a callback gets canceled, we mark the entry
* as canceled, like the callback would return FALSE. This is required
* to not queue this watcher again if all threads have been gone. */
data->keep = FALSE;
}
@@ -276,7 +276,7 @@ static void activate_all(private_watcher_t *this)
{
entry_t *entry;
/* When the watcher thread gets cancelled, we have to reactivate any entry
/* When the watcher thread gets canceled, we have to reactivate any entry
* and signal threads in remove() to go on. */
this->mutex->lock(this->mutex);
@@ -398,7 +398,7 @@ static job_requeue_t watch(private_watcher_t *this)
if (res == -1 && errno == EINTR)
{
/* LinuxThreads interrupts poll(), but does not make it a
* cancellation point. Manually test if we got cancelled. */
* cancellation point. Manually test if we got canceled. */
thread_cancellation_point();
}
@@ -1130,7 +1130,7 @@ static void *cancel_onoff_run(void *data_in)
thread_cancelability(FALSE);
data->cancellable = FALSE;
/* we should not get cancelled here */
/* we should not get canceled here */
data->sem->wait(data->sem);
data->cancellable = TRUE;
+2 -2
View File
@@ -84,7 +84,7 @@ struct private_thread_t {
bool detached_or_joined;
/**
* TRUE if the threads has terminated (cancelled, via thread_exit or
* TRUE if the threads has terminated (canceled, via thread_exit or
* returned from the main function)
*/
bool terminated;
@@ -130,7 +130,7 @@ static thread_value_t *current_thread;
#endif
/* the signal handler for SIG_CANCEL uses pthread_exit to terminate the
* "cancelled" thread */
* "canceled" thread */
static void cancel_signal_handler(int sig)
{
pthread_exit(NULL);
+1 -1
View File
@@ -109,7 +109,7 @@ u_int thread_current_id();
/**
* Push a function onto the current thread's cleanup handler stack.
* The callback function is called whenever the thread is cancelled, exits or
* The callback function is called whenever the thread is canceled, exits or
* thread_cleanup_pop is called with TRUE as execute argument.
*
* @param cleanup function called on thread exit
+1 -1
View File
@@ -87,7 +87,7 @@ struct private_thread_t {
bool cancelability;
/**
* Has the thread been cancelled by thread->cancel()?
* Has the thread been canceled by thread->cancel()?
*/
bool canceled;
+1 -1
View File
@@ -299,7 +299,7 @@ struct identification_t {
* - ID_RFC822_ADDR: [email protected]
* - ID_DER_ASN1_DN: C=CH, O=Linux strongSwan, CN=bob
*
* In favour of pluto, domainnames are prepended with an @, since
* In favor of pluto, domainnames are prepended with an @, since
* pluto resolves domainnames without an @ to IPv4 addresses. Since
* we use a separate host_t class for addresses, this doesn't
* make sense for us.