Skip to content

Commit

Permalink
Merge pull request #1412 from luzpaz/typos
Browse files Browse the repository at this point in the history
Fix various typos
  • Loading branch information
facekapow authored Aug 22, 2023
2 parents 04cacae + 7126e7c commit a12ec5d
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ You can uninstall and list packages with the `uninstaller` command.

### Working with DMG images

DMG images can be attached and deattached from inside `darling shell` with `hdiutil`. This is how you can install Xcode along with its toolchain and SDKs (note that Xcode itself doesn't run yet):
DMG images can be attached and detached from inside `darling shell` with `hdiutil`. This is how you can install Xcode along with its toolchain and SDKs (note that Xcode itself doesn't run yet):

````
Darling [~]$ hdiutil attach Xcode_7.2.dmg
Expand Down
2 changes: 1 addition & 1 deletion src/libsimple/src/lock.c
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ void libsimple_once(libsimple_once_t* _once, libsimple_once_callback callback, v
return;
}; // not reached
case libsimple_once_state_triggered_uncontended: {
// somebody is already perfoming the callback;
// somebody is already performing the callback;
// now we're waiting, so let's update the state for that
libsimple_once_debug("someone is already performing the callback with no waiters; becoming first waiter...");
exchanged = atomic_compare_exchange_strong_explicit(&once->state, &prev, libsimple_once_state_triggered_contended, memory_order_acq_rel, memory_order_acquire);
Expand Down
2 changes: 1 addition & 1 deletion src/libsystem_coreservices/dirhelper.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,6 @@ int _set_user_dir_suffix(const char* suffix) {
pthread_mutex_lock(&dir_suffix_lock);
dir_suffix = suffix;
pthread_mutex_unlock(&dir_suffix_lock);
return 1; // weird, it's suppossed to return non-zero on success (maybe it's actually a bool?)
return 1; // weird, it's supposed to return non-zero on success (maybe it's actually a bool?)
};

2 changes: 1 addition & 1 deletion src/startup/mldr/commpage.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void commpage_setup(bool _64bit)
logcpus = (uint8_t*)CGET(_COMM_PAGE_LOGICAL_CPUS);
*physcpus = *logcpus = *ncpus;

// I'm not sure if Linux has seperate page sizes for kernel and user space.
// I'm not sure if Linux has separate page sizes for kernel and user space.
// Apple's code uses left shift logical (1 << user_page_shift) to get the page size value.
// Since it's very unlikely that the page size won't be a power of 2, we can use __builtin_ctzl()
// as a substitute for log2().
Expand Down
4 changes: 2 additions & 2 deletions src/startup/mldr/elfcalls/threads.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ struct arg_struct
uintptr_t arg2; // `stack_addr` for normal threads; `flags` for workqueues
uintptr_t arg3; // `flags` for normal threads; `nkevents` for workqueues
union {
void* _backwards_compat; // kept around to avoid modifiying assembly
void* _backwards_compat; // kept around to avoid modifying assembly
int port;
};
unsigned long pth_obj_size;
Expand Down Expand Up @@ -230,7 +230,7 @@ static void* darling_thread_entry(void* p)

// let's check-in with darlingserver on this new thread
int dummy_stack_variable;
// the lifetime pipe fd is ignored as the proces should already have been registered
// the lifetime pipe fd is ignored as the process should already have been registered
if (dserver_rpc_explicit_checkin(t_server_socket, false, &dummy_stack_variable, -1) < 0) {
// we can't do ANYTHING if darlingserver doesn't acknowledge us successfully
abort();
Expand Down
2 changes: 1 addition & 1 deletion src/xtrace/lock.c
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ void xtrace_once(xtrace_once_t* _once, xtrace_once_callback callback) {
return;
}; // not reached
case xtrace_once_state_triggered_uncontended: {
// somebody is already perfoming the callback;
// somebody is already performing the callback;
// now we're waiting, so let's update the state for that
xtrace_once_debug("someone is already performing the callback with no waiters; becoming first waiter...");
exchanged = atomic_compare_exchange_strong_explicit(&once->state, &prev, xtrace_once_state_triggered_contended, memory_order_acq_rel, memory_order_acquire);
Expand Down
2 changes: 1 addition & 1 deletion tools/rename-target
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import argparse
import os
import re

parser = argparse.ArgumentParser(description="Rename a CMake target. Opperates on the current directory.")
parser = argparse.ArgumentParser(description="Rename a CMake target. Operates on the current directory.")

parser.add_argument("old", help="the target to rename", type=str)
parser.add_argument("new", help="the new target name", type=str)
Expand Down
2 changes: 1 addition & 1 deletion tools/stripcomments
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

# This cool can be used to strip most of the copyrightable material from header files.
# Remember that all files processed with this script stil need to be checked manually!
# Remember that all files processed with this script still need to be checked manually!

gcc -DNS_BLOCKS_AVAILABLE -fpreprocessed -dD -E "$1" | egrep -v '# [[:digit:]]' | sed -r 's/APPKIT_EXTERN/EXTERN_C/;s/ ?(NS_AVAILABLE(_MAC)?|NS_DEPRECATED_MAC|NS_CLASS_AVAILABLE)\([^)]+\)//;s/#pragma mark.*//;s/NS_AUTOMATED_REFCOUNT_WEAK_UNAVAILABLE//;s/NS_RETURNS_INNER_POINTER//;s/NS_FORMAT_FUNCTION\(([0-9]+), ?([0-9]+)\)//'

0 comments on commit a12ec5d

Please sign in to comment.