From b62e1158300f0644b304f2f8b7e8105ba09073b3 Mon Sep 17 00:00:00 2001 From: freddii Date: Thu, 31 Dec 2020 09:09:23 +0100 Subject: [PATCH] fixed wrong spelled words --- cmake/Docbook.cmake | 2 +- cmake/scripts/clang-format-check-changed.py | 4 ++-- doc/config_settings.xml | 2 +- doc/conky-howto.xml | 2 +- doc/docbook-xml/soextblx.dtd | 2 +- doc/variables.xml | 4 ++-- extras/gedit/README.md | 2 +- src/apcupsd.cc | 2 +- src/conky.cc | 2 +- src/darwin.mm | 6 +++--- src/data-source.cc | 2 +- src/iconv_tools.cc | 2 +- src/libmpdclient.h | 2 +- src/libtcp-portmon.cc | 2 +- src/libtcp-portmon.h | 4 ++-- src/linux.cc | 8 ++++---- src/luamm.hh | 2 +- src/mboxscan.cc | 2 +- src/net_stat.cc | 2 +- src/nvidia.cc | 2 +- src/setting.hh | 4 ++-- src/specials.cc | 4 ++-- src/tcp-portmon.h | 2 +- src/template.cc | 2 +- src/text_object.cc | 2 +- src/text_object.h | 2 +- src/top.cc | 4 ++-- src/top.h | 2 +- src/update-cb.hh | 2 +- tests/catch2/catch.hpp | 2 +- 30 files changed, 41 insertions(+), 41 deletions(-) diff --git a/cmake/Docbook.cmake b/cmake/Docbook.cmake index 6cfab11b..3db6efab 100644 --- a/cmake/Docbook.cmake +++ b/cmake/Docbook.cmake @@ -89,7 +89,7 @@ if(BUILD_DOCS) COMMAND ${APP_SED} -i'' -e 's/\\x80//g' ${CMAKE_SOURCE_DIR}/README COMMAND ${APP_SED} -i'' -e 's/\\x90/-/g' ${CMAKE_SOURCE_DIR}/README DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.xml - COMMENT "Proccessing man page for ${FIL}") + COMMENT "Processing man page for ${FIL}") add_custom_target(${FIL} ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.html) endforeach(FIL) diff --git a/cmake/scripts/clang-format-check-changed.py b/cmake/scripts/clang-format-check-changed.py index 84182da9..6b9e4a0c 100755 --- a/cmake/scripts/clang-format-check-changed.py +++ b/cmake/scripts/clang-format-check-changed.py @@ -139,10 +139,10 @@ def run_clang_format(clang_format_bin, changed_files): def cli(): # global params parser = argparse.ArgumentParser(prog='clang-format-check-changed', - description='Checks if files chagned in git match the .clang-format specification') + description='Checks if files changed in git match the .clang-format specification') parser.add_argument("--file-extensions", type=str, default=".cpp,.h,.cxx,.hxx,.hpp,.cc,.ipp", - help="Comma seperated list of file extensions to check") + help="Comma separated list of file extensions to check") parser.add_argument('--exclude', action='append', default=[], help='Will not match the files / directories with these in the name') parser.add_argument('--clang-format-bin', type=str, default="clang-format", diff --git a/doc/config_settings.xml b/doc/config_settings.xml index 9edcf718..af9ab3f7 100644 --- a/doc/config_settings.xml +++ b/doc/config_settings.xml @@ -7,7 +7,7 @@ Aligned position on screen, may be top_left, top_right, top_middle, bottom_left, bottom_right, bottom_middle, middle_left, - middle_middle, middle_right, or none (also can be abreviated as tl, + middle_middle, middle_right, or none (also can be abbreviated as tl, tr, tm, bl, br, bm, ml, mm, mr). See also gap_x and gap_y. diff --git a/doc/conky-howto.xml b/doc/conky-howto.xml index dc2f4705..00cd491c 100644 --- a/doc/conky-howto.xml +++ b/doc/conky-howto.xml @@ -115,7 +115,7 @@ $ Make sure to replace "1.6.0" with the specific version of Conky you have installed.

Now, open up the sample configuration in the text editor of - your choice. You may notice that there are two seperate + your choice. You may notice that there are two separate sections of the configuration file. The first section of the file, contains the programs configuration options and controls how it acts. This includes things such as the diff --git a/doc/docbook-xml/soextblx.dtd b/doc/docbook-xml/soextblx.dtd index 4a92e116..09feef06 100644 --- a/doc/docbook-xml/soextblx.dtd +++ b/doc/docbook-xml/soextblx.dtd @@ -57,7 +57,7 @@ Other miscellaneous changes: - - Tag ommission indicators have been removed + - Tag omission indicators have been removed - Comments have been removed from declarations - NUMBER attributes have been changed to NMTOKEN - NUTOKEN attributes have been to changed to NMTOKEN diff --git a/doc/variables.xml b/doc/variables.xml index 64865649..ab685232 100644 --- a/doc/variables.xml +++ b/doc/variables.xml @@ -1054,7 +1054,7 @@ Evaluates given string according to the rules of conky.text interpretation, i.e. parsing any contained text object specifications - into their output, any occuring '$$' into a single '$' and so on. The + into their output, any occurring '$$' into a single '$' and so on. The output is then being parsed again. @@ -4698,7 +4698,7 @@ low - diff --git a/extras/gedit/README.md b/extras/gedit/README.md index 54382af6..75cf97ae 100644 --- a/extras/gedit/README.md +++ b/extras/gedit/README.md @@ -8,7 +8,7 @@ The syntax highlighting will automatically be applied to all files with `conky` * [Regex Tutorial](http://www.rexegg.com/) * [Regex Testing](https://regex101.com/) -Developers: The main context (`id="conkyrc"`) is where gedit begins. This main context then references other sub-contexts. Each context can apply styles to itself, sub-strings from its regexs, or its contents (in the case of `` "container" contexts). If you are ever confused by something, try searching for XML attributes in the [`gtksourceview` docs][1]. If you find a particuarly complex regex, try using the Regex Tester linked above, and bear in mind that `gtksourceview` adds some extra regex syntax (i.e. `\%[ ... ]` and `\%{ ... }`). +Developers: The main context (`id="conkyrc"`) is where gedit begins. This main context then references other sub-contexts. Each context can apply styles to itself, sub-strings from its regexs, or its contents (in the case of `` "container" contexts). If you are ever confused by something, try searching for XML attributes in the [`gtksourceview` docs][1]. If you find a particularly complex regex, try using the Regex Tester linked above, and bear in mind that `gtksourceview` adds some extra regex syntax (i.e. `\%[ ... ]` and `\%{ ... }`). *** diff --git a/src/apcupsd.cc b/src/apcupsd.cc index c8f52f4b..0c739be8 100644 --- a/src/apcupsd.cc +++ b/src/apcupsd.cc @@ -75,7 +75,7 @@ static int net_recv_ex(int sock, void *buf, int size, struct timeval *tv) { if (res < 0) { return 0; } if (res == 0) { // timeout - errno = ETIMEDOUT; // select was succesfull, errno is now 0 + errno = ETIMEDOUT; // select was successful, errno is now 0 return 0; } diff --git a/src/conky.cc b/src/conky.cc index 53e8c1a5..047625d2 100644 --- a/src/conky.cc +++ b/src/conky.cc @@ -2295,7 +2295,7 @@ void main_loop() { if (g_sigusr2_pending != 0) { g_sigusr2_pending = 0; // refresh view; - NORM_ERR("recieved SIGUSR2. refreshing."); + NORM_ERR("received SIGUSR2. refreshing."); update_text(); draw_stuff(); #ifdef BUILD_NCURSES diff --git a/src/darwin.mm b/src/darwin.mm index 7159c745..e51b1d59 100644 --- a/src/darwin.mm +++ b/src/darwin.mm @@ -618,7 +618,7 @@ int update_meminfo() { * * STEPS: * - get stolen pages count - * Occassionaly host_statistics64 doesn't return correct values (see + * Occasionally host_statistics64 doesn't return correct values (see * https://stackoverflow.com/questions/14789672/why-does-host-statistics64-return-inconsistent-results) * We need to get the count of stolen pages and add it to wired pages count. * This is a known bug and apple has implemented the function @@ -800,7 +800,7 @@ int update_threads() { * If it is RUNNING it means that it actually has some threads * that are in TH_STATE_RUNNING. * Foreach pid and foreach pid's threads check their state and increment - * the run_threads counter acordingly. + * the run_threads counter accordingly. */ int update_running_threads() { struct kinfo_proc *p = nullptr; @@ -1214,7 +1214,7 @@ static void calc_cpu_time_for_proc(struct process *process, /* * finds top-information only for one process which is represented by a - * kinfo_proc struct this function is called mutliple types ( one foreach + * kinfo_proc struct this function is called multiple types ( one foreach * process ) to implement get_top_info() */ static void get_top_info_for_kinfo_proc(struct kinfo_proc *p) { diff --git a/src/data-source.cc b/src/data-source.cc index 44c2e154..e6b5e732 100644 --- a/src/data-source.cc +++ b/src/data-source.cc @@ -33,7 +33,7 @@ namespace { /* * Returned when there is no data available. * An alternative would be to throw an exception, but if we don't want to react - * too aggresively when the user e.g. uses a nonexisting variable, then + * too aggressively when the user e.g. uses a nonexisting variable, then * returning NaN will do just fine. */ float NaN = std::numeric_limits::quiet_NaN(); diff --git a/src/iconv_tools.cc b/src/iconv_tools.cc index a6d4bbb6..cb6505e0 100644 --- a/src/iconv_tools.cc +++ b/src/iconv_tools.cc @@ -97,7 +97,7 @@ void iconv_convert(size_t *a, char *buff_in, char *p, size_t p_max_size) { } } - /* It is nessecary when we are converting from multibyte to + /* It is necessary when we are converting from multibyte to * singlebyte codepage */ // a = outptr - p; //(*a) = *a - dummy2; diff --git a/src/libmpdclient.h b/src/libmpdclient.h index 419f286b..87279931 100644 --- a/src/libmpdclient.h +++ b/src/libmpdclient.h @@ -487,7 +487,7 @@ void mpd_sendRandomCommand(mpd_Connection *connection, int randomMode); void mpd_sendSetvolCommand(mpd_Connection *connection, int volumeChange); -/* WARNING: don't use volume command, its depreacted */ +/* WARNING: don't use volume command, its deprecated */ void mpd_sendVolumeCommand(mpd_Connection *connection, int volumeChange); void mpd_sendCrossfadeCommand(mpd_Connection *connection, int seconds); diff --git a/src/libtcp-portmon.cc b/src/libtcp-portmon.cc index caf3bd34..049add05 100644 --- a/src/libtcp-portmon.cc +++ b/src/libtcp-portmon.cc @@ -480,7 +480,7 @@ void update_tcp_port_monitor_collection( p_collection, &rebuild_tcp_port_monitor_peek_table, nullptr); } -/* Creation of reduntant monitors is silently ignored */ +/* Creation of redundant monitors is silently ignored */ int insert_new_tcp_port_monitor_into_collection( tcp_port_monitor_collection_t *p_collection, in_port_t port_range_begin, in_port_t port_range_end, tcp_port_monitor_args_t *p_creation_args) { diff --git a/src/libtcp-portmon.h b/src/libtcp-portmon.h index 0e20459e..66082f09 100644 --- a/src/libtcp-portmon.h +++ b/src/libtcp-portmon.h @@ -116,11 +116,11 @@ tcp_port_monitor_collection_t *create_tcp_port_monitor_collection(void); void destroy_tcp_port_monitor_collection( tcp_port_monitor_collection_t *p_collection); -/* Updates the tcp statitics for all monitors within a collection */ +/* Updates the tcp statistics for all monitors within a collection */ void update_tcp_port_monitor_collection( tcp_port_monitor_collection_t *p_collection); -/* Creation of reduntant monitors is silently ignored +/* Creation of redundant monitors is silently ignored * Returns 0 on success, -1 otherwise. */ int insert_new_tcp_port_monitor_into_collection( tcp_port_monitor_collection_t *p_collection, in_port_t port_range_begin, diff --git a/src/linux.cc b/src/linux.cc index deef45b6..dc666608 100644 --- a/src/linux.cc +++ b/src/linux.cc @@ -181,7 +181,7 @@ int update_meminfo(void) { char buf[256]; /* With multi-threading, calculations that require - * multple steps to reach a final result can cause havok + * multiple steps to reach a final result can cause havok * if the intermediary calculations are directly assigned to the * information struct (they may be read by other functions in the meantime). * These variables keep the calculations local to the function and finish off @@ -1706,7 +1706,7 @@ void get_acpi_fan(char *p_client_buffer, size_t client_buffer_size) { POWER_SUPPLY_TYPE=Mains POWER_SUPPLY_ONLINE=1 - Update: it seems the folder name is hardware-dependent. We add an aditional + Update: it seems the folder name is hardware-dependent. We add an additional adapter argument, specifying the folder name. Update: on some systems it's /sys/class/power_supply/ADP1 instead of @@ -2801,7 +2801,7 @@ static void calc_io_each(void) { for (p = first_process; p; p = p->next) sum += p->read_bytes + p->write_bytes; - if (sum == 0) sum = 1; /* to avoid having NANs if no I/O occured */ + if (sum == 0) sum = 1; /* to avoid having NANs if no I/O occurred */ for (p = first_process; p; p = p->next) p->io_perc = 100.0 * (p->read_bytes + p->write_bytes) / (float)sum; } @@ -2922,7 +2922,7 @@ static void process_parse_stat(struct process *process) { state, &process->user_time, &process->kernel_time, &nice_val, &process->vsize, &process->rss); if (rc < 6) { - NORM_ERR("scaning data for %s failed, got only %d fields", procname, rc); + NORM_ERR("scanning data for %s failed, got only %d fields", procname, rc); return; } diff --git a/src/luamm.hh b/src/luamm.hh index 380d8e05..e96d7ece 100644 --- a/src/luamm.hh +++ b/src/luamm.hh @@ -270,7 +270,7 @@ class state : private std::mutex { void rawset(int index) { lua_rawset(cobj.get(), index); } void rawsetfield(int index, const char *k); int ref(int t) { return luaL_ref(cobj.get(), t); } - // len recieves length, if not null. Returned value may contain '\0' + // len receives length, if not null. Returned value may contain '\0' const char *tocstring(int index, size_t *len = nullptr) { return lua_tolstring(cobj.get(), index, len); } diff --git a/src/mboxscan.cc b/src/mboxscan.cc index 693bb241..26f2f11b 100644 --- a/src/mboxscan.cc +++ b/src/mboxscan.cc @@ -70,7 +70,7 @@ static void mbox_scan(char *args, char *output, size_t max_len) { FILE *fp; /* output was set to 1 after malloc'ing in conky.c */ - /* -> beeing able to test it here for catching SIGUSR1 */ + /* -> being able to test it here for catching SIGUSR1 */ if (output[0] == 1) { force_rescan = 1; output[0] = '\0'; diff --git a/src/net_stat.cc b/src/net_stat.cc index 975d7529..6f658dc2 100644 --- a/src/net_stat.cc +++ b/src/net_stat.cc @@ -345,7 +345,7 @@ void parse_net_stat_graph_arg(struct text_object *obj, const char *arg, /** * returns the download speed in B/s for the interface referenced by obj * - * @param[in] obj struct containting a member data, which is a struct + * @param[in] obj struct containing a member data, which is a struct * containing a void * to a net_stat struct **/ double downspeedgraphval(struct text_object *obj) { diff --git a/src/nvidia.cc b/src/nvidia.cc index 38798c39..4cceff70 100644 --- a/src/nvidia.cc +++ b/src/nvidia.cc @@ -684,7 +684,7 @@ static inline int get_nvidia_target_count(Display *dpy, TARGET_ID tid) { NORM_ERR(nullptr, NULL, "%s:" "\n Trying to query Nvidia target failed (using the " - "propietary drivers)." + "proprietary drivers)." "\n Are you sure they are installed correctly and a " "Nvidia GPU is in use?" "\n (display: %d,Nvidia target_count: %d)", diff --git a/src/setting.hh b/src/setting.hh index 1f3440f5..813e3584 100644 --- a/src/setting.hh +++ b/src/setting.hh @@ -227,12 +227,12 @@ T config_setting_template::get(lua::state &l) { /* * Declares a setting in the conky.config table. - * Getter function is used to translate the lua value into C++. It recieves the + * Getter function is used to translate the lua value into C++. It receives the * value on the lua stack. It should pop it and return the C++ value. In case * the value is nil, it should return a predefined default value. Translation * into basic types works with the help of lua_traits template above The * lua_setter function is called when someone tries to set the value. It - * recieves the new and the old value on the stack (old one is on top). It + * receives the new and the old value on the stack (old one is on top). It * should return the new value for the setting. It doesn't have to be the value * the user set, if e.g. the value doesn't make sense. The second parameter is * true if the assignment occurs during the initial parsing of the config file, diff --git a/src/specials.cc b/src/specials.cc index 8437d59e..8ba04efc 100644 --- a/src/specials.cc +++ b/src/specials.cc @@ -253,7 +253,7 @@ char *scan_graph(struct text_object *obj, const char *args, double defscale) { } /* all the following functions try to interpret the beginning of a - * a string with different formaters. If successfuly the return from + * a string with different formaters. If successfully the return from * this whole function */ /* interpret the beginning(!) of the argument string as: @@ -754,7 +754,7 @@ void new_alignr(struct text_object *obj, char *p, unsigned int p_max_size) { new_special(p, ALIGNR)->arg = obj->data.l; } -// A postive offset pushes the text further left +// A positive offset pushes the text further left void new_alignc(struct text_object *obj, char *p, unsigned int p_max_size) { if (p_max_size == 0) { return; } new_special(p, ALIGNC)->arg = obj->data.l; diff --git a/src/tcp-portmon.h b/src/tcp-portmon.h index b061d510..a5037824 100644 --- a/src/tcp-portmon.h +++ b/src/tcp-portmon.h @@ -1,6 +1,6 @@ /* * - * tcp-portmon.h - libtcp-portmon hooks protoypes + * tcp-portmon.h - libtcp-portmon hooks prototypes * * Copyright (C) 2008 Phil Sutter * diff --git a/src/template.cc b/src/template.cc index 74774077..9e7fb72c 100644 --- a/src/template.cc +++ b/src/template.cc @@ -43,7 +43,7 @@ conky::simple_config_setting _template[10] = { /* backslash_escape - do the actual substitution task for template objects * - * The field templates is used for substituting the \N occurences. Set it to + * The field templates is used for substituting the \N occurrences. Set it to * nullptr to leave them as they are. */ static char *backslash_escape(const char *src, char **templates, diff --git a/src/text_object.cc b/src/text_object.cc index f774243e..f2eca103 100644 --- a/src/text_object.cc +++ b/src/text_object.cc @@ -153,7 +153,7 @@ static int push_ifblock(struct ifblock_stack_obj **ifblock_stack_top, *ifblock_stack_top = stackobj; break; default: - CRIT_ERR(nullptr, nullptr, "push_ifblock() missuse detected!"); + CRIT_ERR(nullptr, nullptr, "push_ifblock() misuse detected!"); } return 0; } diff --git a/src/text_object.h b/src/text_object.h index 88c4b236..2fd74f24 100644 --- a/src/text_object.h +++ b/src/text_object.h @@ -115,7 +115,7 @@ struct text_object { void *special_data; long line; bool parse; /* if true then data.s should still be parsed */ - bool thread; /* if true then data.s should be set by a seperate thread */ + bool thread; /* if true then data.s should be set by a separate thread */ struct obj_cb callbacks; diff --git a/src/top.cc b/src/top.cc index c95a817f..e219a7bf 100644 --- a/src/top.cc +++ b/src/top.cc @@ -275,7 +275,7 @@ static int compare_mem(void *va, void *vb) { return 0; } -/* CPU time comparision function for prio queue */ +/* CPU time comparison function for prio queue */ static int compare_time(void *va, void *vb) { auto *a = static_cast(va), *b = static_cast(vb); @@ -286,7 +286,7 @@ static int compare_time(void *va, void *vb) { } #ifdef BUILD_IOSTATS -/* I/O comparision function for prio queue */ +/* I/O comparison function for prio queue */ static int compare_io(void *va, void *vb) { auto *a = static_cast(va), *b = static_cast(vb); diff --git a/src/top.h b/src/top.h index f37321a7..87e229db 100644 --- a/src/top.h +++ b/src/top.h @@ -42,7 +42,7 @@ #include "conky.h" #include "text_object.h" -#define CPU_THRESHHOLD 0 /* threshhold for the cpu diff to appear */ +#define CPU_THRESHHOLD 0 /* threshold for the cpu diff to appear */ #include #include #include diff --git a/src/update-cb.hh b/src/update-cb.hh index bdabd5d8..dab4c6c6 100644 --- a/src/update-cb.hh +++ b/src/update-cb.hh @@ -113,7 +113,7 @@ class callback_base { // to be implemented by descendant classes virtual void work() = 0; - // called when two registered objects evaulate as equal, the latter is removed + // called when two registered objects evaluate as equal, the latter is removed // afterwards virtual void merge(callback_base &&); diff --git a/tests/catch2/catch.hpp b/tests/catch2/catch.hpp index e67283e9..9c1b78f5 100644 --- a/tests/catch2/catch.hpp +++ b/tests/catch2/catch.hpp @@ -3034,7 +3034,7 @@ class PredicateMatcher : public MatcherBase { // The following functions create the actual matcher objects. // The user has to explicitly specify type to the function, because -// infering std::function is hard (but possible) and +// inferring std::function is hard (but possible) and // requires a lot of TMP. template Generic::PredicateMatcher Predicate(