From 465a836530eecdc772577593b738c8c71d451375 Mon Sep 17 00:00:00 2001
From: RainRat <rainrat78@yahoo.ca>
Date: Fri, 17 Nov 2023 13:56:57 -0800
Subject: [PATCH 1/3] typos (no functional changes)

typos only (no functional changes)
---
 .github/ISSUE_TEMPLATE/bug_report.md    |  2 +-
 CMakeLists.txt                          |  2 +-
 INSTALL.md                              | 18 +++++++-------
 NEWS.md                                 | 32 ++++++++++++-------------
 README.Docker.md                        |  4 ++--
 clamav-config.h.cmake.in                |  2 +-
 clamav-milter/netcode.c                 |  4 ++--
 clamd/clamd_others.c                    |  2 +-
 clamd/scanner.c                         |  2 +-
 clamd/server-th.c                       |  6 ++---
 clamdscan/client.c                      |  2 +-
 clamdscan/proto.c                       |  2 +-
 clamdtop/clamdtop.c                     |  2 +-
 clamonacc/c-thread-pool/thpool.c        |  8 +++----
 clamonacc/client/client.c               |  4 ++--
 clamonacc/client/socket.c               |  4 ++--
 clamonacc/inotif/hash.c                 | 12 +++++-----
 clamonacc/inotif/inotif.c               |  8 +++----
 clamonacc/scan/onas_queue.c             |  2 +-
 clamonacc/scan/onas_queue.h             |  2 +-
 clamonacc/scan/thread.c                 |  4 ++--
 clamscan/manager.c                      |  4 ++--
 cmake/FindLLVM.cmake                    |  2 +-
 cmake/FindRust.cmake                    |  2 +-
 common/actions.c                        |  4 ++--
 common/mac/cert_util_mac.m              |  2 +-
 common/misc.c                           |  2 +-
 common/optparser.c                      |  2 +-
 docs/man/clamd.conf.5.in                |  2 +-
 etc/clamd.conf.sample                   |  2 +-
 freshclam/freshclam.c                   | 16 ++++++-------
 fuzz/standalone_fuzz_target_runner.cpp  |  2 +-
 libclamav/apm.c                         |  2 +-
 libclamav/clamav.h                      | 18 +++++++-------
 libclamav/crtmgr.c                      |  2 +-
 libclamav/egg.c                         | 10 ++++----
 libclamav/egg.h                         |  4 ++--
 libclamav/fmap.c                        |  2 +-
 libclamav/fmap.h                        |  2 +-
 libclamav/gif.c                         |  2 +-
 libclamav/hashtab.h                     | 12 +++++-----
 libclamav/hfsplus.c                     |  2 +-
 libclamav/htmlnorm.c                    |  2 +-
 libclamav/jpeg.c                        | 12 +++++-----
 libclamav/jsparse/js-norm.c             |  2 +-
 libclamav/jsparse/textbuf.h             |  2 +-
 libclamav/matcher-ac.c                  |  2 +-
 libclamav/matcher-ac.h                  |  2 +-
 libclamav/matcher-byte-comp.c           |  6 ++---
 libclamav/matcher-pcre.c                |  2 +-
 libclamav/matcher.c                     |  6 ++---
 libclamav/matcher.h                     |  4 ++--
 libclamav/mbox.c                        | 24 +++++++++----------
 libclamav/mbr.c                         |  2 +-
 libclamav/nsis/nsis_bzlib.h             |  2 +-
 libclamav/nsis/nulsft.c                 |  2 +-
 libclamav/ole2_extract.c                |  4 ++--
 libclamav/others.h                      |  2 +-
 libclamav/pdf.c                         |  2 +-
 libclamav/pdfdecode.c                   |  4 ++--
 libclamav/pe.c                          | 12 +++++-----
 libclamav/petite.c                      |  2 +-
 libclamav/phishcheck.c                  |  6 ++---
 libclamav/readdb.h                      |  2 +-
 libclamav/rebuildpe.c                   |  4 ++--
 libclamav/regex/regcomp.c               |  2 +-
 libclamav/regex_list.c                  |  2 +-
 libclamav/scanners.c                    | 16 ++++++-------
 libclamav/tiff.c                        |  2 +-
 libclamav/xlm_extract.c                 |  6 ++---
 libclamav/yara_arena.c                  |  4 ++--
 libclamav/yara_compiler.c               |  2 +-
 libclamav/yara_grammar.c                |  4 ++--
 libclamav/yara_grammar.y                |  4 ++--
 libclamav/yara_lexer.c                  |  2 +-
 libclamav/yara_lexer.l                  |  2 +-
 libclamav_rust/build.rs                 |  2 +-
 libclamav_rust/src/css_image_extract.rs |  6 ++---
 libclamav_rust/src/logging.rs           |  2 +-
 libclamav_rust/src/sys.rs               |  4 ++--
 libclammspack/ChangeLog                 |  2 +-
 libclammspack/mspack/cabd.c             |  4 ++--
 libclammspack/mspack/chmd.c             |  4 ++--
 libclammspack/mspack/crc32.c            |  2 +-
 libclammspack/mspack/mspack.h           | 22 ++++++++---------
 libclammspack/test/cabd_test.c          |  2 +-
 libclammspack/test/chmd_test.c          |  2 +-
 libclamunrar/arcread.cpp                |  4 ++--
 libclamunrar/crc.hpp                    |  2 +-
 libclamunrar/crypt5.cpp                 |  2 +-
 libclamunrar/getbits.hpp                |  2 +-
 libclamunrar/pathfn.cpp                 |  2 +-
 libclamunrar/qopen.cpp                  |  2 +-
 libclamunrar/rs.cpp                     |  2 +-
 libclamunrar/rs16.hpp                   |  2 +-
 libclamunrar/scantree.cpp               |  2 +-
 libclamunrar/threadpool.cpp             |  2 +-
 libclamunrar/unicode.cpp                |  2 +-
 libclamunrar/unpack.cpp                 |  2 +-
 libclamunrar/unpack50.cpp               |  2 +-
 libfreshclam/libfreshclam.c             |  8 +++----
 libfreshclam/libfreshclam.h             |  4 ++--
 libfreshclam/libfreshclam_internal.c    |  2 +-
 sigtool/sigtool.c                       |  2 +-
 unit_tests/check_clamav.c               | 18 +++++++-------
 unit_tests/clamd_test.py                |  6 ++---
 unit_tests/freshclam_test.py            |  2 +-
 win32/compat/glob.c                     |  2 +-
 108 files changed, 249 insertions(+), 249 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index e730ddfe32..23cd138f1f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -34,7 +34,7 @@ If applicable, add screenshots to help explain your problem.
 
 If the issue is reproducible only when scanning a specific file, attach it to the ticket.
 
-<!-- CAUTION: Do not attach malware unless in an encrypted zip. Better yet, provide a link to the file on on VirusTotal.
+<!-- CAUTION: Do not attach malware unless in an encrypted zip. Better yet, provide a link to the file on VirusTotal.
 
 The maximum size for file attachments on GitHub Issues is 25MB and the maximum size for images is 10MB. If the file is too big, you can upload it to a password protected website and send us the URL and the credentials to access it.
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc6b351631..c780e89de9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -271,7 +271,7 @@ if(ENABLE_TESTS)
                 # No unittest either!
                 # Some weird Python installations do exist that lack standard modules like unittest.
                 # Let's make sure these folks know the Python 3 install we found won't cut it.
-                message("Python 3 found: ${Python3_EXECUTABLE}, but it is missing the unittest module (wierd!).")
+                message("Python 3 found: ${Python3_EXECUTABLE}, but it is missing the unittest module (weird!).")
                 message(FATAL_ERROR "The tests won't work with this Python installation. You can disable the tests by reconfiguring with: -D ENABLE_TESTS=OFF")
             endif()
         endif()
diff --git a/INSTALL.md b/INSTALL.md
index 9090eea747..1831f675dd 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -35,7 +35,7 @@ configuration options.
     - [Customizing the Install Directories](#customizing-the-install-directories)
     - [Running the Public Test Suite](#running-the-public-test-suite)
   - [Custom CMake Config Options](#custom-cmake-config-options)
-  - [External Library Depedency Configuration Options](#external-library-depedency-configuration-options)
+  - [External Library Dependency Configuration Options](#external-library-dependency-configuration-options)
     - [`libcheck`](#libcheck)
     - [`bzip2`](#bzip2)
     - [`zlib`](#zlib)
@@ -225,7 +225,7 @@ your build will depend on which type of generator you're using:
 
 > _Tip_: `RelWithDebInfo` is probably the best option for open source projects.
 > It will have the speed optimizations you need. And, if a crash occurs, the
-> crash backtrace you obtain with with a debugger will significantly help in
+> crash backtrace you obtain with a debugger will significantly help in
 > identifying the bug.
 
 For multi-config generators, you _will_ also need to specify the config when
@@ -292,22 +292,22 @@ sudo cmake --build . --target install
 ```
 
 ClamAV has a couple other important paths you can configure. At this time,
-these are only configureable through the `clamd.conf` application config file:
+these are only configurable through the `clamd.conf` application config file:
 
 - `LocalSocket`: You may configure ClamD to listen on a TCP socket or on a
   "local" socket (a Unix socket). A local socket is probably best, for safety.
   But that means you'll need to select a path for the local socket. The sample
-  configu sugegsts using the `/tmp` directory, but you may wish to select
+  config suggests using the `/tmp` directory, but you may wish to select
   a directory like `/var/run/clamav`.
 
 - `TemporaryDirectory`: ClamAV creates a lot of temp files when scanning.
   By default, ClamD and ClamScan will use the system's default temp directory,
   which is typically `/tmp` or `/var/tmp`. But it may be best to give ClamAV
-  it's own directory. Maybe `/var/lib/clamav-tmp`.
+  its own directory. Maybe `/var/lib/clamav-tmp`.
 
 ### Running the Public Test Suite
 
-The option to build so that you can run run the tests is enabled by default.
+The option to build so that you can run the tests is enabled by default.
 It requires that you provide `python3` and `libcheck`.
 
 If you're building with `ENABLE_LIBCLAMAV_ONLY=ON` or `ENABLE_APP=OFF`, then
@@ -397,7 +397,7 @@ The following is a complete list of CMake options unique to configuring ClamAV:
 
   _Default: `ON`_
 
-- `DO_NOT_SET_RPATH`: By default RPATH is set in executeables resulting using
+- `DO_NOT_SET_RPATH`: By default RPATH is set in executables resulting using
   paths set at build time instead of using system defaults. By setting this
   `ON` system defaults are used.
 
@@ -527,7 +527,7 @@ The following is a complete list of CMake options unique to configuring ClamAV:
 
   _Default: not set_
 
-## External Library Depedency Configuration Options
+## External Library Dependency Configuration Options
 
 The CMake tooling is good about finding installed dependencies on POSIX systems
 provided that you have pkg-config installed, and the dependencies are installed
@@ -671,7 +671,7 @@ ClamAV has two bytecode runtimes:
    instructions one by one.
 
    With the interpreter, signature database (re)loads are faster, but execution
-   time for scans that make use of the bytecode sigantures is slower.
+   time for scans that make use of the bytecode signatures is slower.
 
 2. **LLVM**: LLVM can be used to Just-in-Time (JIT) compile bytecode signatures
    at database load time.
diff --git a/NEWS.md b/NEWS.md
index b0517891df..8a3169e413 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -836,7 +836,7 @@ ClamAV 0.105.0 includes the following improvements and changes.
   Using LLVM JIT for the bytecode runtime may improve scan performance over the
   built-in bytecode interpreter runtime, which is the default.
   If you wish to build using LLVM, you must obtain a complete build of
-  the LLVM libraries including the devopment headers and static libraries.
+  the LLVM libraries including the development headers and static libraries.
 
   There are some known issues both compiling and running the test suite with
   some LLVM installations. We are working to further stabilize LLVM bytecode
@@ -1699,7 +1699,7 @@ ClamAV 0.103.2 is a security patch release with the following fixes:
   For more details, see:
   https://blog.clamav.net/2020/06/the-future-of-clamav-safebrowsing.html
 
-  > _Tip_: If creating and hosting your own `safebrowing.gdb` database, you can
+  > _Tip_: If creating and hosting your own `safebrowsing.gdb` database, you can
   > use the `DatabaseCustomURL` option in `freshclam.conf` to download it.
 
 - FreshClam: Improved HTTP 304, 403, & 429 handling.
@@ -1823,7 +1823,7 @@ ClamAV 0.103.0 includes the following improvements and changes.
   a community effort.
 
   Non-blocking database reloads are now the default behavior. Some systems that
-  are more contrained on RAM may need to disable non-blocking reloads as it will
+  are more constrained on RAM may need to disable non-blocking reloads as it will
   temporarily consume 2x as much memory. For this purpose we have added a new
   clamd config option `ConcurrentDatabaseReload` which may be set to `no`.
 
@@ -1842,7 +1842,7 @@ ClamAV 0.103.0 includes the following improvements and changes.
 
 - The DLP module has been enhanced with additional credit card ranges and a new
   engine option which allows ClamAV to alert only on credit cards (and not, for
-  instance, gift cards) when scannning with the DLP module. This feature
+  instance, gift cards) when scanning with the DLP module. This feature
   enhancement was made by John Schember, with input from Alexander Sulfrian.
 
 - Support for Adobe Reader X PDF encryption, an overhaul of PNG scanning to
@@ -1903,8 +1903,8 @@ ClamAV 0.103.0 includes the following improvements and changes.
   `sigtool` is separate from the one used for scanning and will still need to be
   updated or replaced in the future.
 
-- Improvements to the layout and legitibility of temp files created during a
-  scan. Improvements to legitibility and content of the metadata JSON generated
+- Improvements to the layout and legibility of temp files created during a
+  scan. Improvements to legibility and content of the metadata JSON generated
   during a scan.
 
   To review the scan temp files and metadata JSON, run:
@@ -2104,7 +2104,7 @@ ClamAV 0.102.2 is a bug patch release to address the following issues.
 
 - Re-applied a fix to alleviate file access issues when scanning RAR files in
   downstream projects that use libclamav where the scanning engine is operating
-  in a low-privelege process. This bug was originally fixed in 0.101.2 and the
+  in a low-privilege process. This bug was originally fixed in 0.101.2 and the
   fix was mistakenly omitted from 0.102.0.
 
 - Fixed an issue wherein freshclam failed to update if the database version
@@ -2117,7 +2117,7 @@ ClamAV 0.102.2 is a bug patch release to address the following issues.
   slower internet connections.
 
 - Correctly display number of kilobytes (KiB) in progress bar and reduced the
-  size of the progress bar to accomodate 80-char width terminals.
+  size of the progress bar to accommodate 80-char width terminals.
 
 - Fixed an issue where running freshclam manually causes a daemonized freshclam
   process to fail when it updates because the manual instance deletes the
@@ -2686,7 +2686,7 @@ infrastructure that's so easy to take for granted.
     CI server.
 
     Similar to the feature testing framework, our build acceptance framework
-    tests accross 64bit and 32bit (where available):
+    tests across 64bit and 32bit (where available):
     - macOS 10 (.10, .11, .13)
     - Windows (7, 10)
     - Debian (8, 9), Ubuntu (16.04, 18.04), CentOS (6, 7)
@@ -3641,7 +3641,7 @@ version:
   (clamd: ExcludePUA, IncludePUA; clamscan: --exclude-pua, --include-pua)
 
 - Data Loss Prevention (DLP): This version includes a new module that, when
-  enabled, scans data for the inclusion of US formated Social Security
+  enabled, scans data for the inclusion of US formatted Social Security
   Numbers and credit card numbers (clamd: StructuredDataDetection,
   clamscan: --detect-structured; additional fine-tuning options are available)
 
@@ -4272,7 +4272,7 @@ Important note to clamdwatch users: please upgrade to the latest version
 - freshclam:
   - the DNS mode is now enabled by default (no need for DNSDatabaseInfo in
     freshclam.conf)
-  - --no-dns uses a If-Modified-Since method instead of a range GET
+  - --no-dns uses an If-Modified-Since method instead of a range GET
   - added support for AllowSupplementaryGroups
 
 - sigtool:
@@ -5027,7 +5027,7 @@ configure:
    Tru64 support (thanks to Christophe Varoqui <ext.devoteam.varoqui@sncf.fr>)
 
 - documentation:
-  - included how-to in Portugese by Alexandre de Jesus Marcolino
+  - included how-to in Portuguese by Alexandre de Jesus Marcolino
   - clamdoc.pdf and system manual updates
 
 Many thanks to Luca 'NERvOus' Gibelli from ElektraPro for his support,
@@ -5086,7 +5086,7 @@ This release has removed the limit for a file name length in clamscan. Some
 viruses (eg. W32/Yaha.E) are using very long file names, and they were
 ignored in mbox mode. Users of AMaViS-ng and other wrappers were not
 vulnerable to this problem, because that programs don't use original
-attachement file names.
+attachment file names.
 
 - clamscan:
   - removed limit for a file name length (thanks to Odhiambo Washington
@@ -5237,9 +5237,9 @@ Documentation:
 update viruses.db2 and supports OpenAntiVirus.org site only (the last
 update of the OAV database was 1 July !). Nicholas Chua <nicholas@ncmbox.net>
 has generated over 200 new signatures, ClamAV's database is also frequently
-updated (expecially when new wild virus/worm appears, eg. W32/BugBear.A).
+updated (especially when new wild virus/worm appears, eg. W32/BugBear.A).
 
-    This software is still in developement (new software == new bugs), however
+    This software is still in development (new software == new bugs), however
 clamscan should be very stable. You shouldn't use clamd/clamuko (well, clamd is
 stable, clamuko isn't) on production systems, yet. Please wait for 0.51 at
 least ;). ClamAV 0.50 was tested on Linux and Solaris and should work fine.
@@ -5309,7 +5309,7 @@ There are binary packages for AIX available. Please check the documentation.
 ## 0.22
 
 This release fixes bug with scanning archives in unaccessible directories with
-*superuser* priviledges (after dropping priviledges scanner wasn't able to
+*superuser* privileges (after dropping privileges scanner wasn't able to
 access the archive, although the same archive was accessible), thanks
 for Sergei Pronin <sp@finndesign.fi> for the problem description. Now all
 archives unaccessible directly by the clamav user are copied (with a respect to
diff --git a/README.Docker.md b/README.Docker.md
index f8a731019a..ef00b96bb5 100644
--- a/README.Docker.md
+++ b/README.Docker.md
@@ -153,7 +153,7 @@ To do so, you have two options:
    ```
 
    When doing this, it's best to use the `<version>_base` image tags so as to
-   save on bandwith. E.g.:
+   save on bandwidth. E.g.:
    ```bash
    docker run -it --rm \
        --name "clam_container_01" \
@@ -381,7 +381,7 @@ The healthcheck results can be viewed with `docker inspect`.
 
 When the container starts up, the health-check also starts up. As loading the
 virus database can take some time, there is a delay configured in the
-`Dockerfile` to try and avoid this race condition.
+`Dockerfile` to try to avoid this race condition.
 
 ## Performance
 
diff --git a/clamav-config.h.cmake.in b/clamav-config.h.cmake.in
index 4f3b837c01..a1ae2e384e 100644
--- a/clamav-config.h.cmake.in
+++ b/clamav-config.h.cmake.in
@@ -439,7 +439,7 @@
 /* Define if dlsym() requires a leading underscore in symbol names. */
 #cmakedefine NEED_USCORE 1
 
-/* bzip funtions do not have bz2 prefix */
+/* bzip functions do not have bz2 prefix */
 #cmakedefine NOBZ2PREFIX 1
 
 /* "no fd_set" */
diff --git a/clamav-milter/netcode.c b/clamav-milter/netcode.c
index cd450be433..7b567323df 100644
--- a/clamav-milter/netcode.c
+++ b/clamav-milter/netcode.c
@@ -352,7 +352,7 @@ static int resolve(char *name, uint32_t *family, uint32_t *host)
     struct addrinfo hints, *res;
 
     if (!name) {
-        /* 	l->basehost[0] = l->basehost[1] = l->basehost[2] = l->basehost[3] = 0; DONT BOTHER*/
+        /* 	l->basehost[0] = l->basehost[1] = l->basehost[2] = l->basehost[3] = 0; DON'T BOTHER*/
         *family = NON_SMTP;
         return 0;
     }
@@ -370,7 +370,7 @@ static int resolve(char *name, uint32_t *family, uint32_t *host)
 
         *family = INET_HOST;
         host[0] = htonl(sa->sin_addr.s_addr);
-        /* 	host[1] = host[2] = host[3] = 0; DONT BOTHER*/
+        /* 	host[1] = host[2] = host[3] = 0; DON'T BOTHER*/
     } else if (res->ai_addrlen == sizeof(struct sockaddr_in6) && res->ai_addr->sa_family == AF_INET6) {
         struct sockaddr_in6 *sa = (struct sockaddr_in6 *)res->ai_addr;
         unsigned int i, j;
diff --git a/clamd/clamd_others.c b/clamd/clamd_others.c
index 3bb0af0eea..569e6b63ca 100644
--- a/clamd/clamd_others.c
+++ b/clamd/clamd_others.c
@@ -347,7 +347,7 @@ read_fd_data(struct fd_buf *buf)
                         close(buf->recvfd);
                     }
                     buf->recvfd = *(int *)CMSG_DATA(cmsg);
-                    logg(LOGG_DEBUG_NV, "Receveived a file descriptor: %d\n", buf->recvfd);
+                    logg(LOGG_DEBUG_NV, "Received a file descriptor: %d\n", buf->recvfd);
                 }
             }
         }
diff --git a/clamd/scanner.c b/clamd/scanner.c
index 3195a610df..f46250b074 100644
--- a/clamd/scanner.c
+++ b/clamd/scanner.c
@@ -414,7 +414,7 @@ cl_error_t scanfd(
         goto done;
     }
 
-    /* Try and get the real filename, for logging purposes */
+    /* Try to get the real filename, for logging purposes */
     if (!stream) {
         if (CL_SUCCESS != cli_get_filepath_from_filedesc(fd, &filepath)) {
             logg(LOGG_DEBUG, "%s: Unable to determine the filepath given the file descriptor.\n", fdstr);
diff --git a/clamd/server-th.c b/clamd/server-th.c
index a7b5813c2a..81dcfcbf14 100644
--- a/clamd/server-th.c
+++ b/clamd/server-th.c
@@ -404,7 +404,7 @@ static cl_error_t reload_db(struct cl_engine **engine, unsigned int dboptions, c
                 goto done;
 
             default:
-                logg(LOGG_ERROR, "An unknown error occured when waiting for the database reload thread: %d\n", join_ret);
+                logg(LOGG_ERROR, "An unknown error occurred when waiting for the database reload thread: %d\n", join_ret);
                 goto done;
         }
     }
@@ -926,7 +926,7 @@ int recvloop(int *socketds, unsigned nsockets, struct cl_engine *engine, unsigne
     memset(&sigact, 0, sizeof(struct sigaction));
 #endif
 
-    /* Initalize scan options struct */
+    /* Initialize scan options struct */
     memset(&options, 0, sizeof(struct cl_scan_options));
 
     /* set up limits */
@@ -1216,7 +1216,7 @@ int recvloop(int *socketds, unsigned nsockets, struct cl_engine *engine, unsigne
 
     if (optget(opts, "AlertBrokenMedia")->enabled) {
         options.heuristic |= CL_SCAN_HEURISTIC_BROKEN_MEDIA;
-        logg(LOGG_INFO, "Media (Graphics) Format Validatation enabled\n");
+        logg(LOGG_INFO, "Media (Graphics) Format Validation enabled\n");
     }
 
     if (optget(opts, "ScanMail")->enabled) {
diff --git a/clamdscan/client.c b/clamdscan/client.c
index 7b7a5ae76d..f5f2943283 100644
--- a/clamdscan/client.c
+++ b/clamdscan/client.c
@@ -164,7 +164,7 @@ static int isremote(const struct optstruct *opts)
 }
 
 /* pings clamd at the specified interval the number of time specified
- * return 0 on a succesful connection, 1 upon timeout, -1 on error */
+ * return 0 on a successful connection, 1 upon timeout, -1 on error */
 int16_t ping_clamd(const struct optstruct *opts)
 {
 
diff --git a/clamdscan/proto.c b/clamdscan/proto.c
index 0f14419d4f..1913e04022 100644
--- a/clamdscan/proto.c
+++ b/clamdscan/proto.c
@@ -383,7 +383,7 @@ static cl_error_t parallel_callback(STATBUF *sb, char *filename, const char *pat
     cid->next = c->ids;
     c->ids    = cid;
 
-    /* Give up ownership of the filename to the client parralel scan ID list */
+    /* Give up ownership of the filename to the client parallel scan ID list */
     filename = NULL;
 
     status = CL_SUCCESS;
diff --git a/clamdtop/clamdtop.c b/clamdtop/clamdtop.c
index 196f69129d..036a813262 100644
--- a/clamdtop/clamdtop.c
+++ b/clamdtop/clamdtop.c
@@ -316,7 +316,7 @@ static void init_ncurses(int num_clamd, int use_default)
     keypad(stdscr, TRUE);            /* enable keyboard mapping */
     nonl();                          /* tell curses not to do NL->CR/NL on output */
     halfdelay(UPDATE_INTERVAL * 10); /* timeout of 2s when waiting for input*/
-    noecho();                        /* dont echo input */
+    noecho();                        /* don't echo input */
     curs_set(0);                     /* turn off cursor */
     if (use_default)
         use_default_colors();
diff --git a/clamonacc/c-thread-pool/thpool.c b/clamonacc/c-thread-pool/thpool.c
index ddc1f883ad..1eaad19a37 100644
--- a/clamonacc/c-thread-pool/thpool.c
+++ b/clamonacc/c-thread-pool/thpool.c
@@ -207,7 +207,7 @@ void thpool_wait(thpool_* thpool_p){
 
 /* Destroy the threadpool */
 void thpool_destroy(thpool_* thpool_p){
-	/* No need to destory if it's NULL */
+	/* No need to destroy if it's NULL */
 	if (thpool_p == NULL) return ;
 
 	volatile int threads_total = thpool_p->num_threads_alive;
@@ -256,7 +256,7 @@ void thpool_pause(thpool_* thpool_p) {
 /* Resume all threads in threadpool */
 void thpool_resume(thpool_* thpool_p) {
     // resuming a single threadpool hasn't been
-    // implemented yet, meanwhile this supresses
+    // implemented yet, meanwhile this suppresses
     // the warnings
     (void)thpool_p;
 
@@ -310,7 +310,7 @@ static void thread_hold(int sig_id) {
 
 /* What each thread is doing
 *
-* In principle this is an endless loop. The only time this loop gets interuppted is once
+* In principle this is an endless loop. The only time this loop gets interrupted is once
 * thpool_destroy() is invoked or the program exits.
 *
 * @param  thread        thread that will run this function
@@ -318,7 +318,7 @@ static void thread_hold(int sig_id) {
 */
 static void* thread_do(struct thread* thread_p){
 
-	/* Set thread name for profiling and debuging */
+	/* Set thread name for profiling and debugging */
 	char thread_name[32] = {0};
 	snprintf(thread_name, 32, "thread-pool-%d", thread_p->id);
 
diff --git a/clamonacc/client/client.c b/clamonacc/client/client.c
index 4e627944a2..08790685ff 100644
--- a/clamonacc/client/client.c
+++ b/clamonacc/client/client.c
@@ -161,7 +161,7 @@ int onas_check_remote(struct onas_context **ctx, cl_error_t *err)
 }
 
 /* pings clamd at the specified interval the number of time specified
- * return 0 on a succesful connection, 1 upon timeout, -1 on error */
+ * return 0 on a successful connection, 1 upon timeout, -1 on error */
 int16_t onas_ping_clamd(struct onas_context **ctx)
 {
 
@@ -525,7 +525,7 @@ int onas_get_clamd_version(struct onas_context **ctx)
  * @param fd        the file descriptor for the file to be scanned, often (but not always) this is held by fanotify
  * @param timeout   time in ms to allow curl before timing out connection attempts
  * @param sb        variable to store and pass all of our stat info on the file so we don't have to access it multiple times (triggering multiple events)
- * @param infected  return variable indincating whether daemon returned with an infected verdict or not
+ * @param infected  return variable indicating whether daemon returned with an infected verdict or not
  * @param err       return variable passed to the daemon protocol interface indicating how many things went wrong in the course of scanning
  * @param ret_code  return variable passed to the daemon protocol interface indicating last known issue or success
  */
diff --git a/clamonacc/client/socket.c b/clamonacc/client/socket.c
index 546ac454dd..b8240fc2b7 100644
--- a/clamonacc/client/socket.c
+++ b/clamonacc/client/socket.c
@@ -42,7 +42,7 @@ struct onas_sock_t onas_sock = {.written = 0};
  * One time socket setup for unix file descriptor passing
  *
  * @param ctx a point to the onas context struct
- * @return CL_SUCCESS if writing to socket struct was succesful, CL_EWRITE if the socket has already been written to
+ * @return CL_SUCCESS if writing to socket struct was successful, CL_EWRITE if the socket has already been written to
  */
 cl_error_t onas_set_sock_only_once(struct onas_context *ctx)
 {
@@ -71,7 +71,7 @@ cl_error_t onas_set_sock_only_once(struct onas_context *ctx)
 /**
  * Retrieves a working socket descriptor for unix fdpassing
  *
- * @return Returns socket desctriptor on success, -1 on failure
+ * @return Returns socket descriptor on success, -1 on failure
  */
 int onas_get_sockd()
 {
diff --git a/clamonacc/inotif/hash.c b/clamonacc/inotif/hash.c
index a7d11efd4d..0e3785019c 100644
--- a/clamonacc/inotif/hash.c
+++ b/clamonacc/inotif/hash.c
@@ -72,22 +72,22 @@ static struct onas_hnode *onas_hashnode_init(void);
 /**
  * The data structure described and implemented below is a hash table with elements that also act as relational nodes
  * in a tree. This allows for average case constant time retrieval of nodes, and recursive operation on a node and all
- * it's children and parents. The memory cost for this speed of relational retrieval is necessarily high, as every node
- * must also keep track of it's children in a key-accessible way. To cut down on memory costs, children of nodes are not
+ * its children and parents. The memory cost for this speed of relational retrieval is necessarily high, as every node
+ * must also keep track of its children in a key-accessible way. To cut down on memory costs, children of nodes are not
  * themselves key accessible, but must be combined with their parent in a constant-time operation to be retrieved from
  * the table.
  *
  * Further optimization to retrieval and space management may include storing direct address to given children nodes, but
- * such a design will create further complexitiy and time cost at insertion--which must also be as fast as possible in
- * order to accomadate the real-time nature of security event processing.
+ * such a design will create further complexity and time cost at insertion--which must also be as fast as possible in
+ * order to accommodate the real-time nature of security event processing.
  *
  * To date, the hashing function itself has not been well studied, and as such buckets were implemented from the start to
- * help account for any potential collission issues in its design, as a measure to help offset any major time sinks during
+ * help account for any potential collision issues in its design, as a measure to help offset any major time sinks during
  * insertion.
  *
  * One last important note about this hash table is that to avoid massive slowdowns, it does not grow, but instead relies on
  * buckets and a generous default size to distribute that load. Slight hit to retrieval time is a fair cost to pay to avoid
- * total loss of service in a real-time system. Future work here might include automatically confiuguring initial hashtable
+ * total loss of service in a real-time system. Future work here might include automatically configuring initial hashtable
  * size to align with the system being monitored, or max inotify watch points since that's our hard limit anyways.
  */
 
diff --git a/clamonacc/inotif/inotif.c b/clamonacc/inotif/inotif.c
index 2aeb98136f..333182f6d3 100644
--- a/clamonacc/inotif/inotif.c
+++ b/clamonacc/inotif/inotif.c
@@ -245,7 +245,7 @@ static int onas_ddd_watch_hierarchy(const char *pathname, size_t len, int fd, ui
         size_t size      = len + strlen(curr->dirname) + 2;
         char *child_path = (char *)cli_malloc(size);
         if (child_path == NULL) {
-            logg(LOGG_ERROR, "ClamInotif: out of memory when when adding child for %s\n", hnode->pathname);
+            logg(LOGG_ERROR, "ClamInotif: out of memory when adding child for %s\n", hnode->pathname);
             return CL_EMEM;
         }
 
@@ -375,7 +375,7 @@ cl_error_t onas_enable_inotif_ddd(struct onas_context **ctx)
 
 void *onas_ddd_th(void *arg)
 {
-    /* Set thread name for profiling and debuging */
+    /* Set thread name for profiling and debugging */
     const char thread_name[] = "clamonacc-ddd";
 
 #if defined(__linux__)
@@ -671,9 +671,9 @@ void *onas_ddd_th(void *arg)
                 }
 
                 if (event->mask & IN_UNMOUNT) {
-                    logg(LOGG_ERROR, "ClamInotif: inofify event IN_UNMOUNT (mask:%d) occured, clamonacc should be restartet because a filesystem monitored by inotify was umounted.\n", event->mask);
+                    logg(LOGG_ERROR, "ClamInotif: inotify event IN_UNMOUNT (mask:%d) occurred, clamonacc should be restarted because a filesystem monitored by inotify was umounted.\n", event->mask);
                 } else if (event->mask & IN_Q_OVERFLOW) {
-                    logg(LOGG_ERROR, "ClamInotif: inotify event IN_Q_OVERFLOW (mask:%d) occured, clamonacc should be restartet because a inotify events were dropped by the kernel and the internal clamonacc inotify data structures are likely invalid.\n", event->mask);
+                    logg(LOGG_ERROR, "ClamInotif: inotify event IN_Q_OVERFLOW (mask:%d) occurred, clamonacc should be restarted because inotify events were dropped by the kernel and the internal clamonacc inotify data structures are likely invalid.\n", event->mask);
                 } else if (event->mask & IN_IGNORED) {
                     // Ignore for debugging purposes
                 } else {
diff --git a/clamonacc/scan/onas_queue.c b/clamonacc/scan/onas_queue.c
index 4b16d00809..4cce6cdf6c 100644
--- a/clamonacc/scan/onas_queue.c
+++ b/clamonacc/scan/onas_queue.c
@@ -143,7 +143,7 @@ static void onas_destroy_event_queue(void)
 
 void *onas_scan_queue_th(void *arg)
 {
-    /* Set thread name for profiling and debuging */
+    /* Set thread name for profiling and debugging */
     const char thread_name[] = "clamonacc-sq";
 
 #if defined(__linux__)
diff --git a/clamonacc/scan/onas_queue.h b/clamonacc/scan/onas_queue.h
index 18dc6bf532..526e055315 100644
--- a/clamonacc/scan/onas_queue.h
+++ b/clamonacc/scan/onas_queue.h
@@ -21,7 +21,7 @@
 #ifndef __ONAS_SCQUE_H
 #define __ONAS_SCQUE_H
 
-/* extremely simple event queue implmentation w/ obj number tracking in case we want to place limits later */
+/* extremely simple event queue implementation w/ obj number tracking in case we want to place limits later */
 struct onas_event_queue {
     struct onas_event_queue_node *head;
     struct onas_event_queue_node *tail;
diff --git a/clamonacc/scan/thread.c b/clamonacc/scan/thread.c
index 62cd58b29e..212937d503 100644
--- a/clamonacc/scan/thread.c
+++ b/clamonacc/scan/thread.c
@@ -57,7 +57,7 @@ static cl_error_t onas_scan_thread_handle_file(struct onas_scan_event *event_dat
 /**
  * @brief Safe-scan wrapper, originally used by inotify and fanotify threads, now exists for error checking/convenience.
  *
- * Owned by scanthread to try and force multithreaded client archtiecture which better avoids kernel level deadlocks from
+ * Owned by scanthread to try to force multithreaded client architecture which better avoids kernel level deadlocks from
  * fanotify blocking/prevention.
  */
 static int onas_scan(struct onas_scan_event *event_data, const char *fname, STATBUF sb, int *infected, int *err, cl_error_t *ret_code)
@@ -103,7 +103,7 @@ static int onas_scan(struct onas_scan_event *event_data, const char *fname, STAT
 }
 
 /**
- * @brief Thread-safe scan wrapper to ensure there's no processs contention over use of the socket.
+ * @brief Thread-safe scan wrapper to ensure there's no process contention over use of the socket.
  *
  * This is noticeably slower, and I had no issues running smaller scale tests with it off, but better than sorry until more testing can be done.
  *
diff --git a/clamscan/manager.c b/clamscan/manager.c
index 4b1e4906c3..42e803f166 100644
--- a/clamscan/manager.c
+++ b/clamscan/manager.c
@@ -1050,7 +1050,7 @@ int scanmanager(const struct optstruct *opts)
     struct engine_free_progress engine_free_progress_ctx = {0};
 #endif
 
-    /* Initalize scan options struct */
+    /* Initialize scan options struct */
     memset(&options, 0, sizeof(struct cl_scan_options));
 
     dirlnk = optget(opts, "follow-dir-symlinks")->numarg;
@@ -1651,7 +1651,7 @@ int scanmanager(const struct optstruct *opts)
          * so just scan the current directory. */
         char cwd[1024];
 
-        /* Get the current workinng directory.
+        /* Get the current working directory.
          * we need full path for some reasons (eg. archive handling) */
         if (!getcwd(cwd, sizeof(cwd))) {
             logg(LOGG_ERROR, "Can't get absolute pathname of current working directory\n");
diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
index 6357585e85..c1a9bb1c07 100644
--- a/cmake/FindLLVM.cmake
+++ b/cmake/FindLLVM.cmake
@@ -24,7 +24,7 @@
 #  LLVM_VERSION_STRING - Full LLVM version string (e.g. 6.0.0svn).
 #  LLVM_VERSION_BASE_STRING - Base LLVM version string without git/svn suffix (e.g. 6.0.0).
 #
-# Note: The variable names were chosen in conformance with the offical CMake
+# Note: The variable names were chosen in conformance with the official CMake
 # guidelines, see ${CMAKE_ROOT}/Modules/readme.txt.
 
 # Try suffixed versions to pick up the newest LLVM install available on Debian
diff --git a/cmake/FindRust.cmake b/cmake/FindRust.cmake
index ef367d1d61..4a90c41d3c 100644
--- a/cmake/FindRust.cmake
+++ b/cmake/FindRust.cmake
@@ -378,7 +378,7 @@ function(add_rust_test)
 endfunction()
 
 #
-# Cargo is the primary tool for using the Rust Toolchain to to build static
+# Cargo is the primary tool for using the Rust Toolchain to build static
 # libs that can include other crate dependencies.
 #
 find_rust_program(cargo)
diff --git a/common/actions.c b/common/actions.c
index 320da1e215..6e7e8af9ff 100644
--- a/common/actions.c
+++ b/common/actions.c
@@ -113,9 +113,9 @@ typedef void (*PRIUS)(
     PCWSTR SourceString);
 
 /**
- * @brief A openat equivalent for Win32 with a check to NOFOLLOW soft-links.
+ * @brief An openat equivalent for Win32 with a check to NOFOLLOW soft-links.
  *
- * The caller is resposible for closing the HANDLE.
+ * The caller is responsible for closing the HANDLE.
  *
  * For the desiredAccess, fileAttributes, createOptions, and shareAccess parameters
  * see https://docs.microsoft.com/en-us/windows/win32/api/winternl/nf-winternl-ntcreatefile
diff --git a/common/mac/cert_util_mac.m b/common/mac/cert_util_mac.m
index 382e0d3c97..aa723cabb0 100644
--- a/common/mac/cert_util_mac.m
+++ b/common/mac/cert_util_mac.m
@@ -244,7 +244,7 @@ cl_error_t cert_store_load(X509 **trusted_certs, size_t trusted_cert_count)
     }
 
     /* Load certificates from keychains before entering the critical section.
-     * On a default 10.12 installation loading the the system roots keychain
+     * On a default 10.12 installation loading the system roots keychain
      * could take up to 300 ms to complete. */
 
     for (kc_index = 0; kc_index < ARRAY_SIZE(keychains); kc_index++) {
diff --git a/common/misc.c b/common/misc.c
index 541728cf4f..611a5b7f7c 100644
--- a/common/misc.c
+++ b/common/misc.c
@@ -334,7 +334,7 @@ int daemonize_parent_wait(const char *const user, const char *const log_file)
         return -1;
     } else if (daemonizePid) { // parent
         /* The parent will wait until either the child process
-         * exits, or signals the parent that it's initialization is
+         * exits, or signals the parent that its initialization is
          * complete.  If it exits, it is due to an error condition,
          * so the parent should exit with the same error code as the child.
          * If the child signals the parent that initialization is complete, it
diff --git a/common/optparser.c b/common/optparser.c
index 219134946e..e7a8996240 100644
--- a/common/optparser.c
+++ b/common/optparser.c
@@ -492,7 +492,7 @@ const struct clam_option __clam_options[] = {
 
     {"OnAccessExtraScanning", NULL, 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD, "Enables extra scanning and notification after catching certain inotify events. Only works with the DDD system enabled.", "yes"},
 
-    {"OnAccessCurlTimeout", NULL, 0, CLOPT_TYPE_NUMBER, MATCH_NUMBER, 5000l, NULL, 0, OPT_CLAMD, "Max amount of time (in milliseconds) that the OnAccess client should spend for every connect, send, and recieve attempt when communicating with clamd via curl (5s default)", "10000L"},
+    {"OnAccessCurlTimeout", NULL, 0, CLOPT_TYPE_NUMBER, MATCH_NUMBER, 5000l, NULL, 0, OPT_CLAMD, "Max amount of time (in milliseconds) that the OnAccess client should spend for every connect, send, and receive attempt when communicating with clamd via curl (5s default)", "10000L"},
 
     {"OnAccessMaxThreads", NULL, 0, CLOPT_TYPE_NUMBER, MATCH_NUMBER, 5, NULL, 0, OPT_CLAMD, "Max number of scanning threads to allocate to the OnAccess thread pool at startup--these threads are the ones responsible for creating a connection with the daemon and kicking off scanning after an event has been processed. To prevent clamonacc from consuming all clamd's resources keep this lower than clamd's max threads. Default is 5", "10"},
 
diff --git a/docs/man/clamd.conf.5.in b/docs/man/clamd.conf.5.in
index 1f9e25583d..322c07965e 100644
--- a/docs/man/clamd.conf.5.in
+++ b/docs/man/clamd.conf.5.in
@@ -745,7 +745,7 @@ Max number of scanning threads to allocate to the OnAccess thread pool at startu
 Default: 5
 .TP
 \fBOnAccessCurlTimeout NUMBER\fR
-Max amount of time (in milliseconds) that the OnAccess client should spend for every connect, send, and recieve attempt when communicating with clamd via curl.
+Max amount of time (in milliseconds) that the OnAccess client should spend for every connect, send, and receive attempt when communicating with clamd via curl.
 .br
 Default: 5000 (5 seconds)
 .TP
diff --git a/etc/clamd.conf.sample b/etc/clamd.conf.sample
index b9f282824a..a22481232b 100644
--- a/etc/clamd.conf.sample
+++ b/etc/clamd.conf.sample
@@ -682,7 +682,7 @@ Example
 #OnAccessMaxThreads 10
 
 # Max amount of time (in milliseconds) that the OnAccess client should spend
-# for every connect, send, and recieve attempt when communicating with clamd
+# for every connect, send, and receive attempt when communicating with clamd
 # via curl.
 # Default: 5000 (5 seconds)
 # OnAccessCurlTimeout 10000
diff --git a/freshclam/freshclam.c b/freshclam/freshclam.c
index be230cdc56..c4deeb6a77 100644
--- a/freshclam/freshclam.c
+++ b/freshclam/freshclam.c
@@ -455,7 +455,7 @@ fc_error_t download_complete_callback(const char *dbFilename, void *context)
  * @return fc_error_t       FC_SUCCESS if success.
  * @return fc_error_t       FC_EARG if invalid args.
  * @return fc_error_t       FC_EMEM if malloc failed.
- * @return fc_error_t       FC_ECONFIG if a parsing issue occured.
+ * @return fc_error_t       FC_ECONFIG if a parsing issue occurred.
  */
 static fc_error_t get_server_node(
     const char *server,
@@ -811,7 +811,7 @@ static fc_error_t initialize(struct optstruct *opts)
 
 #ifdef HAVE_PWD_H
     /* Drop database privileges here if we are not planning on daemonizing.  If
-     * we are, we should wait until after we craete the PidFile to drop
+     * we are, we should wait until after we create the PidFile to drop
      * privileges.  That way, it is owned by root (or whoever started freshclam),
      * and no one can change it.  */
     if (!optget(opts, "daemon")->enabled) {
@@ -830,7 +830,7 @@ static fc_error_t initialize(struct optstruct *opts)
 #endif /* HAVE_PWD_H */
 
     /*
-     * Initilize libclamav.
+     * Initialize libclamav.
      */
     if (CL_SUCCESS != (cl_init_retcode = cl_init(CL_INIT_DEFAULT))) {
         mprintf(LOGG_ERROR, "initialize: Can't initialize libclamav: %s\n", cl_strerror(cl_init_retcode));
@@ -982,7 +982,7 @@ static fc_error_t initialize(struct optstruct *opts)
     fcConfig.bCompressLocalDatabase = optget(opts, "CompressLocalDatabase")->enabled;
 
     /*
-     * Initilize libfreshclam.
+     * Initialize libfreshclam.
      */
     if (FC_SUCCESS != (ret = fc_initialize(&fcConfig))) {
         mprintf(LOGG_ERROR, "initialize: libfreshclam init failed.\n");
@@ -1082,7 +1082,7 @@ fc_error_t get_official_database_lists(
  *
  * Select:
  *   all standard databases excluding those in the opt-out list,
- *   any optional databases includedd in the opt-in list.
+ *   any optional databases included in the opt-in list.
  *
  * databaseList should be free'd with free_string_list().
  *
@@ -1420,13 +1420,13 @@ static fc_error_t executeIfNewVersion(
  * @param nServers              Number of servers in list.
  * @param dnsUpdateInfoServer   (optional) DNS update info server.  May be NULl to disable use of DNS.
  * @param bScriptedUpdates      Nonzero to enable incremental/scripted (efficient) updates.
- * @param bPrune                Prune official databases that are no longer desired or avaialable.
- * @param onUpdateExecute       (optional) Command to to run after 1+ databases have been updated.
+ * @param bPrune                Prune official databases that are no longer desired or available.
+ * @param onUpdateExecute       (optional) Command to run after 1+ databases have been updated.
  * @param onOutdatedExecute     (optional) Command to run if new version of ClamAV is available.
  * @param bDaemonized           Non-zero if process has daemonized.
  * @param notifyClamd           (optional) Path to clamd.conf to notify clamd.
  * @param fc_context            (optional) Context information for callback functions.
- * @return fc_error_t           FC_SUCCESS if all databases upddated successfully.
+ * @return fc_error_t           FC_SUCCESS if all databases updated successfully.
  */
 fc_error_t perform_database_update(
     char **databaseList,
diff --git a/fuzz/standalone_fuzz_target_runner.cpp b/fuzz/standalone_fuzz_target_runner.cpp
index a698eef10f..f88a6fe396 100644
--- a/fuzz/standalone_fuzz_target_runner.cpp
+++ b/fuzz/standalone_fuzz_target_runner.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 
 // Forward declare the "fuzz target" interface.
-// We deliberately keep this inteface simple and header-free.
+// We deliberately keep this interface simple and header-free.
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
 
 int main(int argc, char **argv) {
diff --git a/libclamav/apm.c b/libclamav/apm.c
index 2596b3309d..66844838c1 100644
--- a/libclamav/apm.c
+++ b/libclamav/apm.c
@@ -191,7 +191,7 @@ cl_error_t cli_scanapm(cli_ctx *ctx)
             goto done;
         }
 
-        /* check if a out-of-order partition map */
+        /* check if an out-of-order partition map */
         if (!strncmp((char *)apentry.type, "Apple_Partition_Map", 32) ||
             !strncmp((char *)apentry.type, "Apple_partition_map", 32) ||
             !strncmp((char *)apentry.type, "Apple_patition_map", 32)) {
diff --git a/libclamav/clamav.h b/libclamav/clamav.h
index f4ba496e4c..e2fd46f2e2 100644
--- a/libclamav/clamav.h
+++ b/libclamav/clamav.h
@@ -263,7 +263,7 @@ void cl_cleanup_crypto(void);
  * @brief Initialize the ClamAV library.
  *
  * @param initoptions   Unused.
- * @return cl_error_t   CL_SUCCESS if everything initalized correctly.
+ * @return cl_error_t   CL_SUCCESS if everything initialized correctly.
  */
 extern cl_error_t cl_init(unsigned int initoptions);
 
@@ -540,7 +540,7 @@ extern void cl_engine_set_clcb_file_inspection(struct cl_engine *engine, clcb_fi
  * @brief Pre-scan callback.
  *
  * Called for each NEW file (inner and outer) before the scanning takes place. This is
- * roughly the the same as clcb_before_cache, but it is affected by clean file caching.
+ * roughly the same as clcb_before_cache, but it is affected by clean file caching.
  * This means that it won't be called if a clean cached file (inner or outer) is
  * scanned a second time.
  *
@@ -1019,7 +1019,7 @@ extern void cl_engine_stats_enable(struct cl_engine *engine);
  * @param[out] scanned      The number of bytes scanned.
  * @param engine            The scanning engine.
  * @param scanoptions       Scanning options.
- * @return cl_error_t       CL_CLEAN, CL_VIRUS, or an error code if an error occured during the scan.
+ * @return cl_error_t       CL_CLEAN, CL_VIRUS, or an error code if an error occurred during the scan.
  */
 extern cl_error_t cl_scandesc(int desc, const char *filename, const char **virname, unsigned long int *scanned, const struct cl_engine *engine, struct cl_scan_options *scanoptions);
 
@@ -1035,7 +1035,7 @@ extern cl_error_t cl_scandesc(int desc, const char *filename, const char **virna
  * @param engine            The scanning engine.
  * @param scanoptions       Scanning options.
  * @param[in,out] context   An opaque context structure allowing the caller to record details about the sample being scanned.
- * @return cl_error_t       CL_CLEAN, CL_VIRUS, or an error code if an error occured during the scan.
+ * @return cl_error_t       CL_CLEAN, CL_VIRUS, or an error code if an error occurred during the scan.
  */
 extern cl_error_t cl_scandesc_callback(int desc, const char *filename, const char **virname, unsigned long int *scanned, const struct cl_engine *engine, struct cl_scan_options *scanoptions, void *context);
 
@@ -1047,7 +1047,7 @@ extern cl_error_t cl_scandesc_callback(int desc, const char *filename, const cha
  * @param[out] scanned      The number of bytes scanned.
  * @param engine            The scanning engine.
  * @param scanoptions       Scanning options.
- * @return cl_error_t       CL_CLEAN, CL_VIRUS, or an error code if an error occured during the scan.
+ * @return cl_error_t       CL_CLEAN, CL_VIRUS, or an error code if an error occurred during the scan.
  */
 extern cl_error_t cl_scanfile(const char *filename, const char **virname, unsigned long int *scanned, const struct cl_engine *engine, struct cl_scan_options *scanoptions);
 
@@ -1062,7 +1062,7 @@ extern cl_error_t cl_scanfile(const char *filename, const char **virname, unsign
  * @param engine            The scanning engine.
  * @param scanoptions       Scanning options.
  * @param[in,out] context   An opaque context structure allowing the caller to record details about the sample being scanned.
- * @return cl_error_t       CL_CLEAN, CL_VIRUS, or an error code if an error occured during the scan.
+ * @return cl_error_t       CL_CLEAN, CL_VIRUS, or an error code if an error occurred during the scan.
  */
 extern cl_error_t cl_scanfile_callback(const char *filename, const char **virname, unsigned long int *scanned, const struct cl_engine *engine, struct cl_scan_options *scanoptions, void *context);
 
@@ -1194,7 +1194,7 @@ extern cl_error_t cl_statinidir(const char *dirname, struct cl_stat *dbstat);
  *
  * @param dbstat dbstat handle.
  * @return int   0 No change.
- * @return int   1 Some change occured.
+ * @return int   1 Some change occurred.
  */
 extern int cl_statchkdir(const struct cl_stat *dbstat);
 
@@ -1265,7 +1265,7 @@ typedef struct cl_fmap cl_fmap_t;
  * @param buf       A buffer to read data into, must be at least offset + count
  *                  bytes in size.
  * @param count     The number of bytes to read.
- * @param offset    The the offset into buf to read the data to. If successful,
+ * @param offset    The offset into buf to read the data to. If successful,
  *                  the number of bytes actually read is returned. Upon reading
  *                  end-of-file, zero is returned. Otherwise, a -1 is returned
  *                  and the global variable errno is set to indicate the error.
@@ -1331,7 +1331,7 @@ extern void cl_fmap_close(cl_fmap_t *);
  *                      libclamav. May be used within your callback functions.
  * @return cl_error_t   CL_CLEAN if no signature matched. CL_VIRUS if a
  *                      signature matched. Another CL_E* error code if an
- *                      error occured.
+ *                      error occurred.
  */
 extern cl_error_t cl_scanmap_callback(cl_fmap_t *map, const char *filename, const char **virname, unsigned long int *scanned, const struct cl_engine *engine, struct cl_scan_options *scanoptions, void *context);
 
diff --git a/libclamav/crtmgr.c b/libclamav/crtmgr.c
index 9ed1cd29f3..57628675d0 100644
--- a/libclamav/crtmgr.c
+++ b/libclamav/crtmgr.c
@@ -581,7 +581,7 @@ static int crtmgr_rsa_verify(cli_crt *x509, BIGNUM *sig, cli_crt_hashtype hashty
 }
 
 /* For a given cli_crt, returns a pointer to the signer x509 certificate if
- * one is found in the crtmgr and it's signature can be validated (NULL is
+ * one is found in the crtmgr and its signature can be validated (NULL is
  * returned otherwise.) */
 cli_crt *crtmgr_verify_crt(crtmgr *m, cli_crt *x509)
 {
diff --git a/libclamav/egg.c b/libclamav/egg.c
index 069d2978de..7aecc0bc6a 100644
--- a/libclamav/egg.c
+++ b/libclamav/egg.c
@@ -475,7 +475,7 @@ static cl_error_t egg_parse_encrypt_header(const uint8_t* index, size_t size, eg
      *     |               |         | 6 | LEA256                                                                                                 |
      *     |---------------|---------|---|--------------------------------------------------------------------------------------------------------|
      *
-     * Depending on the Method (XOR / AES/LEA128 / AES/LEA256) The above will be be followed one of the following Method Headers:
+     * Depending on the Method (XOR / AES/LEA128 / AES/LEA256) The above will be followed by one of the following Method Headers:
      *
      *   XOR (KeyBase):
      *     |---------------|---------|------------------------------------------------------------------------------------------------------------|
@@ -1214,7 +1214,7 @@ static cl_error_t egg_parse_file_extra_field(egg_handle* handle, egg_file* eggFi
                 cli_dbgmsg("egg_parse_file_extra_field: Issue parsing comment header. Error code: %u\n", retval);
                 // Don't fail out with a `goto done;`. We're making a best effort to process the file, so just move on.
             } else if (comment == NULL) {
-                cli_errmsg("egg_parse_file_extra_field: Logic error! Succesfully parsed comment header,"
+                cli_errmsg("egg_parse_file_extra_field: Logic error! Successfully parsed comment header,"
                            " but did not return egg_comment information!\n");
                 goto done;
             } else {
@@ -1662,7 +1662,7 @@ cl_error_t cli_egg_open(fmap_t* map, void** hArchive, char*** comments, uint32_t
                 cli_dbgmsg("cli_egg_open: Issue parsing file header. Error code: %u\n", retval);
                 goto done;
             } else if (found_file == NULL) {
-                cli_errmsg("cli_egg_open: Logic error! Succesfully parsed file headers,"
+                cli_errmsg("cli_egg_open: Logic error! Successfully parsed file headers,"
                            " but did not return egg_file information!\n");
                 goto done;
             } else {
@@ -1683,7 +1683,7 @@ cl_error_t cli_egg_open(fmap_t* map, void** hArchive, char*** comments, uint32_t
                 cli_dbgmsg("cli_egg_open: Issue parsing block header. Error code: %u\n", retval);
                 goto done;
             } else if (found_block == NULL) {
-                cli_errmsg("cli_egg_open: Logic error! Succesfully parsed block headers,"
+                cli_errmsg("cli_egg_open: Logic error! Successfully parsed block headers,"
                            " but did not return egg_block information!\n");
                 goto done;
             } else {
@@ -1778,7 +1778,7 @@ cl_error_t cli_egg_open(fmap_t* map, void** hArchive, char*** comments, uint32_t
                  */
                 if (comment == NULL) {
                     /* Uh... no. */
-                    cli_errmsg("cli_egg_open: Logic error! Succesfully parsed comment header,"
+                    cli_errmsg("cli_egg_open: Logic error! Successfully parsed comment header,"
                                " but did not return egg_comment information!\n");
                     goto done;
                 } else {
diff --git a/libclamav/egg.h b/libclamav/egg.h
index 09a75690b0..344f916edc 100644
--- a/libclamav/egg.h
+++ b/libclamav/egg.h
@@ -66,7 +66,7 @@ cl_error_t cli_egg_open(
     uint32_t* nComments);
 
 /**
- * @brief Peek at the next file in the archive, without incremented the the current file index.
+ * @brief Peek at the next file in the archive, without incremented the current file index.
  *
  * @param hArchive          An open EGG archive handle from cli_egg_open()
  * @param file_metadata     Metadata describing the next file to be extracted (or skipped).
@@ -80,7 +80,7 @@ cl_error_t cli_egg_peek_file_header(
  * @brief Extract the next file in the archive.
  *
  * Does not return all of the metadata provided by cli_egg_peek_file_header(), so both should be used to get file information.
- * The current file index will be incrememnted on both success and failure.
+ * The current file index will be incremented on both success and failure.
  *
  * @param hArchive                  An open EGG archive handle from cli_egg_open()
  * @param[out] filename             The filename of the extracted file, in UTF-8.
diff --git a/libclamav/fmap.c b/libclamav/fmap.c
index 40e7fdd4a7..5ca70a0ec8 100644
--- a/libclamav/fmap.c
+++ b/libclamav/fmap.c
@@ -998,7 +998,7 @@ cl_error_t fmap_dump_to_file(fmap_t *map, const char *filepath, const char *tmpd
         if (CL_SUCCESS != cli_basename(filepath, strlen(filepath), &filebase)) {
             cli_dbgmsg("fmap_dump_to_file: Unable to determine basename from filepath.\n");
         } else if ((start_offset != 0) && (end_offset != map->real_len)) {
-            /* If we're only dumping a portion of the file, inlcude the offsets in the prefix,...
+            /* If we're only dumping a portion of the file, include the offsets in the prefix,...
              * e.g. tmp filename will become something like:  filebase.500-1200.<randhex> */
             size_t prefix_len = strlen(filebase) + 1 + SIZE_T_CHARLEN + 1 + SIZE_T_CHARLEN + 1;
             prefix            = malloc(prefix_len);
diff --git a/libclamav/fmap.h b/libclamav/fmap.h
index 884dc93d5c..87742752cf 100644
--- a/libclamav/fmap.h
+++ b/libclamav/fmap.h
@@ -421,7 +421,7 @@ cl_error_t fmap_dump_to_file(fmap_t *map, const char *filepath, const char *tmpd
 
 /* deprecated */
 /**
- * @brief   Return the open file desciptor for the fmap (if available).
+ * @brief   Return the open file descriptor for the fmap (if available).
  *
  * This function will only provide the file descriptor if the fmap handle is set,
  * and if the handle is in fact a file descriptor (handle_is_fd != 0).
diff --git a/libclamav/gif.c b/libclamav/gif.c
index dfddf5103e..30cc505972 100644
--- a/libclamav/gif.c
+++ b/libclamav/gif.c
@@ -30,7 +30,7 @@
  *  3. Logical Screen Descriptor: 7 bytes (see `struct gif_screen_descriptor`)
  *     (Opt.) Global Color Table: n bytes (defined in the Logical Screen Descriptor flags)
  *
- *  4. All subsequent blocks are precededed by the following 1-byte labels...
+ *  4. All subsequent blocks are preceded by the following 1-byte labels...
  *
  *     0x21:  Extension Introducer
  *        0x01:  Opt. (0+) Plain Text Extension
diff --git a/libclamav/hashtab.h b/libclamav/hashtab.h
index 4f0de559f2..1e97bfbb84 100644
--- a/libclamav/hashtab.h
+++ b/libclamav/hashtab.h
@@ -259,7 +259,7 @@ cl_error_t cli_htu32_insert(struct cli_htu32 *s, const struct cli_htu32_element
 void cli_htu32_free(struct cli_htu32 *s, mpool_t *mempool);
 
 /**
- * @brief Find a sepcific element by key in the u32 hashtable.
+ * @brief Find a specific element by key in the u32 hashtable.
  *
  * @param s
  * @param key
@@ -331,7 +331,7 @@ struct cli_map {
  * @param valuesize
  * @param capacity
  * @return cl_error_t CL_SUCCESS on success
- * @return cl_error_t CL_E* if some error occured
+ * @return cl_error_t CL_E* if some error occurred
  */
 cl_error_t cli_map_init(struct cli_map *m, int32_t keysize, int32_t valuesize,
                         int32_t capacity);
@@ -344,7 +344,7 @@ cl_error_t cli_map_init(struct cli_map *m, int32_t keysize, int32_t valuesize,
  * @param keysize
  * @return cl_error_t CL_SUCCESS if added.
  * @return cl_error_t CL_ECREAT if already present.
- * @return cl_error_t CL_E* if some error occured.
+ * @return cl_error_t CL_E* if some error occurred.
  */
 cl_error_t cli_map_addkey(struct cli_map *m, const void *key, int32_t keysize);
 
@@ -356,7 +356,7 @@ cl_error_t cli_map_addkey(struct cli_map *m, const void *key, int32_t keysize);
  * @param keysize
  * @return cl_error_t CL_SUCCESS if removed.
  * @return cl_error_t CL_EUNLINK if not present, so didn't need to be removed.
- * @return cl_error_t CL_E* if some error occured.
+ * @return cl_error_t CL_E* if some error occurred.
  */
 cl_error_t cli_map_removekey(struct cli_map *m, const void *key, int32_t keysize);
 
@@ -367,7 +367,7 @@ cl_error_t cli_map_removekey(struct cli_map *m, const void *key, int32_t keysize
  * @param value
  * @param valuesize
  * @return cl_error_t CL_SUCCESS on success
- * @return cl_error_t CL_E* if some error occured
+ * @return cl_error_t CL_E* if some error occurred
  */
 cl_error_t cli_map_setvalue(struct cli_map *m, const void *value, int32_t valuesize);
 
@@ -379,7 +379,7 @@ cl_error_t cli_map_setvalue(struct cli_map *m, const void *value, int32_t values
  * @param keysize
  * @return cl_error_t CL_SUCCESS if found
  * @return cl_error_t CL_EACCES if NOT found
- * @return cl_error_t CL_E* if some error occured.
+ * @return cl_error_t CL_E* if some error occurred.
  */
 cl_error_t cli_map_find(struct cli_map *m, const void *key, int32_t keysize);
 
diff --git a/libclamav/hfsplus.c b/libclamav/hfsplus.c
index 39c4171c11..6040bc640e 100644
--- a/libclamav/hfsplus.c
+++ b/libclamav/hfsplus.c
@@ -312,7 +312,7 @@ static cl_error_t hfsplus_readheader(cli_ctx *ctx, hfsPlusVolumeHeader *volHeade
  * @param fork          Fork Data
  * @param dirname       Temp directory name
  * @param[out] filename (optional) temp file name
- * @param orig_filename (optiopnal) Original filename
+ * @param orig_filename (optional) Original filename
  * @return cl_error_t
  */
 static cl_error_t hfsplus_scanfile(cli_ctx *ctx, hfsPlusVolumeHeader *volHeader, hfsHeaderRecord *extHeader,
diff --git a/libclamav/htmlnorm.c b/libclamav/htmlnorm.c
index 13bdb26510..df342049b3 100644
--- a/libclamav/htmlnorm.c
+++ b/libclamav/htmlnorm.c
@@ -188,7 +188,7 @@ static unsigned char *cli_readchunk(FILE *stream, m_area_t *m_area, unsigned int
         return NULL;
     }
 
-    /* Try and use the memory buffer first */
+    /* Try to use the memory buffer first */
     if (m_area) {
         /* maximum we can copy into the buffer,
          * we could have less than max_len bytes available */
diff --git a/libclamav/jpeg.c b/libclamav/jpeg.c
index 6f3214329c..3d9869a243 100644
--- a/libclamav/jpeg.c
+++ b/libclamav/jpeg.c
@@ -65,7 +65,7 @@
  * inserted after it to indicate that it's just and 0xff and _NOT_ a segment
  * marker. Decoders skip the 0x00 byte.
  * This only applies to entropy-encoded data, not to marker payload data.
- * We dont' really worry about this though because this parser stops when it
+ * We don't really worry about this though because this parser stops when it
  * reaches the image data.
  */
 
@@ -85,7 +85,7 @@ typedef enum {
      */
     JPEG_MARKER_SEGMENT_S0F0_START_OF_FRAME_BASELINE_DCT = 0xC0,
 
-    /* Start of Frame for a extended sequential DCT-based JPEG (S0F1)
+    /* Start of Frame for an extended sequential DCT-based JPEG (S0F1)
      * Variable size payload.
      */
     JPEG_MARKER_SEGMENT_S0F1_START_OF_FRAME_EXT_SEQ_DCT = 0xC1,
@@ -117,17 +117,17 @@ typedef enum {
      */
     JPEG_MARKER_SEGMENT_S0F7_START_OF_FRAME_DIFF_LOSSLESS_DCT = 0xC7,
 
-    /* Start of Frame for a differential sequential arithmatic-based JPEG (S0F5)
+    /* Start of Frame for a differential sequential arithmetic-based JPEG (S0F5)
      * Variable size payload.
      */
     JPEG_MARKER_SEGMENT_S0F9_START_OF_FRAME_DIFF_SEQ_ARITH = 0xC9,
 
-    /* Start of Frame for a differential progressive arithmatic-based JPEG (S0F6)
+    /* Start of Frame for a differential progressive arithmetic-based JPEG (S0F6)
      * Variable size payload.
      */
     JPEG_MARKER_SEGMENT_S0F10_START_OF_FRAME_DIFF_PROG_ARITH = 0xCA,
 
-    /* Start of Frame for a differential lossless arithmatic-based JPEG (S0F7)
+    /* Start of Frame for a differential lossless arithmetic-based JPEG (S0F7)
      * Variable size payload.
      */
     JPEG_MARKER_SEGMENT_S0F11_START_OF_FRAME_DIFF_LOSSLESS_ARITH = 0xCB,
@@ -138,7 +138,7 @@ typedef enum {
      */
     JPEG_MARKER_SEGMENT_DHT_DEFINE_HUFFMAN_TABLES = 0xC4,
 
-    /* Define Arithmatic Coding Conditioning (DAC)
+    /* Define Arithmetic Coding Conditioning (DAC)
      * Variable size payload.
      */
     JPEG_MARKER_SEGMENT_DHT_DEFINE_ARITH_CODING = 0xCC,
diff --git a/libclamav/jsparse/js-norm.c b/libclamav/jsparse/js-norm.c
index ece3c86c93..a625d7fc94 100644
--- a/libclamav/jsparse/js-norm.c
+++ b/libclamav/jsparse/js-norm.c
@@ -1766,7 +1766,7 @@ static int yylex(YYSTYPE *lvalp, yyscan_t scanner)
             cli_dbgmsg(MODULE "infloop detected, skipping character\n");
             scanner->pos++;
         }
-        /* its not necesarely an infloop if it changed
+        /* its not necessarily an infloop if it changed
          * state, and it shouldn't infloop between states */
     }
     scanner->lastpos    = scanner->pos;
diff --git a/libclamav/jsparse/textbuf.h b/libclamav/jsparse/textbuf.h
index 951c11bd87..08478aa2b7 100644
--- a/libclamav/jsparse/textbuf.h
+++ b/libclamav/jsparse/textbuf.h
@@ -86,7 +86,7 @@ static inline int textbuffer_append(struct text_buffer *txtbuf, const char *s)
 }
 
 /**
- * @brief Append a single cahracter from source `c` to the data in text_buffer `txtbuf`. Reallocate to a larger buf as needed.
+ * @brief Append a single character from source `c` to the data in text_buffer `txtbuf`. Reallocate to a larger buf as needed.
  *
  * @param txtbuf    The destination text_buffer.
  * @param c         Pointer to the source data.
diff --git a/libclamav/matcher-ac.c b/libclamav/matcher-ac.c
index 708f79a458..ae711473d3 100644
--- a/libclamav/matcher-ac.c
+++ b/libclamav/matcher-ac.c
@@ -3046,7 +3046,7 @@ cl_error_t cli_ac_addsig(struct cli_matcher *root, const char *virname, const ch
             return CL_EMALFDB;
         }
 
-        // Store those intial bytes as the pattern "prefix" (the stuff before what goes in the AC Trie)
+        // Store those initial bytes as the pattern "prefix" (the stuff before what goes in the AC Trie)
         new->prefix = new->pattern;
         // The "prefix" length is the number of bytes before the starting position of the pattern that goes in the AC Trie.
         new->prefix_length[0] = ppos;
diff --git a/libclamav/matcher-ac.h b/libclamav/matcher-ac.h
index 35c675f52e..5e7b9306b1 100644
--- a/libclamav/matcher-ac.h
+++ b/libclamav/matcher-ac.h
@@ -158,7 +158,7 @@ cl_error_t cli_ac_initdata(struct cli_ac_data *data, uint32_t partsigs, uint32_t
  * @param mdata     Match result data
  * @param lsig_id   The current logical signature id
  * @param subsig_id The current subsignature id
- * @param realoff   Offset where the match occured
+ * @param realoff   Offset where the match occurred
  * @param partial   0 if whole pattern, or >0 for a partial-patterns. That is one split with wildcards like * or {n-m}.
  * @return cl_error_t
  */
diff --git a/libclamav/matcher-byte-comp.c b/libclamav/matcher-byte-comp.c
index de6ece4cc2..37205b1aad 100644
--- a/libclamav/matcher-byte-comp.c
+++ b/libclamav/matcher-byte-comp.c
@@ -316,7 +316,7 @@ cl_error_t cli_bcomp_addpatt(struct cli_matcher *root, const char *virname, cons
 
     bcomp->byte_len = byte_length;
 
-    /* we can have up to two comparison eval statements, each sperated by a comma, let's parse them in a separate string */
+    /* we can have up to two comparison eval statements, each separated by a comma, let's parse them in a separate string */
     comp_buf = cli_strdup(tokens[2]);
     if (!comp_buf) {
         cli_errmsg("cli_bcomp_addpatt: Unable to allocate memory for comparison buffer\n");
@@ -328,7 +328,7 @@ cl_error_t cli_bcomp_addpatt(struct cli_matcher *root, const char *virname, cons
     comp_start = strchr(comp_buf, ',');
     comp_end   = strrchr(comp_buf, ',');
 
-    /* check to see if we have exactly one comma, then set our count and tokenize our string apropriately */
+    /* check to see if we have exactly one comma, then set our count and tokenize our string appropriately */
     if (comp_start && comp_end) {
         if (comp_end == comp_start) {
             comp_start[0]     = '\0';
@@ -825,7 +825,7 @@ cl_error_t cli_bcomp_compare_check(const unsigned char *f_buffer, size_t buffer_
  * @param len the length of the buffer, must be larger than 3 bytes
  * @param check_only specifies whether to return true/false or the modified opt value
  *
- * @return if check only is set, it will return true or false, otherwise it returns a modifiied byte compare bitfield
+ * @return if check only is set, it will return true or false, otherwise it returns a modified byte compare bitfield
  */
 uint16_t cli_bcomp_chk_hex(const unsigned char *buffer, uint16_t opt, uint32_t len, uint32_t check_only)
 {
diff --git a/libclamav/matcher-pcre.c b/libclamav/matcher-pcre.c
index 020c8e76c2..6de933b314 100644
--- a/libclamav/matcher-pcre.c
+++ b/libclamav/matcher-pcre.c
@@ -210,7 +210,7 @@ cl_error_t cli_pcre_addpatt(struct cli_matcher *root, const char *virname, const
     }
 
     /* TODO: trigger and regex checking (backreference limitations?) (control pattern limitations?) */
-    /* cli_ac_chklsig will fail a empty trigger; empty patterns can cause an infinite loop */
+    /* cli_ac_chklsig will fail an empty trigger; empty patterns can cause an infinite loop */
     if (*trigger == '\0' || *pattern == '\0') {
         cli_errmsg("cli_pcre_addpatt: trigger or pattern cannot be an empty string\n");
         return CL_EMALFDB;
diff --git a/libclamav/matcher.c b/libclamav/matcher.c
index b9b0ba007e..71e0581677 100644
--- a/libclamav/matcher.c
+++ b/libclamav/matcher.c
@@ -899,7 +899,7 @@ static cl_error_t lsig_eval(cli_ctx *ctx, struct cli_matcher *root, struct cli_a
              * Create an fmap window into our current fmap using the original offset & length, and rescan as the new type
              *
              * TODO: Unsure if creating an fmap is the right move, or if we should rescan with the current fmap as-is,
-             * since it's not really a container so much as it is type reassignment. This new fmap layer protect agains
+             * since it's not really a container so much as it is type reassignment. This new fmap layer protect against
              * a possible infinite loop by applying the scan recursion limit, but maybe there's a better way?
              * Testing with both HandlerType type reassignment sigs + Container/Intermediates sigs should indicate if
              * a change is needed.
@@ -1406,14 +1406,14 @@ cl_error_t cli_scan_fmap(cli_ctx *ctx, cli_file_t ftype, bool filetype_only, str
     /*
      * Evaluate the logical expressions for clamav logical signatures and YARA rules.
      */
-    // Evalute for the target-specific signature AC matches.
+    // Evaluate for the target-specific signature AC matches.
     if (NULL != target_ac_root) {
         if (ret != CL_VIRUS) {
             ret = cli_exp_eval(ctx, target_ac_root, &target_ac_data, &info, (const char *)refhash);
         }
     }
 
-    // Evalute for the generic signature AC matches.
+    // Evaluate for the generic signature AC matches.
     if (NULL != generic_ac_root) {
         if (ret != CL_VIRUS) {
             ret = cli_exp_eval(ctx, generic_ac_root, &generic_ac_data, &info, (const char *)refhash);
diff --git a/libclamav/matcher.h b/libclamav/matcher.h
index 2bc214fc33..dc990ce12b 100644
--- a/libclamav/matcher.h
+++ b/libclamav/matcher.h
@@ -292,7 +292,7 @@ static const struct cli_mtarget cli_mtargets[CLI_MTARGETS] = {
  * @param offset            Offset into the buffer from which to start matching.
  * @param ctx               The scanning context.
  * @param ftype             If specified, may limit signature matching trie by target type corresponding with the specified CL_TYPE
- * @param[in,out] acdata    (optional) A list of pattern maching data structs to contain match results, one for generic signatures and one for target-specific signatures.
+ * @param[in,out] acdata    (optional) A list of pattern matching data structs to contain match results, one for generic signatures and one for target-specific signatures.
  *                          If not provided, the matcher results are lost, outside of this function's return value.
  *                          Required if you want to evaluate logical expressions afterwards.
  * @return cl_error_t
@@ -366,7 +366,7 @@ cl_error_t cli_exp_eval(cli_ctx *ctx, struct cli_matcher *root, struct cli_ac_da
 cl_error_t cli_caloff(const char *offstr, const struct cli_target_info *info, unsigned int target, uint32_t *offdata, uint32_t *offset_min, uint32_t *offset_max);
 
 /**
- * @brief Determine if an alert is a known false positive, using each fmap in the the ctx->container stack to check MD5, SHA1, and SHA256 hashes.
+ * @brief Determine if an alert is a known false positive, using each fmap in the ctx->container stack to check MD5, SHA1, and SHA256 hashes.
  *
  * @param ctx           The scanning context.
  * @param vname         (Optional) The name of the signature alert.
diff --git a/libclamav/mbox.c b/libclamav/mbox.c
index b2a93b3478..540bb78abe 100644
--- a/libclamav/mbox.c
+++ b/libclamav/mbox.c
@@ -265,7 +265,7 @@ static bool haveTooManyMIMEArguments(size_t argCnt, cli_ctx *ctx, bool *heuristi
                          * protocol="application/pgp-encrypted"   \
                          */
 #define X_BFILE RELATED /*                                             \
-                         * BeOS, expert two parts: the file and it's   \
+                         * BeOS, expert two parts: the file and its   \
                          * attributes. The attributes part comes as    \
                          *    Content-Type: application/x-be_attribute \
                          *        name="foo"                           \
@@ -2568,7 +2568,7 @@ parseEmailBody(message *messageIn, text *textIn, mbox_ctx *mctx, unsigned int re
         /* Look for a bounce in the text (non mime encoded) portion */
         const text *t;
         /* isBounceStart() is expensive, reduce the number of calls */
-        bool lookahead_definately_is_bounce = false;
+        bool lookahead_definitely_is_bounce = false;
 
         for (t = aText; t && (rc != VIRUS); t = t->t_next) {
             const line_t *l = t->t_line;
@@ -2580,15 +2580,15 @@ parseEmailBody(message *messageIn, text *textIn, mbox_ctx *mctx, unsigned int re
                 continue;
             }
 
-            if (lookahead_definately_is_bounce)
-                lookahead_definately_is_bounce = false;
+            if (lookahead_definitely_is_bounce)
+                lookahead_definitely_is_bounce = false;
             else if (!isBounceStart(mctx, lineGetData(l)))
                 continue;
 
             lookahead = t->t_next;
             if (lookahead) {
                 if (isBounceStart(mctx, lineGetData(lookahead->t_line))) {
-                    lookahead_definately_is_bounce = true;
+                    lookahead_definitely_is_bounce = true;
                     /* don't save worthless header lines */
                     continue;
                 }
@@ -2693,7 +2693,7 @@ parseEmailBody(message *messageIn, text *textIn, mbox_ctx *mctx, unsigned int re
                     s = lineGetData(l);
                     if (isBounceStart(mctx, s)) {
                         cli_dbgmsg("Found the start of another bounce candidate (%s)\n", s);
-                        lookahead_definately_is_bounce = true;
+                        lookahead_definitely_is_bounce = true;
                         break;
                     }
                 }
@@ -2760,7 +2760,7 @@ parseEmailBody(message *messageIn, text *textIn, mbox_ctx *mctx, unsigned int re
             } else
                 /*
                  * Save the entire text portion,
-                 * since it it may be an HTML file with
+                 * since it may be an HTML file with
                  * a JavaScript virus or a phish
                  */
                 saveIt = true;
@@ -2866,7 +2866,7 @@ boundaryStart(const char *line, const char *boundary)
     /*
      * Gibe.B3 is broken, it has:
      *    boundary="---- =_NextPart_000_01C31177.9DC7C000"
-     * but it's boundaries look like
+     * but its boundaries look like
      *    ------ =_NextPart_000_01C31177.9DC7C000
      * notice the one too few '-'.
      * Presumably this is a deliberate exploitation of a bug in some mail
@@ -2927,7 +2927,7 @@ boundaryStart(const char *line, const char *boundary)
 /*
  * Is the current line the end?
  *
- * The message ends with with --boundary--
+ * The message ends with --boundary--
  */
 static int
 boundaryEnd(const char *line, const char *boundary)
@@ -3083,12 +3083,12 @@ getTextPart(message *const messages[], size_t size)
  * strip -
  *    Remove the trailing spaces from a buffer. Don't call this directly,
  * always call strstrip() which is a wrapper to this routine to be used with
- * NUL terminated strings. This code looks a bit strange because of it's
+ * NUL terminated strings. This code looks a bit strange because of its
  * heritage from code that worked on strings that weren't necessarily NUL
  * terminated.
  * TODO: rewrite for clamAV
  *
- * Returns it's new length (a la strlen)
+ * Returns its new length (a la strlen)
  *
  * len must be int not size_t because of the >= 0 test, it is sizeof(buf)
  *    not strlen(buf)
@@ -3291,7 +3291,7 @@ parseMimeHeader(message *m, const char *cmd, const table_t *rfc821Table, const c
                 }
 
                 /*
-                 * Add in all rest of the the arguments.
+                 * Add in all rest of the arguments.
                  * e.g. if the header is this:
                  * Content-Type:', arg='multipart/mixed; boundary=foo
                  * we find the boundary argument set it
diff --git a/libclamav/mbr.c b/libclamav/mbr.c
index 1973146756..0ad3ec2f04 100644
--- a/libclamav/mbr.c
+++ b/libclamav/mbr.c
@@ -140,7 +140,7 @@ cl_error_t cli_scanmbr(cli_ctx *ctx, size_t sectorsize)
     unsigned i = 0, prtncount = 0;
     size_t maplen, partsize;
 
-    mbr_parsemsg("The start of something magnificant: MBR parsing\n");
+    mbr_parsemsg("The start of something magnificent: MBR parsing\n");
 
     if (!ctx || !ctx->fmap) {
         cli_errmsg("cli_scanmbr: Invalid context\n");
diff --git a/libclamav/nsis/nsis_bzlib.h b/libclamav/nsis/nsis_bzlib.h
index 0ce5df2023..3e10bc9a8b 100644
--- a/libclamav/nsis/nsis_bzlib.h
+++ b/libclamav/nsis/nsis_bzlib.h
@@ -69,7 +69,7 @@ typedef
 #endif
 
 #ifndef BZ_NO_STDIO
-/* Need a definitition for FILE */
+/* Need a definition for FILE */
 #include <stdio.h>
 #endif
 
diff --git a/libclamav/nsis/nulsft.c b/libclamav/nsis/nulsft.c
index 48ead45444..392a2414a7 100644
--- a/libclamav/nsis/nulsft.c
+++ b/libclamav/nsis/nulsft.c
@@ -539,7 +539,7 @@ int cli_scannulsft(cli_ctx *ctx, off_t offset)
             continue;
         }
         if (ret == CL_SUCCESS) {
-            cli_dbgmsg("NSIS: Successully extracted file #%u\n", nsist.fno);
+            cli_dbgmsg("NSIS: Successfully extracted file #%u\n", nsist.fno);
             if (lseek(nsist.ofd, 0, SEEK_SET) == -1) {
                 cli_dbgmsg("NSIS: call to lseek() failed\n");
                 free(nsist.dir);
diff --git a/libclamav/ole2_extract.c b/libclamav/ole2_extract.c
index 6b9cedb716..6fd63bff88 100644
--- a/libclamav/ole2_extract.c
+++ b/libclamav/ole2_extract.c
@@ -108,7 +108,7 @@ typedef struct ole2_header_tag {
      * The following is not part of the ole2 header, but stuff we need in
      * order to decode.
      *
-     * IMPORANT: These must take account of the size of variables below here
+     * IMPORTANT: These must take account of the size of variables below here
      * when calculating hdr_size to read the header.
      *
      * See the top of cli_ole2_extract().
@@ -1127,7 +1127,7 @@ static cl_error_t scan_biff_for_xlm_macros_and_images(
  * @brief Scan for XLM (Excel 4.0) macro sheets and images in an OLE2 Workbook stream.
  *
  * The stream should be encoded with <= BIFF8.
- * The found_macro and found_image out-params should be checked even if an error occured.
+ * The found_macro and found_image out-params should be checked even if an error occurred.
  *
  * @param hdr
  * @param prop
diff --git a/libclamav/others.h b/libclamav/others.h
index df8b025d61..e05d120253 100644
--- a/libclamav/others.h
+++ b/libclamav/others.h
@@ -987,7 +987,7 @@ const char *cli_gettmpdir(void);
  * @brief Sanitize a relative path, so it cannot have a negative depth.
  *
  * Caller is responsible for freeing the sanitized filepath.
- * The optioal sanitized_filebase output param is a pointer into the filepath,
+ * The optional sanitized_filebase output param is a pointer into the filepath,
  * if set, and does not need to be freed.
  *
  * @param filepath                  The filepath to sanitize
diff --git a/libclamav/pdf.c b/libclamav/pdf.c
index b89b4216c2..349e7d34bc 100644
--- a/libclamav/pdf.c
+++ b/libclamav/pdf.c
@@ -240,7 +240,7 @@ static cl_error_t find_stream_bounds(
             goto done;
         bytesleft -= idx - start;
 
-        /* Skip any new line charcters. */
+        /* Skip any new line characters. */
         if (bytesleft >= 2 && idx[0] == '\xd' && idx[1] == '\xa') {
             idx += 2;
             bytesleft -= 2;
diff --git a/libclamav/pdfdecode.c b/libclamav/pdfdecode.c
index 21507e7ddb..16feb108e4 100644
--- a/libclamav/pdfdecode.c
+++ b/libclamav/pdfdecode.c
@@ -99,7 +99,7 @@ static cl_error_t filter_lzwdecode(struct pdf_struct *pdf, struct pdf_obj *obj,
  * @param stream    Filter stream buffer pointer.
  * @param streamlen Length of filter stream buffer.
  * @param xref      Indicates if the stream is an /XRef stream.  Do not apply forced decryption on /XRef streams.
- * @param fout      File descriptor to write to to be scanned.
+ * @param fout      File descriptor to write to be scanned.
  * @param[out] rc   Return code ()
  * @param objstm    (optional) Object stream context structure.
  * @return size_t   The number of bytes written to 'fout' to be scanned.
@@ -212,7 +212,7 @@ size_t pdf_decodestream(
  * @param obj           The object we found the filter content in.
  * @param params        (optional) Dictionary parameters describing the filter data.
  * @param token         Pointer to and length of filter data.
- * @param fout          File handle to write data to to be scanned.
+ * @param fout          File handle to write data to be scanned.
  * @param[out] status   CL_CLEAN/CL_SUCCESS or CL_VIRUS/CL_E<error>
  * @param objstm        (optional) Object stream context structure.
  * @return ptrdiff_t    The number of bytes we wrote to 'fout'. -1 if failed out.
diff --git a/libclamav/pe.c b/libclamav/pe.c
index cf0e7cb368..01d6dac017 100644
--- a/libclamav/pe.c
+++ b/libclamav/pe.c
@@ -2882,7 +2882,7 @@ int cli_scanpe(cli_ctx *ctx)
             // TODO Regarding the commented out check below:
             // This used to check that the section name was NULL, but now that
             // header parsing is done in cli_peheader (and since we don't yet
-            // make the section name availabe via peinfo->sections[]) it would
+            // make the section name available via peinfo->sections[]) it would
             // be a pain to fetch the name here.  Since this is the only place
             // in cli_scanpe that needs the section name, and since I verified
             // that detection still occurs for Polipos without this check,
@@ -4172,7 +4172,7 @@ int cli_scanpe(cli_ctx *ctx)
             // If the number of alerts has increased, then bail.
             //
             // This preserves the intention of https://github.com/Cisco-Talos/clamav/commit/771c23099893f02f1316960fbe84f62b115a3556
-            // although that commit had it bailing if a match occured even in allmatch-mode, which we do not want to do.
+            // although that commit had it bailing if a match occurred even in allmatch-mode, which we do not want to do.
             if (!SCAN_ALLMATCHES && num_alerts != evidence_num_alerts(ctx->evidence)) {
                 cli_exe_info_destroy(peinfo);
                 return CL_VIRUS;
@@ -4789,7 +4789,7 @@ cl_error_t cli_peheader(fmap_t *map, struct cli_exe_info *peinfo, uint32_t opts,
 #endif
 
     // Ensure there are enough bytes to cover the full optional header,
-    // not including the data directory entries (which aren't all gauranteed
+    // not including the data directory entries (which aren't all guaranteed
     // to be there)
     if (opt_hdr_size < sizeof(struct pe_image_optional_hdr32)) {
         cli_dbgmsg("cli_peheader: SizeOfOptionalHeader too small\n");
@@ -5154,7 +5154,7 @@ cl_error_t cli_peheader(fmap_t *map, struct cli_exe_info *peinfo, uint32_t opts,
         section->ursz = EC32(section_hdr->SizeOfRawData);
 
         /* First, if a section exists totally outside of a file, remove the
-         * section from the list or zero out it's size. */
+         * section from the list or zero out its size. */
         if (section->rsz) { /* Don't bother with virtual only sections */
             if (section->raw >= fsize || section->uraw >= fsize) {
                 cli_dbgmsg("cli_peheader: Broken PE file - Section %zu starts or exists beyond the end of file (Offset@ %lu, Total filesize %lu)\n", section_pe_idx, (unsigned long)section->raw, (unsigned long)fsize);
@@ -5183,7 +5183,7 @@ cl_error_t cli_peheader(fmap_t *map, struct cli_exe_info *peinfo, uint32_t opts,
                 }
             } else {
 
-                /* If a section is truncated, adjust it's size value */
+                /* If a section is truncated, adjust its size value */
                 if (!CLI_ISCONTAINED_0_TO(fsize, section->raw, section->rsz)) {
                     cli_dbgmsg("cli_peheader: PE Section %zu raw+rsz extends past the end of the file by %lu bytes\n", section_pe_idx, (section->raw + section->rsz) - fsize);
                     section->rsz = fsize - section->raw;
@@ -5512,7 +5512,7 @@ cl_error_t cli_peheader(fmap_t *map, struct cli_exe_info *peinfo, uint32_t opts,
         break;
     } /* while(dirs[2].Size) */
 
-    // Do final preperations for peinfo to be passed back
+    // Do final preparations for peinfo to be passed back
     peinfo->is_dll = is_dll;
 
     ret = CL_SUCCESS;
diff --git a/libclamav/petite.c b/libclamav/petite.c
index 29d27a3f4f..e22115488b 100644
--- a/libclamav/petite.c
+++ b/libclamav/petite.c
@@ -153,7 +153,7 @@ int petite_inflate2x_1to9(char *buf, uint32_t minrva, uint32_t bufsz, struct cli
             /*
              * Our encryption is pathetic and out software is lame but
              * we need to claim it's unbreakable.
-             * So why dont we just mangle the imports and encrypt the EP?!
+             * So why don't we just mangle the imports and encrypt the EP?!
              */
 
             /* Decrypts old entrypoint if we got enough clues */
diff --git a/libclamav/phishcheck.c b/libclamav/phishcheck.c
index 5162f8b7f1..dd994b7fad 100644
--- a/libclamav/phishcheck.c
+++ b/libclamav/phishcheck.c
@@ -92,7 +92,7 @@ The _domain_list_ is a list of pairs of realLink, displayedLink (any of which ca
 This is the list of domains we do phishing detection for (such as ebay,paypal,chase,....)
 We can't decide to stop processing here or not, so we just set a flag.
 
-Note(*!*): the flags are modified by the the domain list checker. If domain is found, then the flags associated with it filter the default compile-time flags.
+Note(*!*): the flags are modified by the domain list checker. If domain is found, then the flags associated with it filter the default compile-time flags.
 
 5. _Hostname_ is extracted from the _displayed URL_.
 It is checked against the _allow_list_, and _domain_list_.
@@ -1481,7 +1481,7 @@ static enum phish_status phishingCheck(cli_ctx* ctx, struct url_check* urls)
                                                urls->realLink.data,
                                                strlen(urls->realLink.data),
                                                &phishing_verdict))) {
-        cli_dbgmsg("Error occured in url_hash_match\n");
+        cli_dbgmsg("Error occurred in url_hash_match\n");
         goto done;
     } else if (phishing_verdict != CL_PHISH_NODECISION) {
         if (phishing_verdict == CL_PHISH_CLEAN) {
@@ -1535,7 +1535,7 @@ static enum phish_status phishingCheck(cli_ctx* ctx, struct url_check* urls)
      * Eg:
      *      R:.+\.malicious\.net([/?].*)?:.+\.benign\.com
      */
-    /* Provide copies of the oirinal URL's, because domain_list_match() may modify the buffer,
+    /* Provide copies of the original URL's, because domain_list_match() may modify the buffer,
        and we don't want that to happen in this case. */
     realData = cli_strdup(urls->realLink.data);
     if (!realData) {
diff --git a/libclamav/readdb.h b/libclamav/readdb.h
index f2129c2e89..fc7caab93e 100644
--- a/libclamav/readdb.h
+++ b/libclamav/readdb.h
@@ -175,7 +175,7 @@ cl_error_t cli_add_content_match_pattern(struct cli_matcher *root, const char *v
  * Called once for each subsignature in a logical signature.
  * Not for use in other signature types (ndb, yara, etc).
  *
- * This function determines what type of subsiganture it is, whether that's:
+ * This function determines what type of subsignature it is, whether that's:
  * - a macro subsignature
  * - a pcre subsignature
  * - a byte compare subsignature
diff --git a/libclamav/rebuildpe.c b/libclamav/rebuildpe.c
index 621091570a..d1080efe6b 100644
--- a/libclamav/rebuildpe.c
+++ b/libclamav/rebuildpe.c
@@ -177,10 +177,10 @@ int cli_rebuildpe_align(char *buffer, struct cli_exe_section *sections, int sect
         int snprintf_ret;
         snprintf_ret = snprintf(curpe, 8, ".clam%.2d", i + 1);
         if (snprintf_ret < 0) {
-            // More sections than expect -- the section number in the name was trunctated. Whatever. Don't really care.
+            // More sections than expect -- the section number in the name was truncated. Whatever. Don't really care.
             // The act of checking for an error stops GCC from warning about possible truncation at compile time.
             // See: https://stackoverflow.com/questions/51534284/how-to-circumvent-format-truncation-warning-in-gcc
-            cli_dbgmsg("More sections than expect (%d). The section number in the rebuilt pe section name was trunctated.\n", i);
+            cli_dbgmsg("More sections than expect (%d). The section number in the rebuilt pe section name was truncated.\n", i);
         }
         if (!align) {
             cli_writeint32(curpe + 8, sections[i].vsz);
diff --git a/libclamav/regex/regcomp.c b/libclamav/regex/regcomp.c
index c0ba09f226..ae9cde0cce 100644
--- a/libclamav/regex/regcomp.c
+++ b/libclamav/regex/regcomp.c
@@ -496,7 +496,7 @@ p_simp_re(struct parse *p,
 	sopno subno;
 #	define	BACKSL	(1<<CHAR_BIT)
 
-	pos = HERE();		/* repetion op, if any, covers from here */
+	pos = HERE();		/* repetition op, if any, covers from here */
 
 	assert(MORE());		/* caller should have ensured this */
 	c = GETNEXT();
diff --git a/libclamav/regex_list.c b/libclamav/regex_list.c
index f6b6b724fe..b276a30e34 100644
--- a/libclamav/regex_list.c
+++ b/libclamav/regex_list.c
@@ -788,7 +788,7 @@ static cl_error_t add_pattern_suffix(void *cbdata, const char *suffix, size_t su
     regex->preg = iregex->preg;
     regex->nxt  = NULL;
     el          = cli_hashtab_find(&matcher->suffix_hash, suffix, suffix_len);
-    /* TODO: what if suffixes are prefixes of eachother and only one will
+    /* TODO: what if suffixes are prefixes of each other and only one will
      * match? */
     if (el) {
         /* existing suffix */
diff --git a/libclamav/scanners.c b/libclamav/scanners.c
index c75b2eef61..12b97306d3 100644
--- a/libclamav/scanners.c
+++ b/libclamav/scanners.c
@@ -2101,7 +2101,7 @@ static cl_error_t cli_ole2_tempdir_scan_for_xlm_and_images(const char *dir, cli_
                 case CL_EMEM:
                     goto done;
                 default:
-                    cli_dbgmsg("cli_ole2_tempdir_scan_for_xlm_and_images: An error occured when parsing XLM BIFF temp file, skipping to next file.\n");
+                    cli_dbgmsg("cli_ole2_tempdir_scan_for_xlm_and_images: An error occurred when parsing XLM BIFF temp file, skipping to next file.\n");
             }
         }
     }
@@ -3320,7 +3320,7 @@ static cl_error_t scanraw(cli_ctx *ctx, cli_file_t type, uint8_t typercg, cli_fi
         (type != CL_TYPE_OLD_TAR) &&   /* Omit OLD TAR files because it's a raw archive format that we can extract and scan manually. */
         (type != CL_TYPE_POSIX_TAR)) { /* Omit POSIX TAR files because it's a raw archive format that we can extract and scan manually. */
         /*
-         * Enable file type recognition scan mode if requested, except for some some problematic types (above).
+         * Enable file type recognition scan mode if requested, except for some problematic types (above).
          */
         acmode |= AC_SCAN_FT;
     }
@@ -4203,7 +4203,7 @@ static inline bool result_should_goto_done(cli_ctx *ctx, cl_error_t result_in, c
          * Reasons to halt the scan but report a successful scan.
          */
 
-        // Exceeding the time limit should definitly halt the scan.
+        // Exceeding the time limit should definitely halt the scan.
         // But unless the user enabled alert-exceeds-max, we don't want to complain about it.
         case CL_ETIMEOUT:
 
@@ -4796,7 +4796,7 @@ cl_error_t cli_magic_scan(cli_ctx *ctx, cli_file_t type)
             }
 
             if (CL_SUCCESS != ret) {
-                // do not calculate the fuzzy image hash if parsing failed, or a heuristic alert occured.
+                // do not calculate the fuzzy image hash if parsing failed, or a heuristic alert occurred.
                 break;
             }
 
@@ -4812,7 +4812,7 @@ cl_error_t cli_magic_scan(cli_ctx *ctx, cli_file_t type)
             }
 
             if (CL_SUCCESS != ret) {
-                // do not calculate the fuzzy image hash if parsing failed, or a heuristic alert occured.
+                // do not calculate the fuzzy image hash if parsing failed, or a heuristic alert occurred.
                 break;
             }
 
@@ -4828,7 +4828,7 @@ cl_error_t cli_magic_scan(cli_ctx *ctx, cli_file_t type)
             }
 
             if (CL_SUCCESS != ret) {
-                // do not calculate the fuzzy image hash if parsing failed, or a heuristic alert occured.
+                // do not calculate the fuzzy image hash if parsing failed, or a heuristic alert occurred.
                 break;
             }
 
@@ -4844,7 +4844,7 @@ cl_error_t cli_magic_scan(cli_ctx *ctx, cli_file_t type)
             }
 
             if (CL_SUCCESS != ret) {
-                // do not calculate the fuzzy image hash if parsing failed, or a heuristic alert occured.
+                // do not calculate the fuzzy image hash if parsing failed, or a heuristic alert occurred.
                 break;
             }
 
@@ -5353,7 +5353,7 @@ cl_error_t cli_magic_scan_buff(const void *buffer, size_t length, cli_ctx *ctx,
  * @param engine            The scanning engine.
  * @param scanoptions       Scanning options.
  * @param[in,out] context   An opaque context structure allowing the caller to record details about the sample being scanned.
- * @return int              CL_CLEAN, CL_VIRUS, or an error code if an error occured during the scan.
+ * @return int              CL_CLEAN, CL_VIRUS, or an error code if an error occurred during the scan.
  */
 static cl_error_t scan_common(cl_fmap_t *map, const char *filepath, const char **virname, unsigned long int *scanned, const struct cl_engine *engine, struct cl_scan_options *scanoptions, void *context)
 {
diff --git a/libclamav/tiff.c b/libclamav/tiff.c
index ed055ff960..33157c70df 100644
--- a/libclamav/tiff.c
+++ b/libclamav/tiff.c
@@ -183,7 +183,7 @@ cl_error_t cli_parsetiff(cli_ctx *ctx)
 
         /* acquire next IFD location, gets 0 if last IFD */
         if (fmap_readn(map, &offset, offset, sizeof(offset)) != sizeof(offset)) {
-            cli_dbgmsg("cli_parsetiff: Failed to aquire next IFD location, file appears to be truncated.\n");
+            cli_dbgmsg("cli_parsetiff: Failed to acquire next IFD location, file appears to be truncated.\n");
             status = cli_append_potentially_unwanted(ctx, "Heuristics.Broken.Media.TIFF.EOFReadingChunkCRC");
             goto done;
         }
diff --git a/libclamav/xlm_extract.c b/libclamav/xlm_extract.c
index 2a7c0724db..79845723d4 100644
--- a/libclamav/xlm_extract.c
+++ b/libclamav/xlm_extract.c
@@ -3785,7 +3785,7 @@ typedef enum {
  * @param data                      data buffer starting with the record header
  * @param data_len                  length of the buffer
  * @param[in,out] unpacked_header   fill this
- * @return cl_error_t               CL_SUCCESS if successfull, else some error code.
+ * @return cl_error_t               CL_SUCCESS if successful, else some error code.
  */
 static cl_error_t
 read_office_art_record_header(const unsigned char *data, size_t data_len, struct OfficeArtRecordHeader_Unpacked *unpacked_header)
@@ -4636,7 +4636,7 @@ cl_error_t cli_extract_xlm_macros_and_images(const char *dir, cli_ctx *ctx, char
 
     if (in_fd == -1) {
         cli_dbgmsg("[cli_extract_xlm_macros_and_images] Failed to open input file\n");
-        /* Don't return an error. If the file is missing, an error probably occured
+        /* Don't return an error. If the file is missing, an error probably occurred
          * earlier, such as a UTF8 conversion error in parse_formula() and so the file was never written.
          * There are no macros to scan, so report SUCCESS / CLEAN. */
         goto done;
@@ -4957,7 +4957,7 @@ cl_error_t cli_extract_xlm_macros_and_images(const char *dir, cli_ctx *ctx, char
 
     /* If a read failed, return with an error. */
     if (size_read == (size_t)-1) {
-        cli_dbgmsg("cli_extract_xlm_macros_and_images: Read error occured when trying to read BIFF header. Truncated or malformed XLM macro file?\n");
+        cli_dbgmsg("cli_extract_xlm_macros_and_images: Read error occurred when trying to read BIFF header. Truncated or malformed XLM macro file?\n");
         status = CL_EREAD;
         goto done;
     }
diff --git a/libclamav/yara_arena.c b/libclamav/yara_arena.c
index 6d1538a536..7cceaa8470 100644
--- a/libclamav/yara_arena.c
+++ b/libclamav/yara_arena.c
@@ -319,7 +319,7 @@ void* yr_arena_base_address(
 // yr_arena_next_address
 //
 // Given an address and an offset, returns the address where
-// address + offset resides. The arena is a collection of non-contigous
+// address + offset resides. The arena is a collection of non-contiguous
 // regions of memory (pages), if address is pointing at the end of a page,
 // address + offset could cross the page boundary and point at somewhere
 // within the next page, this function handles these situations. It works
@@ -591,7 +591,7 @@ int yr_arena_allocate_memory(
 // yr_arena_allocate_struct
 //
 // Allocates a structure within the arena. This function is similar to
-// yr_arena_allocate_memory but additionaly receives a variable-length
+// yr_arena_allocate_memory but additionally receives a variable-length
 // list of offsets within the structure where pointers reside. This allows
 // the arena to keep track of pointers that must be adjusted when memory
 // is relocated. This is an example on how to invoke this function:
diff --git a/libclamav/yara_compiler.c b/libclamav/yara_compiler.c
index 1af88a0d24..b3ba499695 100644
--- a/libclamav/yara_compiler.c
+++ b/libclamav/yara_compiler.c
@@ -713,7 +713,7 @@ char* yr_compiler_get_error_message(
             snprintf(
                 buffer,
                 buffer_size,
-                "\"%s\" is not a array",
+                "\"%s\" is not an array",
                 compiler->last_error_extra_info);
             break;
         case ERROR_INVALID_FIELD_NAME:
diff --git a/libclamav/yara_grammar.c b/libclamav/yara_grammar.c
index 6100cc6dcd..2f896c2382 100644
--- a/libclamav/yara_grammar.c
+++ b/libclamav/yara_grammar.c
@@ -1748,7 +1748,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
 #if REAL_YARA //Meta not supported
         // Each rule have a list of meta-data info, consisting in a
         // sequence of YR_META structures. The last YR_META structure does
-        // not represent a real meta-data, it's just a end-of-list marker
+        // not represent a real meta-data, it's just an end-of-list marker
         // identified by a specific type (META_TYPE_NULL). Here we
         // write the end-of-list marker.
 
@@ -1785,7 +1785,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
       {
         // Each rule have a list of strings, consisting in a sequence
         // of YR_STRING structures. The last YR_STRING structure does not
-        // represent a real string, it's just a end-of-list marker
+        // represent a real string, it's just an end-of-list marker
         // identified by a specific flag (STRING_FLAGS_NULL). Here we
         // write the end-of-list marker.
 
diff --git a/libclamav/yara_grammar.y b/libclamav/yara_grammar.y
index 65150f6fca..b405266f1d 100644
--- a/libclamav/yara_grammar.y
+++ b/libclamav/yara_grammar.y
@@ -278,7 +278,7 @@ meta
 #if REAL_YARA //Meta not supported
         // Each rule have a list of meta-data info, consisting in a
         // sequence of YR_META structures. The last YR_META structure does
-        // not represent a real meta-data, it's just a end-of-list marker
+        // not represent a real meta-data, it's just an end-of-list marker
         // identified by a specific type (META_TYPE_NULL). Here we
         // write the end-of-list marker.
 
@@ -311,7 +311,7 @@ strings
       {
         // Each rule have a list of strings, consisting in a sequence
         // of YR_STRING structures. The last YR_STRING structure does not
-        // represent a real string, it's just a end-of-list marker
+        // represent a real string, it's just an end-of-list marker
         // identified by a specific flag (STRING_FLAGS_NULL). Here we
         // write the end-of-list marker.
 
diff --git a/libclamav/yara_lexer.c b/libclamav/yara_lexer.c
index 4f6ed02ca7..020fef2210 100644
--- a/libclamav/yara_lexer.c
+++ b/libclamav/yara_lexer.c
@@ -1507,7 +1507,7 @@ YY_RULE_SETUP
 
   if (strlen(yytext) > 128)
   {
-    yyerror(yyscanner, compiler, "indentifier too long");
+    yyerror(yyscanner, compiler, "identifier too long");
   }
 
   yylval->c_string = yr_strdup(yytext);
diff --git a/libclamav/yara_lexer.l b/libclamav/yara_lexer.l
index 3a1e53695b..ee57ce98fe 100644
--- a/libclamav/yara_lexer.l
+++ b/libclamav/yara_lexer.l
@@ -356,7 +356,7 @@ $({letter}|{digit}|_)*  {
 
   if (strlen(yytext) > 128)
   {
-    yyerror(yyscanner, compiler, "indentifier too long");
+    yyerror(yyscanner, compiler, "identifier too long");
   }
 
   yylval->c_string = yr_strdup(yytext);
diff --git a/libclamav_rust/build.rs b/libclamav_rust/build.rs
index bde6a83a44..c4846bfbe5 100644
--- a/libclamav_rust/build.rs
+++ b/libclamav_rust/build.rs
@@ -137,7 +137,7 @@ fn execute_bindgen() -> Result<(), &'static str> {
         // Make the bindings pretty.
         .rustfmt_bindings(true)
         // Disable the layout tests.
-        // We're commiting to source control. Pointer width, integer size, etc
+        // We're committing to source control. Pointer width, integer size, etc
         // are probably not the same when generated as when compiled.
         .layout_tests(false)
         // Enable bindgen to find generated headers in the build directory, too.
diff --git a/libclamav_rust/src/css_image_extract.rs b/libclamav_rust/src/css_image_extract.rs
index 8abd5dbf52..7352cd7bcf 100644
--- a/libclamav_rust/src/css_image_extract.rs
+++ b/libclamav_rust/src/css_image_extract.rs
@@ -62,12 +62,12 @@ impl<'a> CssImageExtractor<'a> {
 
     fn next_base64_image(&mut self) -> Option<&str> {
         'outer: loop {
-            // Find occurence of "url" with
+            // Find occurrence of "url" with
             if let Some(pos) = self.remaining.find("url") {
                 (_, self.remaining) = self.remaining.split_at(pos + "url".len());
                 // Found 'url'.
             } else {
-                // No occurence of "url"
+                // No occurrence of "url"
                 // No more 'url's.
                 self.remaining = "";
                 return None;
@@ -199,7 +199,7 @@ impl<'a> CssImageExtractor<'a> {
                 (_, url_parameter) = url_parameter.split_at(pos + ";".len());
                 // Found ";"
             } else {
-                // No occurence of ";" in the url() parameter.
+                // No occurrence of ";" in the url() parameter.
                 continue 'outer;
             };
 
diff --git a/libclamav_rust/src/logging.rs b/libclamav_rust/src/logging.rs
index 03234694fc..7227a69712 100644
--- a/libclamav_rust/src/logging.rs
+++ b/libclamav_rust/src/logging.rs
@@ -86,7 +86,7 @@ mod tests {
 }
 
 /// API exported for C code to log to standard error using Rust.
-/// This would be be an alternative to fputs, and reliably prints
+/// This would be an alternative to fputs, and reliably prints
 /// non-ASCII UTF8 characters on Windows, where fputs does not.
 ///
 /// # Safety
diff --git a/libclamav_rust/src/sys.rs b/libclamav_rust/src/sys.rs
index 3fe6eb9dd7..1df2323184 100644
--- a/libclamav_rust/src/sys.rs
+++ b/libclamav_rust/src/sys.rs
@@ -113,7 +113,7 @@ pub type clcb_file_inspection = ::std::option::Option<
         context: *mut ::std::os::raw::c_void,
     ) -> cl_error_t,
 >;
-#[doc = " @brief Pre-scan callback.\n\n Called for each NEW file (inner and outer) before the scanning takes place. This is\n roughly the the same as clcb_before_cache, but it is affected by clean file caching.\n This means that it won't be called if a clean cached file (inner or outer) is\n scanned a second time.\n\n @param fd        File descriptor which is about to be scanned.\n @param type      File type detected via magic - i.e. NOT on the fly - (e.g. \"CL_TYPE_MSEXE\").\n @param context   Opaque application provided data.\n @return          CL_CLEAN = File is scanned.\n @return          CL_BREAK = Allowed by callback - file is skipped and marked as clean.\n @return          CL_VIRUS = Blocked by callback - file is skipped and marked as infected."]
+#[doc = " @brief Pre-scan callback.\n\n Called for each NEW file (inner and outer) before the scanning takes place. This is\n roughly the same as clcb_before_cache, but it is affected by clean file caching.\n This means that it won't be called if a clean cached file (inner or outer) is\n scanned a second time.\n\n @param fd        File descriptor which is about to be scanned.\n @param type      File type detected via magic - i.e. NOT on the fly - (e.g. \"CL_TYPE_MSEXE\").\n @param context   Opaque application provided data.\n @return          CL_CLEAN = File is scanned.\n @return          CL_BREAK = Allowed by callback - file is skipped and marked as clean.\n @return          CL_VIRUS = Blocked by callback - file is skipped and marked as infected."]
 pub type clcb_pre_scan = ::std::option::Option<
     unsafe extern "C" fn(
         fd: ::std::os::raw::c_int,
@@ -252,7 +252,7 @@ pub struct cl_cvd {
     pub stime: ::std::os::raw::c_uint,
 }
 pub type cl_fmap_t = cl_fmap;
-#[doc = " @brief Read callback function type.\n\n A callback function pointer type for reading data from a cl_fmap_t that uses\n reads data from a handle interface.\n\n Read 'count' bytes starting at 'offset' into the buffer 'buf'\n\n Thread safety: It is guaranteed that only one callback is executing for a\n specific handle at any time, but there might be multiple callbacks executing\n for different handle at the same time.\n\n @param handle    The handle passed to cl_fmap_open_handle, its meaning is up\n                  to the callback's implementation\n @param buf       A buffer to read data into, must be at least offset + count\n                  bytes in size.\n @param count     The number of bytes to read.\n @param offset    The the offset into buf to read the data to. If successful,\n                  the number of bytes actually read is returned. Upon reading\n                  end-of-file, zero is returned. Otherwise, a -1 is returned\n                  and the global variable errno is set to indicate the error."]
+#[doc = " @brief Read callback function type.\n\n A callback function pointer type for reading data from a cl_fmap_t that uses\n reads data from a handle interface.\n\n Read 'count' bytes starting at 'offset' into the buffer 'buf'\n\n Thread safety: It is guaranteed that only one callback is executing for a\n specific handle at any time, but there might be multiple callbacks executing\n for different handle at the same time.\n\n @param handle    The handle passed to cl_fmap_open_handle, its meaning is up\n                  to the callback's implementation\n @param buf       A buffer to read data into, must be at least offset + count\n                  bytes in size.\n @param count     The number of bytes to read.\n @param offset    The offset into buf to read the data to. If successful,\n                  the number of bytes actually read is returned. Upon reading\n                  end-of-file, zero is returned. Otherwise, a -1 is returned\n                  and the global variable errno is set to indicate the error."]
 pub type clcb_pread = ::std::option::Option<
     unsafe extern "C" fn(
         handle: *mut ::std::os::raw::c_void,
diff --git a/libclammspack/ChangeLog b/libclammspack/ChangeLog
index 136b7e925b..594d1b10ea 100644
--- a/libclammspack/ChangeLog
+++ b/libclammspack/ChangeLog
@@ -162,7 +162,7 @@
 	returning NULL in a custom mspack_system.alloc() implementation.
 
 	However, it would be good to validate chunk size further. With no
-	offical specification, only empirical data is available. All files
+	official specification, only empirical data is available. All files
 	created by hhc.exe have a chunk size of 4096 bytes, and this is
 	matched by all the files I've found in the wild, except for one
 	which has a chunk size of 8192 bytes, which was created by someone
diff --git a/libclammspack/mspack/cabd.c b/libclammspack/mspack/cabd.c
index 780d69e8ec..a13008e3ea 100644
--- a/libclammspack/mspack/cabd.c
+++ b/libclammspack/mspack/cabd.c
@@ -393,7 +393,7 @@ static int cabd_read_headers(struct mspack_system *sys,
     cab->block_resv       = 0;
   }
 
-  /* read name and info of preceeding cabinet in set, if present */
+  /* read name and info of preceding cabinet in set, if present */
   if (cab->base.flags & cfheadPREV_CABINET) {
     cab->base.prevname = cabd_read_string(sys, fh, 0, &err);
     if (err) return err;
@@ -713,7 +713,7 @@ static int cabd_find(struct mscab_decompressor_p *self, unsigned char *buf,
       case 17: foffset_u32 |= *p++ << 8;  state++; break;
       case 18: foffset_u32 |= *p++ << 16; state++; break;
       case 19: foffset_u32 |= *p++ << 24;
-        /* now we have recieved 20 bytes of potential cab header. work out
+        /* now we have received 20 bytes of potential cab header. work out
          * the offset in the file of this potential cabinet */
         caboff = offset + (p - &buf[0]) - 20;
 
diff --git a/libclammspack/mspack/chmd.c b/libclammspack/mspack/chmd.c
index 061dca1594..79b50b5600 100644
--- a/libclammspack/mspack/chmd.c
+++ b/libclammspack/mspack/chmd.c
@@ -145,7 +145,7 @@ static struct mschmd_header *chmd_fast_open(struct mschm_decompressor *base,
  ***************************************
  * the real implementation of chmd_open() and chmd_fast_open(). It simply
  * passes the "entire" parameter to chmd_read_headers(), which will then
- * either read all headers, or a bare mininum.
+ * either read all headers, or a bare minimum.
  */
 static struct mschmd_header *chmd_real_open(struct mschm_decompressor *base,
                                             const char *filename, int entire)
@@ -1027,7 +1027,7 @@ static int chmd_extract(struct mschm_decompressor *base,
      * file between now and the next section 1 file extracted */
     self->d->inoffset = sys->tell(self->d->infh);
 
-    /* if an LZX error occured, the LZX decompressor is now useless */
+    /* if an LZX error occurred, the LZX decompressor is now useless */
     if (self->error) {
       if (self->d->state) lzxd_free(self->d->state);
       self->d->state = NULL;
diff --git a/libclammspack/mspack/crc32.c b/libclammspack/mspack/crc32.c
index 751a47f3eb..4b649d1f98 100644
--- a/libclammspack/mspack/crc32.c
+++ b/libclammspack/mspack/crc32.c
@@ -19,7 +19,7 @@
  *  order from highest-order term to lowest-order term.  UARTs transmit
  *  characters in order from LSB to MSB.  By storing the CRC this way
  *  we hand it to the UART in the order low-byte to high-byte; the UART
- *  sends each low-bit to hight-bit; and the result is transmission bit
+ *  sends each low-bit to high-bit; and the result is transmission bit
  *  by bit from highest- to lowest-order term without requiring any bit
  *  shuffling on our part.  Reception works similarly
  *
diff --git a/libclammspack/mspack/mspack.h b/libclammspack/mspack/mspack.h
index 3e99624463..0b2e39f8af 100644
--- a/libclammspack/mspack/mspack.h
+++ b/libclammspack/mspack/mspack.h
@@ -116,8 +116,8 @@
  * - #MSPACK_ERR_DATAFORMAT indicates that the file being used or read
  *   is corrupt.
  * - #MSPACK_ERR_CHECKSUM indicates that a data checksum has failed.
- * - #MSPACK_ERR_CRUNCH indicates an error occured during compression.
- * - #MSPACK_ERR_DECRUNCH indicates an error occured during decompression.
+ * - #MSPACK_ERR_CRUNCH indicates an error occurred during compression.
+ * - #MSPACK_ERR_DECRUNCH indicates an error occurred during decompression.
  *
  * \section threading Multi-threading
  *
@@ -886,7 +886,7 @@ struct mscabd_file {
    * The following attributes are defined:
    * - #MSCAB_ATTRIB_RDONLY indicates the file is write protected.
    * - #MSCAB_ATTRIB_HIDDEN indicates the file is hidden.
-   * - #MSCAB_ATTRIB_SYSTEM indicates the file is a operating system file.
+   * - #MSCAB_ATTRIB_SYSTEM indicates the file is an operating system file.
    * - #MSCAB_ATTRIB_ARCH indicates the file is "archived".
    * - #MSCAB_ATTRIB_EXEC indicates the file is an executable program.
    * - #MSCAB_ATTRIB_UTF_NAME indicates the filename is in UTF8 format rather
@@ -962,7 +962,7 @@ struct mscab_decompressor {
    * and a mscabd_cabinet structure will be returned, with a full list of
    * folders and files.
    *
-   * In the case of an error occuring, NULL is returned and the error code
+   * In the case of an error occurring, NULL is returned and the error code
    * is available from last_error().
    *
    * The filename pointer should be considered "in use" until close() is
@@ -1024,7 +1024,7 @@ struct mscab_decompressor {
    * this method. Any further cabinets found will be chained in a list
    * using the mscabd_cabinet::next field.
    *
-   * In the case of an error occuring anywhere other than the simulated
+   * In the case of an error occurring anywhere other than the simulated
    * open(), NULL is returned and the error code is available from
    * last_error().
    *
@@ -1070,7 +1070,7 @@ struct mscab_decompressor {
    *   filename is mscabd_cabinet::nextname
    *
    * If the cabinets do not match, an error code will be returned. Neither
-   * cabinet has been altered, and both should be closed seperately.
+   * cabinet has been altered, and both should be closed separately.
    *
    * Files and folders in a cabinet set are a single entity. All cabinets
    * in a set use the same file list, which is updated as cabinets in the
@@ -1582,7 +1582,7 @@ struct mschm_decompressor {
    * and a mschmd_header structure will be returned, with a full list of
    * files.
    *
-   * In the case of an error occuring, NULL is returned and the error code
+   * In the case of an error occurring, NULL is returned and the error code
    * is available from last_error().
    *
    * The filename pointer should be considered "in use" until close() is
@@ -1662,7 +1662,7 @@ struct mschm_decompressor {
    * files details will be automatically read.  The fast_find() method
    * must be used to obtain file details.
    *
-   * In the case of an error occuring, NULL is returned and the error code
+   * In the case of an error occurring, NULL is returned and the error code
    * is available from last_error().
    *
    * The filename pointer should be considered "in use" until close() is
@@ -1711,7 +1711,7 @@ struct mschm_decompressor {
    *                  instance being called
    * @param  chm      the CHM helpfile to search for the file
    * @param  filename the filename of the file to search for
-   * @param  f_ptr    a pointer to a caller-provded mschmd_file structure
+   * @param  f_ptr    a pointer to a caller-provided mschmd_file structure
    * @param  f_size   <tt>sizeof(struct mschmd_file)</tt>
    * @return an error code, or MSPACK_ERR_OK if successful
    * @see open(), close(), fast_find(), extract()
@@ -1880,7 +1880,7 @@ struct msszdd_decompressor {
    * If the file opened is a valid SZDD file, all headers will be read and
    * a msszddd_header structure will be returned.
    *
-   * In the case of an error occuring, NULL is returned and the error code
+   * In the case of an error occurring, NULL is returned and the error code
    * is available from last_error().
    *
    * The filename pointer should be considered "in use" until close() is
@@ -2160,7 +2160,7 @@ struct mskwaj_decompressor {
    * If the file opened is a valid KWAJ file, all headers will be read and
    * a mskwajd_header structure will be returned.
    *
-   * In the case of an error occuring, NULL is returned and the error code
+   * In the case of an error occurring, NULL is returned and the error code
    * is available from last_error().
    *
    * The filename pointer should be considered "in use" until close() is
diff --git a/libclammspack/test/cabd_test.c b/libclammspack/test/cabd_test.c
index 23cc2c94ba..d28f90c39d 100644
--- a/libclammspack/test/cabd_test.c
+++ b/libclammspack/test/cabd_test.c
@@ -391,7 +391,7 @@ void cabd_extract_test_02() {
 
     /* the first file in this cabinet belongs to a valid folder. The
      * second belongs to an invalid folder. Unpacking files 1, 2, 1
-     * caused cabd.c to try and free the invalid folder state left by
+     * caused cabd.c to try to free the invalid folder state left by
      * extracting from folder 2, which caused a jump to NULL / segfault
      */
     TEST(cabd = mspack_create_cab_decompressor(&read_files_write_md5));
diff --git a/libclammspack/test/chmd_test.c b/libclammspack/test/chmd_test.c
index 9ab6f24842..8677256b33 100644
--- a/libclammspack/test/chmd_test.c
+++ b/libclammspack/test/chmd_test.c
@@ -143,7 +143,7 @@ void chmd_extract_test_01() {
     struct mspack_system xor_files = read_files_write_md5;
     xor_files.read = &read_xor;
 
-    /* source file is obfuscafted with XOR because clamav calls it
+    /* source file is obfuscated with XOR because clamav calls it
      * "BC.Legacy.Exploit.CVE_2012_1458-1" and blocks distributing libmspack
      * https://github.com/kyz/libmspack/issues/17#issuecomment-411583917 */
     TEST(chmd = mspack_create_chm_decompressor(&xor_files));
diff --git a/libclamunrar/arcread.cpp b/libclamunrar/arcread.cpp
index 6b7dd98ee6..aef8d4095f 100644
--- a/libclamunrar/arcread.cpp
+++ b/libclamunrar/arcread.cpp
@@ -1212,7 +1212,7 @@ void Archive::ProcessExtra50(RawRead *Raw,size_t ExtraSize,const BaseBlock *bb)
               FieldSize++;
 
             // We cannot allocate too much memory here, because above
-            // we check FieldSize againt Raw size and we control that Raw size
+            // we check FieldSize against Raw size and we control that Raw size
             // is sensible when reading headers.
             hd->SubData.Alloc((size_t)FieldSize);
             Raw->GetB(hd->SubData.Addr(0),(size_t)FieldSize);
@@ -1394,7 +1394,7 @@ void Archive::ConvertFileHeader(FileHeader *hd)
       hd->FileAttr=0x20;
 
 #ifdef _WIN_ALL
-  if (hd->HSType==HSYS_UNIX) // Convert Unix, OS X and Android decomposed chracters to Windows precomposed.
+  if (hd->HSType==HSYS_UNIX) // Convert Unix, OS X and Android decomposed characters to Windows precomposed.
     ConvertToPrecomposed(hd->FileName,ASIZE(hd->FileName));
 #endif
 
diff --git a/libclamunrar/crc.hpp b/libclamunrar/crc.hpp
index f573454441..ff2d73388d 100644
--- a/libclamunrar/crc.hpp
+++ b/libclamunrar/crc.hpp
@@ -1,7 +1,7 @@
 #ifndef _RAR_CRC_
 #define _RAR_CRC_
 
-// This function is only to intialize external CRC tables. We do not need to
+// This function is only to initialize external CRC tables. We do not need to
 // call it before calculating CRC32.
 void InitCRC32(uint *CRCTab);
 
diff --git a/libclamunrar/crypt5.cpp b/libclamunrar/crypt5.cpp
index bb9b2bab2c..071cca9ba4 100644
--- a/libclamunrar/crypt5.cpp
+++ b/libclamunrar/crypt5.cpp
@@ -90,7 +90,7 @@ void pbkdf2(const byte *Pwd, size_t PwdLength,
   byte SaltData[MaxSalt+4];
   memcpy(SaltData, Salt, Min(SaltLength,MaxSalt));
 
-  SaltData[SaltLength + 0] = 0; // Block index appened to salt.
+  SaltData[SaltLength + 0] = 0; // Block index appended to salt.
   SaltData[SaltLength + 1] = 0; //
   SaltData[SaltLength + 2] = 0; // Since we do not request the key width
   SaltData[SaltLength + 3] = 1; // exceeding HMAC width, it is always 1.
diff --git a/libclamunrar/getbits.hpp b/libclamunrar/getbits.hpp
index 00acbea945..7183d63cce 100644
--- a/libclamunrar/getbits.hpp
+++ b/libclamunrar/getbits.hpp
@@ -6,7 +6,7 @@ class BitInput
   public:
     enum BufferSize {MAX_SIZE=0x8000}; // Size of input buffer.
 
-    int InAddr; // Curent byte position in the buffer.
+    int InAddr; // Current byte position in the buffer.
     int InBit;  // Current bit position in the current byte.
 
     bool ExternalBuffer;
diff --git a/libclamunrar/pathfn.cpp b/libclamunrar/pathfn.cpp
index e959e9d65b..742b895eeb 100644
--- a/libclamunrar/pathfn.cpp
+++ b/libclamunrar/pathfn.cpp
@@ -1007,7 +1007,7 @@ bool GetWinLongPath(const wchar *Src,wchar *Dest,size_t MaxSize)
 }
 
 
-// Convert Unix, OS X and Android decomposed chracters to Windows precomposed.
+// Convert Unix, OS X and Android decomposed characters to Windows precomposed.
 void ConvertToPrecomposed(wchar *Name,size_t NameSize)
 {
   wchar FileName[NM];
diff --git a/libclamunrar/qopen.cpp b/libclamunrar/qopen.cpp
index d906d06bd3..53b086d258 100644
--- a/libclamunrar/qopen.cpp
+++ b/libclamunrar/qopen.cpp
@@ -63,7 +63,7 @@ void QuickOpen::Load(uint64 BlockPos)
 {
   if (!Loaded)
   {
-    // If loading for the first time, perform additional intialization.
+    // If loading for the first time, perform additional initialization.
     SeekPos=Arc->Tell();
     UnsyncSeekPos=false;
 
diff --git a/libclamunrar/rs.cpp b/libclamunrar/rs.cpp
index 10ccc6d7e4..a58649898a 100644
--- a/libclamunrar/rs.cpp
+++ b/libclamunrar/rs.cpp
@@ -50,7 +50,7 @@ void RSCoder::pnInit()
     p1[0]=gfExp[I];
     p1[1]=1; // Set p1 polynomial to x+a^i.
 
-    // Multiply the already calucated part of g(x) to next (x+a^i).
+    // Multiply the already calculated part of g(x) to next (x+a^i).
     pnMult(p1,p2,GXPol);
 
     // p2=g(x).
diff --git a/libclamunrar/rs16.hpp b/libclamunrar/rs16.hpp
index b67a7ca86e..4f88ab7d4e 100644
--- a/libclamunrar/rs16.hpp
+++ b/libclamunrar/rs16.hpp
@@ -5,7 +5,7 @@ class RSCoder16
 {
   private:
     static const uint gfSize=65535;   // Galois field size.
-    void gfInit();                    // Galois field inititalization.
+    void gfInit();                    // Galois field initialization.
     inline uint gfAdd(uint a,uint b); // Addition in Galois field. 
     inline uint gfMul(uint a,uint b); // Multiplication in Galois field. 
     inline uint gfInv(uint a);        // Inverse element in Galois field.
diff --git a/libclamunrar/scantree.cpp b/libclamunrar/scantree.cpp
index dbaf1e4273..fb643e3363 100644
--- a/libclamunrar/scantree.cpp
+++ b/libclamunrar/scantree.cpp
@@ -270,7 +270,7 @@ SCAN_CODE ScanTree::FindProc(FindData *FD)
     // SearchAll means that we'll use "*" mask for search, so we'll find
     // subdirectories and will be able to recurse into them.
     // We do not use "*" for directories at any level or for files
-    // at top level in recursion mode. We always comrpess the entire directory
+    // at top level in recursion mode. We always compress the entire directory
     // if folder wildcard is specified.
     bool SearchAll=!IsDir && (Depth>0 || Recurse==RECURSE_ALWAYS ||
                    FolderWildcards && Recurse!=RECURSE_DISABLE || 
diff --git a/libclamunrar/threadpool.cpp b/libclamunrar/threadpool.cpp
index 8c63a8bd75..48e86d8617 100644
--- a/libclamunrar/threadpool.cpp
+++ b/libclamunrar/threadpool.cpp
@@ -58,7 +58,7 @@ ThreadPool::~ThreadPool()
   ReleaseSemaphore(QueuedTasksCnt,ASIZE(TaskQueue),NULL);
 #elif defined(_UNIX)
   // Threads still can access QueuedTasksCnt for a short time after WaitDone(),
-  // so lock is required. We would occassionally hang without it.
+  // so lock is required. We would occasionally hang without it.
   pthread_mutex_lock(&QueuedTasksCntMutex);
   QueuedTasksCnt+=ASIZE(TaskQueue);
   pthread_mutex_unlock(&QueuedTasksCntMutex);
diff --git a/libclamunrar/unicode.cpp b/libclamunrar/unicode.cpp
index 73b09bb220..70bfa82adc 100644
--- a/libclamunrar/unicode.cpp
+++ b/libclamunrar/unicode.cpp
@@ -139,7 +139,7 @@ bool WideToCharMap(const wchar *Src,char *Dest,size_t DestSize,bool &Success)
     return false;
 
   // Seems to be that wcrtomb in some memory analyzing libraries
-  // can produce uninitilized output while reporting success on garbage input.
+  // can produce uninitialized output while reporting success on garbage input.
   // So we clean the destination to calm analyzers.
   memset(Dest,0,DestSize);
   
diff --git a/libclamunrar/unpack.cpp b/libclamunrar/unpack.cpp
index f82bd4753b..fbfe776b0a 100644
--- a/libclamunrar/unpack.cpp
+++ b/libclamunrar/unpack.cpp
@@ -91,7 +91,7 @@ void Unpack::Init(size_t WinSize,bool Solid)
   if ((WinSize>>16)>0x10000) // Window size must not exceed 4 GB.
     return;
 
-  // Unrar does not support window size greather than 1GB at this time.
+  // Unrar does not support window size greater than 1GB at this time.
   // Any request for a window larger than 1GB should be ignored.
   const size_t MaxAllocSize=0x40000000;
   if (WinSize>MaxAllocSize)
diff --git a/libclamunrar/unpack50.cpp b/libclamunrar/unpack50.cpp
index e040907c27..2a081498b9 100644
--- a/libclamunrar/unpack50.cpp
+++ b/libclamunrar/unpack50.cpp
@@ -641,7 +641,7 @@ bool Unpack::ReadTables(BitInput &Inp,UnpackBlockHeader &Header,UnpackBlockTable
         {
           // We cannot have "repeat previous" code at the first position.
           // Multiple such codes would shift Inp position without changing I,
-          // which can lead to reading beyond of Inp boundary in mutithreading
+          // which can lead to reading beyond of Inp boundary in multithreading
           // mode, where Inp.ExternalBuffer disables bounds check and we just
           // reserve a lot of buffer space to not need such check normally.
           return false;
diff --git a/libfreshclam/libfreshclam.c b/libfreshclam/libfreshclam.c
index c3a560e04b..6ea2b1e2b2 100644
--- a/libfreshclam/libfreshclam.c
+++ b/libfreshclam/libfreshclam.c
@@ -85,11 +85,11 @@ const char *fc_strerror(fc_error_t fcerror)
         case FC_UPTODATE:
             return "Up-to-date";
         case FC_EINIT:
-            return "Failed to initalize";
+            return "Failed to initialize";
         case FC_EDIRECTORY:
-            return "Invalid, nonexistant, or inaccessible directory";
+            return "Invalid, nonexistent, or inaccessible directory";
         case FC_EFILE:
-            return "Invalid, nonexistant, or inaccessible file";
+            return "Invalid, nonexistent, or inaccessible file";
         case FC_ECONNECTION:
             return "Connection failed";
         case FC_EEMPTYFILE:
@@ -139,7 +139,7 @@ fc_error_t fc_initialize(fc_config *fcConfig)
                     Please submit an issue to https://github.com/Cisco-Talos/clamav");
     }
 
-    /* Initilize libcurl */
+    /* Initialize libcurl */
     curl_global_init(CURL_GLOBAL_ALL);
 
     /* Initialize mprintf options */
diff --git a/libfreshclam/libfreshclam.h b/libfreshclam/libfreshclam.h
index 288221d238..7270e24401 100644
--- a/libfreshclam/libfreshclam.h
+++ b/libfreshclam/libfreshclam.h
@@ -124,9 +124,9 @@ void fc_cleanup(void);
  * Will not touch files other than CLD and CVD files.
  *
  * @param databaseList  List of official databases to keep.
- * @param nDatabases    Number of databses in list.
+ * @param nDatabases    Number of databases in list.
  * @return fc_error_t   FC_SUCCESS if success.
- * @return fc_error_t   FC_EDBDIRACCESS if database access issue occured.
+ * @return fc_error_t   FC_EDBDIRACCESS if database access issue occurred.
  * @return fc_error_t   FC_EARG if invalid arguments.
  */
 fc_error_t fc_prune_database_directory(
diff --git a/libfreshclam/libfreshclam_internal.c b/libfreshclam/libfreshclam_internal.c
index ce3c7ecde8..c80887e7ad 100644
--- a/libfreshclam/libfreshclam_internal.c
+++ b/libfreshclam/libfreshclam_internal.c
@@ -815,7 +815,7 @@ static size_t WriteFileCallback(void *contents, size_t size, size_t nmemb, void
  * @param[out] cvd          CVD header of newest available CVD, if FC_SUCCESS
  * @return fc_error_t       FC_SUCCESS if CVD header obtained.
  * @return fc_error_t       FC_UPTODATE if received 304 in response to ifModifiedSince date.
- * @return fc_error_t       Another error code if failure occured.
+ * @return fc_error_t       Another error code if failure occurred.
  */
 static fc_error_t remote_cvdhead(
     const char *cvdfile,
diff --git a/sigtool/sigtool.c b/sigtool/sigtool.c
index 4c8e346927..a4a1e5c4a4 100644
--- a/sigtool/sigtool.c
+++ b/sigtool/sigtool.c
@@ -1815,7 +1815,7 @@ static int vbadump(const struct optstruct *opts)
 
     const char *filename = NULL;
 
-    /* Initalize scan options struct */
+    /* Initialize scan options struct */
     memset(&options, 0, sizeof(struct cl_scan_options));
 
     if ((ret = cl_init(CL_INIT_DEFAULT))) {
diff --git a/unit_tests/check_clamav.c b/unit_tests/check_clamav.c
index 61ecd8ad37..9d913bf030 100644
--- a/unit_tests/check_clamav.c
+++ b/unit_tests/check_clamav.c
@@ -856,7 +856,7 @@ START_TEST(test_fmap_duplicate)
     dup_map = NULL;
 
     /*
-     * Test duplicate of map omiting the last 2 bytes
+     * Test duplicate of map omitting the last 2 bytes
      */
     cli_dbgmsg("duplicating map with shorter len\n");
     dup_map = fmap_duplicate(map, 0, map->len - 2, "short duplicate");
@@ -870,7 +870,7 @@ START_TEST(test_fmap_duplicate)
     ck_assert(0 == memcmp(map_data, tmp, 4));
 
     /*
-     * Test duplicate of the duplicate omiting the last 2 bytes again (so just the first 2 bytes)
+     * Test duplicate of the duplicate omitting the last 2 bytes again (so just the first 2 bytes)
      */
     cli_dbgmsg("duplicating dup_map with shorter len\n");
     dup_dup_map = fmap_duplicate(dup_map, 0, dup_map->len - 2, "double short duplicate");
@@ -905,7 +905,7 @@ START_TEST(test_fmap_duplicate)
     ck_assert(0 == memcmp(map_data + 2, tmp, 4));
 
     /*
-     * Test duplicate of the duplicate omiting the last 2 bytes again (so just the middle 2 bytes)
+     * Test duplicate of the duplicate omitting the last 2 bytes again (so just the middle 2 bytes)
      */
     cli_dbgmsg("duplicating dup_map with shorter len\n");
     dup_dup_map = fmap_duplicate(dup_map, 0, dup_map->len - 2, "offset short duplicate");
@@ -1206,12 +1206,12 @@ START_TEST(test_fmap_assorted_api)
     ck_assert_msg(fmap_dump_fd != -1, "fmap_dump_fd failed");
     cli_dbgmsg("dumped map to %s\n", fmap_dump_filepath);
 
-    fd_based_map = fmap(fmap_dump_fd, 0, 0, NULL); // using fmap() instead of cl_fmap_open_handle() because I don't want to have to stat the the file to figure out the len. fmap() does that for us.
+    fd_based_map = fmap(fmap_dump_fd, 0, 0, NULL); // using fmap() instead of cl_fmap_open_handle() because I don't want to have to stat the file to figure out the len. fmap() does that for us.
     ck_assert_msg(!!fd_based_map, "cl_fmap_open_handle failed");
     cli_dbgmsg("created fmap from file descriptor\n");
 
     /*
-     * Test those same things things on an fmap created with an fd that is a dumped copy of the original map.
+     * Test those same things on an fmap created with an fd that is a dumped copy of the original map.
      */
     fmap_api_tests(fd_based_map, FMAP_TEST_STRING, sizeof(FMAP_TEST_STRING), "handle map");
 
@@ -1230,7 +1230,7 @@ START_TEST(test_fmap_assorted_api)
     ck_assert_msg(dup_map->real_len == sizeof(FMAP_TEST_STRING), "%zu != %zu", dup_map->real_len, sizeof(FMAP_TEST_STRING));
 
     /*
-     * Test those same things things on an fmap created with an fd that is a dumped copy of the original map.
+     * Test those same things on an fmap created with an fd that is a dumped copy of the original map.
      */
     fmap_api_tests(dup_map, FMAP_TEST_STRING_PART_2, sizeof(FMAP_TEST_STRING_PART_2), "nested mem map");
 
@@ -1254,7 +1254,7 @@ START_TEST(test_fmap_assorted_api)
     ck_assert_msg(dup_map->real_len == sizeof(FMAP_TEST_STRING), "%zu != %zu", dup_map->real_len, sizeof(FMAP_TEST_STRING));
 
     /*
-     * Test those same things things on an fmap created with an fd that is a dumped copy of the original map.
+     * Test those same things on an fmap created with an fd that is a dumped copy of the original map.
      */
     fmap_api_tests(dup_map, FMAP_TEST_STRING_PART_2, sizeof(FMAP_TEST_STRING_PART_2), "nested handle map");
 
@@ -1288,12 +1288,12 @@ START_TEST(test_fmap_assorted_api)
     /*
      * Let's make an fmap of the dumped nested map, and run the tests to verify that everything is as expected.
      */
-    fd_based_dup_map = fmap(dup_fmap_dump_fd, 0, 0, NULL); // using fmap() instead of cl_fmap_open_handle() because I don't want to have to stat the the file to figure out the len. fmap() does that for us.
+    fd_based_dup_map = fmap(dup_fmap_dump_fd, 0, 0, NULL); // using fmap() instead of cl_fmap_open_handle() because I don't want to have to stat the file to figure out the len. fmap() does that for us.
     ck_assert_msg(!!fd_based_dup_map, "cl_fmap_open_handle failed");
     cli_dbgmsg("created fmap from file descriptor\n");
 
     /*
-     * Test those same things things on an fmap created with an fd that is a dumped copy of the original map.
+     * Test those same things on an fmap created with an fd that is a dumped copy of the original map.
      */
     fmap_api_tests(fd_based_dup_map, FMAP_TEST_STRING_PART_2, sizeof(FMAP_TEST_STRING_PART_2), "dumped nested handle map");
 
diff --git a/unit_tests/clamd_test.py b/unit_tests/clamd_test.py
index 5791efc44d..9e0fe9ca0a 100644
--- a/unit_tests/clamd_test.py
+++ b/unit_tests/clamd_test.py
@@ -291,9 +291,9 @@ def test_clamd_01_ping_pong(self):
     def test_clamd_02_clamdscan_version(self):
         '''
         Verify that clamdscan --version returns the expected version #
-        Explanation: clamdscan --version will query clamd for it's version
+        Explanation: clamdscan --version will query clamd for its version
           and print out clamd's version.  If it can't connect to clamd, it'll
-          throw and error saying as much and then report it's own version.
+          throw and error saying as much and then report its own version.
 
         In this test, we want to check clamd's version through clamdscan.
         '''
@@ -305,7 +305,7 @@ def test_clamd_02_clamdscan_version(self):
         assert poll == None  # subprocess is alive if poll() returns None
 
         # First we'll ping-pong to make sure clamd is up
-        # If clamd isn't up before the version test, clamdscan will return it's
+        # If clamd isn't up before the version test, clamdscan will return its
         # own version, which isn't really the point of the test.
         output = self.execute_command('{clamdscan} --ping 5 -c {clamd_config}'.format(
             clamdscan=TC.clamdscan, clamd_config=TC.clamd_config))
diff --git a/unit_tests/freshclam_test.py b/unit_tests/freshclam_test.py
index 849a9332f1..0eeb67fa0b 100644
--- a/unit_tests/freshclam_test.py
+++ b/unit_tests/freshclam_test.py
@@ -501,7 +501,7 @@ def test_freshclam_07_cdiff_partial_minus_2(self):
 
         # using these CDIFFs
         shutil.copy(str(TC.path_source / 'unit_tests' / 'input' / 'freshclam_testfiles' /'test-4.cdiff'), str(TC.path_www))
-        # shutil.copy(str(TC.path_source / 'unit_tests' / 'input' / 'freshclam_testfiles' /'test-5.cdiff'), str(TC.path_www))  <--- dont' give them the second to last, either!
+        # shutil.copy(str(TC.path_source / 'unit_tests' / 'input' / 'freshclam_testfiles' /'test-5.cdiff'), str(TC.path_www))  <--- don't give them the second to last, either!
         # shutil.copy(str(TC.path_source / 'unit_tests' / 'input' / 'freshclam_testfiles' /'test-6.cdiff'), str(TC.path_www))  <--- don't give them the last CDIFF
 
         handler = partial(WebServerHandler_WWW, TC.path_www)
diff --git a/win32/compat/glob.c b/win32/compat/glob.c
index 39337be9ba..41c5db0b80 100644
--- a/win32/compat/glob.c
+++ b/win32/compat/glob.c
@@ -35,7 +35,7 @@
 
     The other suggested approach is to override the crt-builtin "_setargv" with a
     custom routine to manually process the command line args before they are fed to main.
-    Now this is even funnier: the hook is indeed called bedore main(), but then its work
+    Now this is even funnier: the hook is indeed called before main(), but then its work
     is discarded and replaced with that of the default parser... how useful!
     After some debugging the problem turned out to be in the design. The flow is like:
     pre_c_init -> _setargv

From 42f76bab3a33bc2c72bf6e3461ea37161b514457 Mon Sep 17 00:00:00 2001
From: RainRat <rainrat78@yahoo.ca>
Date: Fri, 17 Nov 2023 14:01:26 -0800
Subject: [PATCH 2/3] Update regex_suffix.c

cli_regex2suffix incorrect memset use
---
 libclamav/regex_suffix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libclamav/regex_suffix.c b/libclamav/regex_suffix.c
index 6161413467..a089df47c9 100644
--- a/libclamav/regex_suffix.c
+++ b/libclamav/regex_suffix.c
@@ -511,7 +511,7 @@ cl_error_t cli_regex2suffix(const char *pattern, regex_t *preg, suffix_callback
         goto done;
     }
     memset(&buf, 0, sizeof(buf));
-    memset(&root_node, 0, sizeof(buf));
+    memset(&root_node, 0, sizeof(root_node));
     n->parent = &root_node;
 
     rc = build_suffixtree_descend(n, &buf, cb, cbdata, &regex);

From 0478474135020f913a6d558c3e9cfc80ab110992 Mon Sep 17 00:00:00 2001
From: RainRat <rainrat78@yahoo.ca>
Date: Fri, 17 Nov 2023 14:03:59 -0800
Subject: [PATCH 3/3] Update regex_suffix.c

Undo functional change. I'll do it in a separate pull
---
 libclamav/regex_suffix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libclamav/regex_suffix.c b/libclamav/regex_suffix.c
index a089df47c9..6161413467 100644
--- a/libclamav/regex_suffix.c
+++ b/libclamav/regex_suffix.c
@@ -511,7 +511,7 @@ cl_error_t cli_regex2suffix(const char *pattern, regex_t *preg, suffix_callback
         goto done;
     }
     memset(&buf, 0, sizeof(buf));
-    memset(&root_node, 0, sizeof(root_node));
+    memset(&root_node, 0, sizeof(buf));
     n->parent = &root_node;
 
     rc = build_suffixtree_descend(n, &buf, cb, cbdata, &regex);