From 0e420c360e8358e41e136de8aff1438b97d193e2 Mon Sep 17 00:00:00 2001 From: a1346054 <36859588+a1346054@users.noreply.github.com> Date: Thu, 2 Sep 2021 22:30:46 +0000 Subject: [PATCH] Fix spelling --- README | 2 +- doc/faq.xml | 2 +- doc/manual/logging.md | 2 +- doc/manual/logging.tex | 2 +- rak/algorithm.h | 2 +- rak/functional.h | 2 +- rak/partial_queue.h | 2 +- rak/socket_address.h | 4 ++-- rak/string_manip.h | 2 +- src/command_ui.cc | 2 +- src/core/download_list.cc | 6 +++--- src/core/manager.cc | 4 ++-- src/core/view.cc | 2 +- src/core/view.h | 4 ++-- src/core/view_manager.cc | 2 +- src/display/canvas.h | 2 +- src/display/window.h | 2 +- src/display/window_file_list.cc | 2 +- src/input/path_input.cc | 4 ++-- src/main.cc | 2 +- src/rpc/command_scheduler_item.cc | 2 +- src/rpc/exec_file.cc | 2 +- src/rpc/parse.cc | 4 ++-- src/rpc/xmlrpc.cc | 2 +- src/thread_base.cc | 2 +- src/utils/list_focus.h | 2 +- 26 files changed, 33 insertions(+), 33 deletions(-) diff --git a/README b/README index f2aca1eea..24667967a 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ necessary. The man page "doc/rtorrent.1" must be generated with "docbook2man rtorrent.1.xml" if it is missing. Note that rtorrent follows the development of libtorrent closely, and -thus the versions must be in sync. This should not be nessesary in the +thus the versions must be in sync. This should not be necessary in the future, when the library API stabilizes. USAGE diff --git a/doc/faq.xml b/doc/faq.xml index aed0c8c4f..369dcedb0 100644 --- a/doc/faq.xml +++ b/doc/faq.xml @@ -93,7 +93,7 @@ When I try downloading a torrent the client aborts (SIGABRT), what should I do? - Make sure you arn't using "-fomit-frame-pointer" when + Make sure you aren't using "-fomit-frame-pointer" when compiling libtorrent and rtorrent, this is known to produce bad code for C++ exception handling. If this doesn't help, run the client in gdb and use "bt -20" to get a backtrace. Send diff --git a/doc/manual/logging.md b/doc/manual/logging.md index 19441a8d1..4875b0383 100644 --- a/doc/manual/logging.md +++ b/doc/manual/logging.md @@ -31,7 +31,7 @@ Each log handle can be added to multiple different logging events. "debug" The above events receive logging events from all the sub-groups -displayed below, and each event also reciving events from the event +displayed below, and each event also receiving events from the event above in importance. Thus some high-volume sub-group events such as “tracker\_debug” are not diff --git a/doc/manual/logging.tex b/doc/manual/logging.tex index 67aa294ea..68531d1f8 100644 --- a/doc/manual/logging.tex +++ b/doc/manual/logging.tex @@ -39,7 +39,7 @@ \subsection{Logging events} \end{verbatim} The above events receive logging events from all the sub-groups -displayed below, and each event also reciving events from the event +displayed below, and each event also receiving events from the event above in importance. Thus some high-volume sub-group events such as ``tracker\_debug'' are diff --git a/rak/algorithm.h b/rak/algorithm.h index 986138201..0af290258 100644 --- a/rak/algorithm.h +++ b/rak/algorithm.h @@ -177,7 +177,7 @@ inline int popcount_wrapper(T t) { } // Get the median of an unordered set of numbers of arbitrary -// type by modifing the underlying dataset +// type by modifying the underlying dataset template T median(_InputIter __first, _InputIter __last) { T __med; diff --git a/rak/functional.h b/rak/functional.h index ac77b2dac..995bd789c 100644 --- a/rak/functional.h +++ b/rak/functional.h @@ -456,7 +456,7 @@ bind2nd(const Operation& op, const Type& val) { // Lightweight callback function including pointer to object. Should // be replaced by TR1 stuff later. Requires an object to bind, instead -// of using a seperate functor for that. +// of using a separate functor for that. template class ptr_fun0 { diff --git a/rak/partial_queue.h b/rak/partial_queue.h index 1abfdddf2..193eedc42 100644 --- a/rak/partial_queue.h +++ b/rak/partial_queue.h @@ -70,7 +70,7 @@ class partial_queue { // check how full we are in the lower parts so the caller knows when // he can stop searching. // - // Though propably not needed, as we must continue til the first + // Though probably not needed, as we must continue til the first // layer is full. size_type max_size() const { return m_maxLayerSize * num_layers; } diff --git a/rak/socket_address.h b/rak/socket_address.h index 8eb601168..654cb8908 100644 --- a/rak/socket_address.h +++ b/rak/socket_address.h @@ -100,7 +100,7 @@ class socket_address { std::string pretty_address_str() const; - // Attemts to set it as an inet, then an inet6 address. It will + // Attempts to set it as an inet, then an inet6 address. It will // never set anything but net addresses, no local/unix. bool set_address_str(const std::string& a) { return set_address_c_str(a.c_str()); } bool set_address_c_str(const char* a); @@ -123,7 +123,7 @@ class socket_address { const sockaddr_in6* c_sockaddr_inet6() const { return &m_sockaddrInet6; } // Copy a socket address which has the length 'length. Zero out any - // extranous bytes and ensure it does not go beyond the size of this + // extraneous bytes and ensure it does not go beyond the size of this // struct. void copy(const socket_address& src, size_t length); void copy_sockaddr(const sockaddr* src); diff --git a/rak/string_manip.h b/rak/string_manip.h index 1a09c3775..54d435f39 100644 --- a/rak/string_manip.h +++ b/rak/string_manip.h @@ -113,7 +113,7 @@ Sequence trim_classic(const Sequence& seq) { return trim_begin_classic(trim_end_classic(seq)); } -// Consider rewritting such that m_seq is replaced by first/last. +// Consider rewriting such that m_seq is replaced by first/last. template class split_iterator_t { public: diff --git a/src/command_ui.cc b/src/command_ui.cc index 1399cfe73..21e6d87b9 100644 --- a/src/command_ui.cc +++ b/src/command_ui.cc @@ -862,7 +862,7 @@ initialize_command_ui() { CMD2_ANY("or", &apply_or); // A temporary command for handling stuff until we get proper - // support for seperation of commands and literals. + // support for separation of commands and literals. CMD2_ANY("branch", std::bind(&apply_if, std::placeholders::_1, std::placeholders::_2, 1)); CMD2_ANY_LIST("less", &apply_less); diff --git a/src/core/download_list.cc b/src/core/download_list.cc index 680810d2b..ff2e52500 100644 --- a/src/core/download_list.cc +++ b/src/core/download_list.cc @@ -315,7 +315,7 @@ DownloadList::close_throw(Download* download) { // Save the torrent on close, this covers shutdown and if a torrent // is manually closed which would clear the progress data. For - // better crash protection, save regulary in addition to this. + // better crash protection, save regularly in addition to this. // // Used to be in pause, but this was wrong for rehashing etc. // @@ -512,7 +512,7 @@ DownloadList::hash_done(Download* download) { // downloaded to ensure something was transferred, thus we didn't // just hash an already completed torrent with lacking session data? // - // Perhaps we should use a seperate variable or state, and check + // Perhaps we should use a separate variable or state, and check // that. Thus we can bork the download if the hash check doesn't // confirm all the data, avoiding large BW usage on f.ex. the // ReiserFS bug with >4GB files. @@ -675,7 +675,7 @@ DownloadList::confirm_finished(Download* download) { // See #1292. // // Just reset the value for the moment. If a torrent finishes while - // others are hashing, or some other situtation that causes resume + // others are hashing, or some other situation that causes resume // flag to change could cause the state to be invalid. // // TODO: Add a check when setting the flags to see if the torrent is diff --git a/src/core/manager.cc b/src/core/manager.cc index 686edd83a..4b7345a3d 100644 --- a/src/core/manager.cc +++ b/src/core/manager.cc @@ -392,7 +392,7 @@ Manager::try_create_download_from_meta_download(torrent::Object* bencode, const f->set_print_log(meta.get_key_value("print_log")); f->slot_finished(std::bind(&rak::call_delete_func, f)); - // Bit of a waste to create the bencode repesentation here + // Bit of a waste to create the bencode representation here // only to have the DownloadFactory decode it. std::stringstream s; s.imbue(std::locale::classic()); @@ -482,7 +482,7 @@ Manager::try_create_download_expand(const std::string& uri, int flags, command_l // DownloadList's hashing related functions don't actually start the // hashing, it only reacts to events. This functions checks the -// hashing view and starts hashing if nessesary. +// hashing view and starts hashing if necessary. void Manager::receive_hashing_changed() { bool foundHashing = std::find_if(m_hashingView->begin_visible(), m_hashingView->end_visible(), diff --git a/src/core/view.cc b/src/core/view.cc index 272cd87c1..22d442436 100644 --- a/src/core/view.cc +++ b/src/core/view.cc @@ -266,7 +266,7 @@ View::filter() { if (m_name == "started" || m_name == "stopped") return; - // Parition the list in two steps so we know which elements changed. + // Partition the list in two steps so we know which elements changed. iterator splitVisible = std::stable_partition(begin_visible(), end_visible(), view_downloads_filter(m_filter, m_temp_filter)); iterator splitFiltered = std::stable_partition(begin_filtered(), end_filtered(), view_downloads_filter(m_filter, m_temp_filter)); diff --git a/src/core/view.h b/src/core/view.h index c6e3d0859..c9cf7a88d 100644 --- a/src/core/view.h +++ b/src/core/view.h @@ -119,7 +119,7 @@ class View : private std::vector { void set_sort_new(const torrent::Object& s) { m_sortNew = s; } void set_sort_current(const torrent::Object& s) { m_sortCurrent = s; } - // Need to explicity trigger filtering. + // Need to explicitly trigger filtering. void filter(); void filter_by(const torrent::Object& condition, base_type& result); void filter_download(core::Download* download); @@ -146,7 +146,7 @@ class View : private std::vector { rak::timer last_changed() const { return m_lastChanged; } void set_last_changed(const rak::timer& t = ::cachedTime) { m_lastChanged = t; } - // Don't connect any slots until after initialize else it get's + // Don't connect any slots until after initialize else it gets // triggered when adding the Download's in DownloadList. signal_void& signal_changed() { return m_signal_changed; } diff --git a/src/core/view_manager.cc b/src/core/view_manager.cc index 7f711c372..e5fa7c305 100644 --- a/src/core/view_manager.cc +++ b/src/core/view_manager.cc @@ -96,7 +96,7 @@ ViewManager::sort(const std::string& name, uint32_t timeout) { if ((*viewItr)->last_changed() + rak::timer::from_seconds(timeout) > cachedTime) return; - // Should we rename sort, or add a seperate function? + // Should we rename sort, or add a separate function? (*viewItr)->filter(); (*viewItr)->sort(); } diff --git a/src/display/canvas.h b/src/display/canvas.h index b324d81a2..e6cfa0742 100644 --- a/src/display/canvas.h +++ b/src/display/canvas.h @@ -82,7 +82,7 @@ class Canvas { chtype bl, chtype br) { if (!m_isDaemon) { wborder(m_window, ls, rs, ts, bs, tl, tr, bl, br); } } // The format string is non-const, but that will not be a problem - // since the string shall always be a C string choosen at + // since the string shall always be a C string chosen at // compiletime. Might cause extra copying of the string? void print(const char* str, ...); diff --git a/src/display/window.h b/src/display/window.h index 8e310aba9..b0053edbf 100644 --- a/src/display/window.h +++ b/src/display/window.h @@ -89,7 +89,7 @@ class Window { bool is_width_dynamic() const { return m_maxWidth > m_minWidth; } bool is_height_dynamic() const { return m_maxHeight > m_minHeight; } - // Do not call mark_dirty() from withing redraw() as it may cause + // Do not call mark_dirty() from within redraw() as it may cause // infinite looping in the display scheduler. bool is_dirty() { return m_taskUpdate.is_queued(); } void mark_dirty() { if (!is_active()) return; m_slotSchedule(this, cachedTime); } diff --git a/src/display/window_file_list.cc b/src/display/window_file_list.cc index b55049086..9be134aaf 100644 --- a/src/display/window_file_list.cc +++ b/src/display/window_file_list.cc @@ -51,7 +51,7 @@ namespace display { // Don't really like the direction of the element dependency, but -// don't really feel like making a seperate class for containing the +// don't really feel like making a separate class for containing the // necessary information. WindowFileList::WindowFileList(const ui::ElementFileList* element) : Window(new Canvas, 0, 0, 0, extent_full, extent_full), diff --git a/src/input/path_input.cc b/src/input/path_input.cc index caf1e17b4..65b386bf3 100644 --- a/src/input/path_input.cc +++ b/src/input/path_input.cc @@ -108,8 +108,8 @@ PathInput::receive_do_complete() { std::string base = rak::make_base(r.first, r.second, rak::const_mem_ref(&utils::directory_entry::d_name)); // Clear the path after the cursor to make this code cleaner. It's - // not really nessesary to add the complexity just because someone - // might start tab-completeing in the middle of a path. + // not really necessary to add the complexity just because someone + // might start tab-completing in the middle of a path. str().resize(dirEnd); str().insert(dirEnd, base); diff --git a/src/main.cc b/src/main.cc index 67a10d4a0..36c7d44f0 100644 --- a/src/main.cc +++ b/src/main.cc @@ -595,7 +595,7 @@ handle_sigbus(int signum, siginfo_t* sa, void* ptr) { void do_panic(int signum) { - // Use the default signal handler in the future to avoid infinit + // Use the default signal handler in the future to avoid infinite // loops. SignalHandler::set_default(signum); display::Canvas::cleanup(); diff --git a/src/rpc/command_scheduler_item.cc b/src/rpc/command_scheduler_item.cc index 42a6ef434..8ce5af9ce 100644 --- a/src/rpc/command_scheduler_item.cc +++ b/src/rpc/command_scheduler_item.cc @@ -56,7 +56,7 @@ CommandSchedulerItem::enable(rak::timer t) { // If 'first' is zero then we execute the task // immediately. ''interval()'' will not return zero so we never end - // up in an infinit loop. + // up in an infinite loop. m_timeScheduled = t; priority_queue_insert(&taskScheduler, &m_task, t); } diff --git a/src/rpc/exec_file.cc b/src/rpc/exec_file.cc index 189914398..ac0ba29f6 100644 --- a/src/rpc/exec_file.cc +++ b/src/rpc/exec_file.cc @@ -62,7 +62,7 @@ const int ExecFile::flag_background; int ExecFile::execute(const char* file, char* const* argv, int flags) { - // Write the execued command and its parameters to the log fd. + // Write the executed command and its parameters to the log fd. int __UNUSED result; if (m_logFd != -1) { diff --git a/src/rpc/parse.cc b/src/rpc/parse.cc index 63a6d046d..cd7be0239 100644 --- a/src/rpc/parse.cc +++ b/src/rpc/parse.cc @@ -192,7 +192,7 @@ parse_object(const char* first, const char* last, torrent::Object* dest, bool (* } if (depth > 3) - throw torrent::input_error("Max 3 parantheses per object allowed."); + throw torrent::input_error("Max 3 parentheses per object allowed."); *dest = torrent::Object::create_dict_key(); dest->set_flags(torrent::Object::flag_function << (depth - 1)); @@ -216,7 +216,7 @@ parse_object(const char* first, const char* last, torrent::Object* dest, bool (* } if (depth != 0) - throw torrent::input_error("Parantheses mismatch."); + throw torrent::input_error("Parentheses mismatch."); return first; diff --git a/src/rpc/xmlrpc.cc b/src/rpc/xmlrpc.cc index 8bacd882e..74febd3af 100644 --- a/src/rpc/xmlrpc.cc +++ b/src/rpc/xmlrpc.cc @@ -553,7 +553,7 @@ XmlRpc::insert_command(const char* name, const char* parm, const char* doc) { &xmlrpc_call_command, const_cast(name), parm, doc); if (localEnv.fault_occurred) - throw torrent::internal_error("Fault occured while inserting xmlrpc call."); + throw torrent::internal_error("Fault occurred while inserting xmlrpc call."); xmlrpc_env_clean(&localEnv); } diff --git a/src/thread_base.cc b/src/thread_base.cc index 081791d4c..f64b04de9 100644 --- a/src/thread_base.cc +++ b/src/thread_base.cc @@ -53,7 +53,7 @@ #include "control.h" #include "core/manager.h" -// Temporarly injected into config.h. +// Temporarily injected into config.h. /* temp hack */ //#define lt_cacheline_aligned __attribute__((__aligned__(128))) diff --git a/src/utils/list_focus.h b/src/utils/list_focus.h index c80d0f7d0..764a5e81a 100644 --- a/src/utils/list_focus.h +++ b/src/utils/list_focus.h @@ -59,7 +59,7 @@ class ListFocus { ListFocus(base_type* b = NULL) : m_base(b) { if (b) m_focus = b->end(); } - // Convinience functions, would have added more through using, but + // Convenience functions, would have added more through using, but // can't. iterator begin() { return m_base->begin(); } iterator end() { return m_base->end(); }