diff --git a/NEWS.txt b/NEWS.txt
index 0a8779eea08756fe02a96347693cbbdc11c94411..6efa01f1eb4574888079e785b85808bc6b273c61 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -274,7 +274,7 @@ image was being scanned for parent directory information.
- 2982965: fs_attr length bug fix.
- 2988619: mmls -B display error.
- 2988330: ntfs SII cluster size increment bug
-- 2991487: Zeroed content in NTFS files that were not fully intialized.
+- 2991487: Zeroed content in NTFS files that were not fully initialized.
- 2993767: Slow FAT listings of OrphanFiles because hunt for parent
directory resulted in many searches for OrphanFiles. Added cache
of OrphanFiles.
@@ -575,7 +575,7 @@ Patch by Rob Joyce.
10/31/07: Update: Finished upgrade to fatfs_file_walk_off so that
walking can start at a specific offset. Also finished upgrade that
-caches FAT run list to make the fatfs_file_walk_off more effecient.
+caches FAT run list to make the fatfs_file_walk_off more efficient.
11/14/07: Update: Fixed few places where off_t was being used
instead of OFF_T. Reported by GiHan Kim.
@@ -734,7 +734,7 @@ UFS group descriptors. Reported by Simson Garfinkel.
9/6/06: Update: Changed TCHAR and _T to TSK_TCHAR and _TSK_T to avoid
conflicts with other libraries.
-9/18/06: Update: Added tsk_list_* functions and strutures.
+9/18/06: Update: Added tsk_list_* functions and structures.
9/18/06: Update: Added checks for recursive FAT directories.
@@ -1655,7 +1655,7 @@ data units instead of size in bytes (suggestion by Harald Katzer).
---------------- VERSION 1.66 --------------
09/02/03: Bug Fix: Would not compile under OpenBSD 3 because fs_tools.h
- & mm_tools was missing a defined statment (reported by Randy - m0th_man)
+ & mm_tools was missing a defined statement (reported by Randy - m0th_man)
NOTE: Bugs now will have an entry into the Source Forge bug tracking
sytem.
10/13/03: Bug Fix: buffer was not being cleared between uses and length
@@ -1727,7 +1727,7 @@ NOTE: Bugs now will have an entry into the Source Forge bug tracking
fragments in the last group that were larger than the maximum
fragment
04/11/03: Bug Fix: 'ffs' allows the image to not be a multiple of the
- block size. A read error occured when it tried to read the last
+ block size. A read error occurred when it tried to read the last
fragments since a whole block could not be read.
04/15/03: Update: Added debug statements to FAT code.
04/26/03: Update: Added verbose statements to FAT code
@@ -1836,7 +1836,7 @@ NOTE: Bugs now will have an entry into the Source Forge bug tracking
09/26/02: Update: Added create time for NTFS / STANDARD_INFO to
istat output.
09/26/02: Update: Changed the method that the NTFS time is converted
- to UNIX time. Should be more effecient.
+ to UNIX time. Should be more efficient.
10/09/02: Update: dcat error changed.
10/02/02: Update: Includes a Beta version of 'sorter'
@@ -1864,7 +1864,7 @@ NOTE: Bugs now will have an entry into the Source Forge bug tracking
values from on-disk buffers
09/19/02: Bug Fix: fixed memory leak in ntfs_load_ver()
09/19/02: Bug Fix: Update sequence errors were displayed because of a
- bug that occured when an MFT entry crossed a run in $MFT. Only occured
+ bug that occurred when an MFT entry crossed a run in $MFT. Only occurred
with 512-byte clusters and an odd number of clusters in a run.
09/19/02: Update: New argument to ils, istat, and fls that allows user to
specify a time skew in seconds of the compromised system. Originated
diff --git a/bindings/java/doxygen/insert_and_update_database.dox b/bindings/java/doxygen/insert_and_update_database.dox
index c98ddc6d359ee8acbaf39b3852a92c31dbfa3ac7..7d4dc47bab5f1926d3807e3a81608373c8e4d504 100644
--- a/bindings/java/doxygen/insert_and_update_database.dox
+++ b/bindings/java/doxygen/insert_and_update_database.dox
@@ -7,14 +7,14 @@ Autopsy currently allows either \ref sqlite_db or \ref postgresql_db as the back
\subsection sqlite_db SQLite
-- Use SQL statments supported by SQLite 3
+- Use SQL statements supported by SQLite 3
- Used for Single-user cases
- Built-in
- No configuration required
- Databases are stored locally
\subsection postgresql_db PostgreSQL
-- Use SQL statments supported by PostgreSQL 9.4
+- Use SQL statements supported by PostgreSQL 9.4
- Used for Multi-user cases
- An accessible instance of PostgreSQL must be running (on a server, or locally)
- Proper configuration to connect to this instance of PostgreSQL required
@@ -35,4 +35,4 @@ private String replaceNulls(String text);
\endcode
<br>
-*/
\ No newline at end of file
+*/
diff --git a/bindings/java/jni/dataModel_SleuthkitJNI.cpp b/bindings/java/jni/dataModel_SleuthkitJNI.cpp
index 5ed1390a50f57317174ee518692d7f85f2b70008..14d57d1ebce4100600919e50116e26ad03da0d34 100644
--- a/bindings/java/jni/dataModel_SleuthkitJNI.cpp
+++ b/bindings/java/jni/dataModel_SleuthkitJNI.cpp
@@ -1086,7 +1086,7 @@ JNIEXPORT void JNICALL
if ( (ret = tskAuto->startAddImage((int) numImgs, imagepaths8,
TSK_IMG_TYPE_DETECT, 0, device_id)) != 0) {
stringstream msgss;
- msgss << "Errors occured while ingesting image " << std::endl;
+ msgss << "Errors occurred while ingesting image " << std::endl;
vector<TskAuto::error_record> errors = tskAuto->getErrorList();
for (size_t i = 0; i < errors.size(); i++) {
msgss << (i+1) << ". ";
@@ -1190,7 +1190,7 @@ Java_org_sleuthkit_datamodel_SleuthkitJNI_runAddImgNat(JNIEnv * env,
uint8_t ret = 0;
if ((ret = tskAuto->startAddImage(img_info, device_id)) != 0) {
stringstream msgss;
- msgss << "Errors occured while ingesting image " << std::endl;
+ msgss << "Errors occurred while ingesting image " << std::endl;
vector<TskAuto::error_record> errors = tskAuto->getErrorList();
for (size_t i = 0; i < errors.size(); i++) {
msgss << (i + 1) << ". ";
diff --git a/bindings/java/src/org/sleuthkit/datamodel/AbstractFile.java b/bindings/java/src/org/sleuthkit/datamodel/AbstractFile.java
index 8f6eb95c1384c4a6265919cf540df0cd5b75f4ac..b046b5283f1d88127de077a30deb28c8ab3c71d8 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/AbstractFile.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/AbstractFile.java
@@ -575,7 +575,7 @@ public long convertToImgOffset(long fileOffset) throws TskCoreException {
long imgOffset = -1;
for (TskFileRange byteRange : getRanges()) {
- // if fileOffset is within the current byteRange, calcuate the image
+ // if fileOffset is within the current byteRange, calculate the image
// offset and break
long rangeLength = byteRange.getByteLen();
if (fileOffset < rangeLength) {
@@ -1193,7 +1193,7 @@ public short getAttrId() {
/*
* NOTE: previously attrId used to be stored in AbstractFile as (signed)
* short even though it is stored as uint16 in TSK. In extremely rare
- * occurances attrId can be larger than what a signed short can hold
+ * occurrences attrId can be larger than what a signed short can hold
* (2^15). Changes were made to AbstractFile to store attrId as integer.
* Therefore this method has been deprecated. For backwards
* compatibility, attribute ids that are larger than 32K are converted
diff --git a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitJNI.java b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitJNI.java
index a898f27f88742c6df74286628f3defa0b165c28f..e170228e186a29eb139af04bd80200b114dc19fb 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitJNI.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitJNI.java
@@ -552,7 +552,7 @@ public static long openFile(long fsHandle, long fileId, TSK_FS_ATTR_TYPE_ENUM at
/*
* NOTE: previously attrId used to be stored in AbstractFile as (signed)
* short even though it is stored as uint16 in TSK. In extremely rare
- * occurances attrId can be larger than what a signed short can hold
+ * occurrences attrId can be larger than what a signed short can hold
* (2^15). Changes were made to AbstractFile to store attrId as integer.
* However, a depricated method still exists in AbstractFile to get
* attrId as short. In that method we convert attribute ids that are
diff --git a/framework/modules/c_FileTypeSigModule/mingw-libgnurx-2.5.1/regcomp.c b/framework/modules/c_FileTypeSigModule/mingw-libgnurx-2.5.1/regcomp.c
index 78a1218cf866472332c87eb999c257239a692999..2dc7be2b45d8289e56ff6992ebd3e4a468ab8152 100755
--- a/framework/modules/c_FileTypeSigModule/mingw-libgnurx-2.5.1/regcomp.c
+++ b/framework/modules/c_FileTypeSigModule/mingw-libgnurx-2.5.1/regcomp.c
@@ -2034,7 +2034,7 @@ peek_token_bracket (re_token_t *token, re_string_t *input, reg_syntax_t syntax)
/* Entry point of the parser.
Parse the regular expression REGEXP and return the structure tree.
- If an error is occured, ERR is set by error code, and return NULL.
+ If an error is occurred, ERR is set by error code, and return NULL.
This function build the following tree, from regular expression <reg_exp>:
CAT
/ \
@@ -3631,7 +3631,7 @@ build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,
/* This is intended for the expressions like "a{1,3}".
Fetch a number from `input', and return the number.
Return -1, if the number field is empty like "{,1}".
- Return -2, If an error is occured. */
+ Return -2, If an error is occurred. */
static int
fetch_number (re_string_t *input, re_token_t *token, reg_syntax_t syntax)
diff --git a/framework/modules/c_FileTypeSigModule/mingw-libgnurx-2.5.1/regex_internal.c b/framework/modules/c_FileTypeSigModule/mingw-libgnurx-2.5.1/regex_internal.c
index 66154e0ceac3fa09b72d806787f6610562e03cf0..672d7d964dd34d94dc3b4232d975fde5e22a0ef5 100755
--- a/framework/modules/c_FileTypeSigModule/mingw-libgnurx-2.5.1/regex_internal.c
+++ b/framework/modules/c_FileTypeSigModule/mingw-libgnurx-2.5.1/regex_internal.c
@@ -1258,7 +1258,7 @@ re_node_set_merge (re_node_set *dest, const re_node_set *src)
/* Insert the new element ELEM to the re_node_set* SET.
SET should not already have ELEM.
- return -1 if an error is occured, return 1 otherwise. */
+ return -1 if an error is occurred, return 1 otherwise. */
static int
internal_function
@@ -1315,7 +1315,7 @@ re_node_set_insert (re_node_set *set, int elem)
/* Insert the new element ELEM to the re_node_set* SET.
SET should not already have any element greater than or equal to ELEM.
- Return -1 if an error is occured, return 1 otherwise. */
+ Return -1 if an error is occurred, return 1 otherwise. */
static int
internal_function
@@ -1390,7 +1390,7 @@ re_node_set_remove_at (re_node_set *set, int idx)
/* Add the token TOKEN to dfa->nodes, and return the index of the token.
- Or return -1, if an error will be occured. */
+ Or return -1, if an error will be occurred. */
static int
internal_function
diff --git a/framework/modules/c_InterestingFilesModule/InterestingFilesModule.cpp b/framework/modules/c_InterestingFilesModule/InterestingFilesModule.cpp
index 81435a3e34de9a519473715e9135add9f2bbe6af..8ff553b608d9bfc189fe0e45ae9baf4714b4deaa 100644
--- a/framework/modules/c_InterestingFilesModule/InterestingFilesModule.cpp
+++ b/framework/modules/c_InterestingFilesModule/InterestingFilesModule.cpp
@@ -87,7 +87,7 @@ namespace
* Interesting file set definitions are read from a configuration file in
* the initialize() module API and the file queries are executed in the
* report() module API. The following vector stores the search objects
- * between calls to intitialize() and report().
+ * between calls to initialize() and report().
*/
std::vector<InterestingFilesSet> fileSets;
diff --git a/framework/modules/c_SummaryReportModule/NEWS.txt b/framework/modules/c_SummaryReportModule/NEWS.txt
index dfecd82605dc5169a779bbf41a2785b0da30a707..62e236846a55ec2a483bc8d6f182a0c9ac51aec6 100644
--- a/framework/modules/c_SummaryReportModule/NEWS.txt
+++ b/framework/modules/c_SummaryReportModule/NEWS.txt
@@ -2,7 +2,7 @@ Numbers refer to github.net issue #s:
https://github.com/sleuthkit/c_SummaryReportModule/issues
---------------- VERSION 1.0.1 --------------
-- Minor udpate to way that directory paths are internally stored.
+- Minor update to way that directory paths are internally stored.
---------------- VERSION 1.0.0 --------------
New Features:
diff --git a/framework/tsk/framework/extraction/TskAutoImpl.h b/framework/tsk/framework/extraction/TskAutoImpl.h
index 12b47a4aacff6dedf747419cfb13e268790015f4..ba3bf09749a88c8070315b57114b9514ca379286 100755
--- a/framework/tsk/framework/extraction/TskAutoImpl.h
+++ b/framework/tsk/framework/extraction/TskAutoImpl.h
@@ -52,8 +52,8 @@ class TSK_FRAMEWORK_API TSKAutoImpl:public TskAuto {
bool m_vsSeen;
uint64_t m_numFilesSeen;
time_t m_lastUpdateMsg;
- std::queue<Scheduler::task_struct> m_filesToSchedule; ///< Scheduler tasks to submit once transaction is commited
- static const unsigned int m_numOfFilesToQueue = 1000; ///< max number of files to queue up in a transaction before commiting
+ std::queue<Scheduler::task_struct> m_filesToSchedule; ///< Scheduler tasks to submit once transaction is committed
+ static const unsigned int m_numOfFilesToQueue = 1000; ///< max number of files to queue up in a transaction before committing
TSK_RETVAL_ENUM insertFileData(TSK_FS_FILE * fs_file,
const TSK_FS_ATTR *, const char *path, uint64_t & fileId);
diff --git a/framework/tsk/framework/extraction/TskCarvePrepSectorConcat.cpp b/framework/tsk/framework/extraction/TskCarvePrepSectorConcat.cpp
index 471854e959c1f11ee551147ff950b91601bfce5b..9da4ea83a84b040e8a77871e696d2f4980b23793 100644
--- a/framework/tsk/framework/extraction/TskCarvePrepSectorConcat.cpp
+++ b/framework/tsk/framework/extraction/TskCarvePrepSectorConcat.cpp
@@ -257,7 +257,7 @@ void TskCarvePrepSectorConcat::createUnallocSectorsImgFiles(const std::string &o
throw TskException(msg.str());
}
- // Update the output file and sector run offsets to reflect the sucessful read.
+ // Update the output file and sector run offsets to reflect the successful read.
currentFileOffset += sectorsRead * 512;
sectorRunOffset += sectorsRead;
@@ -346,4 +346,4 @@ void TskCarvePrepSectorConcat::closeAndSchedule(const int unallocSectorsImgId, P
{
onUnallocSectorsImgFileCreated(unallocSectorsImgId);
}
-}
\ No newline at end of file
+}
diff --git a/framework/tsk/framework/pipeline/TskModule.h b/framework/tsk/framework/pipeline/TskModule.h
index 972db0d0081d458b35ef76884f03e85d6f5d58d7..b1c8f25dd714f5d843e1b559df8cb867e329c3de 100755
--- a/framework/tsk/framework/pipeline/TskModule.h
+++ b/framework/tsk/framework/pipeline/TskModule.h
@@ -39,7 +39,7 @@ class TSK_FRAMEWORK_API TskModule
/// Standard values that module methods can return.
enum Status
{
- OK = 0, ///< Indicates that the module sucessfully analyzed the data or was able to decide that it should not analyze the data.
+ OK = 0, ///< Indicates that the module successfully analyzed the data or was able to decide that it should not analyze the data.
FAIL, ///< Indicates that the module wanted to perform analysis on the data, but was unable to because of an error.
STOP ///< Indicates that the module wants the pipeline to stop processing.
};
diff --git a/framework/tsk/framework/services/TskImgDBPostgreSQL.cpp b/framework/tsk/framework/services/TskImgDBPostgreSQL.cpp
index 20616faa0ac0a4917f7c95f1d1a16b1122d485eb..55e6f02b0d9c5775a0d0ef8c195c82cc5928966e 100755
--- a/framework/tsk/framework/services/TskImgDBPostgreSQL.cpp
+++ b/framework/tsk/framework/services/TskImgDBPostgreSQL.cpp
@@ -968,7 +968,7 @@ SectorRuns * TskImgDBPostgreSQL::getFreeSectors() const
if (flags & TSK_FS_META_FLAG_UNALLOC)
continue;
- // @@@ We can probably find a more effecient storage method than this...
+ // @@@ We can probably find a more efficient storage method than this...
int error = 0;
for (int64_t i = 0; i < len; i++) {
if (tsk_list_add(&seen[fs_id], addr+i)) {
diff --git a/framework/tsk/framework/services/TskImgDBSqlite.cpp b/framework/tsk/framework/services/TskImgDBSqlite.cpp
index 0f06e7958370cccdec6a8f5445da9e670c02ecdf..3462dff93fee9c70fd029bd397908e0a9261029f 100755
--- a/framework/tsk/framework/services/TskImgDBSqlite.cpp
+++ b/framework/tsk/framework/services/TskImgDBSqlite.cpp
@@ -437,7 +437,7 @@ int TskImgDBSqlite::open()
// We, however, are using this setting as a workaround for database
// corruption issues we have been experiencing when the database is
// updated by multiple concurrent processes.
- // Database corruption was occuring when SQLite determined that the
+ // Database corruption was occurring when SQLite determined that the
// number of database pages in the database was greater than a value
// that it had previously cached.
// This workaround is a crude mechanism to get around that situation.
@@ -1037,7 +1037,7 @@ SectorRuns * TskImgDBSqlite::getFreeSectors() const
if (flags & TSK_FS_META_FLAG_UNALLOC)
continue;
- // @@@ We can probably find a more effecient storage method than this...
+ // @@@ We can probably find a more efficient storage method than this...
int error = 0;
for (int64_t i = 0; i < len; i++) {
if (tsk_list_add(&seen[fs_id], addr+i)) {
diff --git a/release/release-unix.pl b/release/release-unix.pl
index f2e4c941212069764b09a0094a689ed09ea79b71..b06af75a00633e6c8eaf30405826e5eec803ac65 100755
--- a/release/release-unix.pl
+++ b/release/release-unix.pl
@@ -170,7 +170,7 @@ sub update_configver {
close (CONF_OUT);
if ($found != 1) {
- die "$found (instead of 1) occurances of AC_INIT found in configure.ac";
+ die "$found (instead of 1) occurrences of AC_INIT found in configure.ac";
}
unlink ("configure.ac") or die "Error deleting configure.ac";
@@ -229,7 +229,7 @@ sub update_hver {
close (CONF_OUT);
if ($found != 2) {
- die "$found (instead of 2) occurances of VERSION in tsk_base.h";
+ die "$found (instead of 2) occurrences of VERSION in tsk_base.h";
}
unlink ("tsk/base/tsk_base.h") or die "Error deleting tsk/base/tsk_base.h";
@@ -263,7 +263,7 @@ sub update_pkgver {
close (CONF_OUT);
if ($found != 1) {
- die "Error: Found $found (instead of 1) occurances of Version: in RPM spec file";
+ die "Error: Found $found (instead of 1) occurrences of Version: in RPM spec file";
}
unlink ($IFILE) or die "Error deleting $IFILE";
@@ -362,7 +362,7 @@ sub update_libver {
close (CONF_OUT);
if ($found != 1) {
- die "Error: Found only $found (instead of 1) occurances of version-info lib makefile";
+ die "Error: Found only $found (instead of 1) occurrences of version-info lib makefile";
}
unlink ($IFILE) or die "Error deleting $IFILE";
diff --git a/tools/fiwalk/src/content.cpp b/tools/fiwalk/src/content.cpp
index acf101ec6e33b409b72d221dca253c9499ca98ba..d68bf3dc2368df440e47cadda9bfbdbe747fc4e5 100644
--- a/tools/fiwalk/src/content.cpp
+++ b/tools/fiwalk/src/content.cpp
@@ -335,7 +335,7 @@ void content::add_seg(int64_t img_offset,int64_t fs_offset,
/** Called when new bytes are encountered.
- * An important bug: currently we assume that the bytes added are contigious.
+ * An important bug: currently we assume that the bytes added are contiguous.
*/
void content::add_bytes(const u_char *buf,uint64_t file_offset,ssize_t size)
{
diff --git a/tools/sorter/sorter.base b/tools/sorter/sorter.base
index cef2b60ee82ba0aeaaad12984fabd54319914977..dd86a5bc1c92e20d3cef6b71bfbffbabe5fcee49 100644
--- a/tools/sorter/sorter.base
+++ b/tools/sorter/sorter.base
@@ -1126,7 +1126,7 @@ sub read_config {
print "Adding Category: $cat File Keywords: $kw\n" if ($VERBOSE);
}
- # extention defn
+ # extension defn
# ext ext1,ext2, key_words
elsif (/^\s*ext\s+([\w\d\,]+)\s+(.*?)\s*$/) {
my $ext = $1;
diff --git a/tsk/auto/auto.cpp b/tsk/auto/auto.cpp
index 0a57a040e2ac4fea40cc29cec538b4b742a25e4d..ce95297129d4eaf6e98b933303b290c745b62788 100644
--- a/tsk/auto/auto.cpp
+++ b/tsk/auto/auto.cpp
@@ -18,7 +18,7 @@
#include "tsk/img/img_writer.h"
-// @@@ Follow through some error paths for sanity check and update docs somewhere to relfect the new scheme
+// @@@ Follow through some error paths for sanity check and update docs somewhere to reflect the new scheme
TskAuto::TskAuto()
{
@@ -211,7 +211,7 @@ TskAuto::filterFs(TSK_FS_INFO * fs_info) {
* Starts in sector 0 of the opened disk images and looks for a
* volume or file system. Will call processFile() on each file
* that is found.
- * @return 1 if an error occured (message will have been registered) and 0 on success
+ * @return 1 if an error occurred (message will have been registered) and 0 on success
*/
uint8_t
TskAuto::findFilesInImg()
@@ -274,7 +274,7 @@ TSK_WALK_RET_ENUM
* that is found.
* @param a_start Byte offset to start analyzing from.
* @param a_vtype Volume system type to analyze
- * @return 1 if an error occured (messages will have been registered) and 0 on success
+ * @return 1 if an error occurred (messages will have been registered) and 0 on success
*/
uint8_t
TskAuto::findFilesInVs(TSK_OFF_T a_start, TSK_VS_TYPE_ENUM a_vtype)
@@ -324,7 +324,7 @@ TskAuto::findFilesInVs(TSK_OFF_T a_start, TSK_VS_TYPE_ENUM a_vtype)
* volume system or file system. Will call processFile() on each file
* that is found.
* @param a_start Byte offset to start analyzing from.
- * @return 1 if an error occured (message will have been registered), 0 on success
+ * @return 1 if an error occurred (message will have been registered), 0 on success
*/
uint8_t
TskAuto::findFilesInVs(TSK_OFF_T a_start)
@@ -387,7 +387,7 @@ TSK_RETVAL_ENUM
*
* @param a_start Byte offset of file system starting location.
*
- * @returns 1 if an error occured (messages will have been registered) and 0 on success
+ * @returns 1 if an error occurred (messages will have been registered) and 0 on success
*/
uint8_t
TskAuto::findFilesInFs(TSK_OFF_T a_start)
@@ -404,7 +404,7 @@ TskAuto::findFilesInFs(TSK_OFF_T a_start)
* @param a_start Byte offset of file system starting location.
* @param a_ftype Type of file system that is located at the offset.
*
- * @returns 1 if an error occured (messages will have been registered) and 0 on success
+ * @returns 1 if an error occurred (messages will have been registered) and 0 on success
*/
uint8_t
TskAuto::findFilesInFs(TSK_OFF_T a_start, TSK_FS_TYPE_ENUM a_ftype)
@@ -423,7 +423,7 @@ TskAuto::findFilesInFs(TSK_OFF_T a_start, TSK_FS_TYPE_ENUM a_ftype)
* @param a_ftype Type of file system that will be analyzed.
* @param a_inum inum to start walking files system at.
*
- * @returns 1 if an error occured (messages will have been registered) and 0 on success
+ * @returns 1 if an error occurred (messages will have been registered) and 0 on success
*/
uint8_t
TskAuto::findFilesInFs(TSK_OFF_T a_start, TSK_FS_TYPE_ENUM a_ftype,
@@ -472,7 +472,7 @@ uint8_t
* @param a_start Byte offset of file system starting location.
* @param a_inum inum to start walking files system at.
*
- * @returns 1 if an error occured (messages will have been registered) and 0 on success
+ * @returns 1 if an error occurred (messages will have been registered) and 0 on success
*/
uint8_t
TskAuto::findFilesInFs(TSK_OFF_T a_start, TSK_INUM_T a_inum)
@@ -486,7 +486,7 @@ TskAuto::findFilesInFs(TSK_OFF_T a_start, TSK_INUM_T a_inum)
*
* @param a_fs_info Pointer to a previously opened file system.
*
- * @returns 1 if an error occured (messages will have been registered) and 0 on success
+ * @returns 1 if an error occurred (messages will have been registered) and 0 on success
*/
uint8_t
TskAuto::findFilesInFs(TSK_FS_INFO * a_fs_info)
diff --git a/tsk/auto/auto_db.cpp b/tsk/auto/auto_db.cpp
index d1f76e81034a814dbfcd30e845413e570b3ae364..539c9f7f4561ac60c30775bda9b875bac8b6b0ad 100644
--- a/tsk/auto/auto_db.cpp
+++ b/tsk/auto/auto_db.cpp
@@ -369,7 +369,7 @@ TSK_RETVAL_ENUM
* Analyzes the open image and adds image info to a database.
* Does not deal with transactions and such. Refer to startAddImage()
* for more control.
- * @returns 1 if a critical error occured (DB doesn't exist, no file system, etc.), 2 if errors occured at some point adding files to the DB (corrupt file, etc.), and 0 otherwise. Errors will have been registered.
+ * @returns 1 if a critical error occurred (DB doesn't exist, no file system, etc.), 2 if errors occurred at some point adding files to the DB (corrupt file, etc.), and 0 otherwise. Errors will have been registered.
*/
uint8_t TskAutoDb::addFilesInImgToDb()
{
@@ -383,7 +383,7 @@ uint8_t TskAutoDb::addFilesInImgToDb()
// @@@ This seems bad because we are overriding what the user may
// have set. We should remove the public API if we are going to
- // override it -- presumabably this was added so that we always have
+ // override it -- presumably this was added so that we always have
// unallocated volume space...
setVolFilterFlags((TSK_VS_PART_FLAG_ENUM) (TSK_VS_PART_FLAG_ALLOC |
TSK_VS_PART_FLAG_UNALLOC));
@@ -448,7 +448,7 @@ uint8_t
if (m_db->inTransaction()) {
tsk_error_reset();
tsk_error_set_errno(TSK_ERR_AUTO_DB);
- tsk_error_set_errstr("TskAutoDb::startAddImage(): Already in a transaction, image might not be commited");
+ tsk_error_set_errstr("TskAutoDb::startAddImage(): Already in a transaction, image might not be committed");
registerError();
return 1;
}
@@ -511,7 +511,7 @@ TskAutoDb::startAddImage(TSK_IMG_INFO * img_info, const char* deviceId)
if (m_db->inTransaction()) {
tsk_error_reset();
tsk_error_set_errno(TSK_ERR_AUTO_DB);
- tsk_error_set_errstr("TskAutoDb::startAddImage(): Already in a transaction, image might not be commited");
+ tsk_error_set_errstr("TskAutoDb::startAddImage(): Already in a transaction, image might not be committed");
registerError();
return 1;
}
@@ -580,7 +580,7 @@ uint8_t
if (m_db->inTransaction()) {
tsk_error_reset();
tsk_error_set_errno(TSK_ERR_AUTO_DB);
- tsk_error_set_errstr("TskAutoDb::startAddImage(): Already in a transaction, image might not be commited");
+ tsk_error_set_errstr("TskAutoDb::startAddImage(): Already in a transaction, image might not be committed");
registerError();
return 1;
}
@@ -628,7 +628,7 @@ void
}
/**
- * Revert all changes after the startAddImage() process has run sucessfully.
+ * Revert all changes after the startAddImage() process has run successfully.
* @returns 1 on error (error was NOT registered in list), 0 on success
*/
int
@@ -665,7 +665,7 @@ int64_t
TskAutoDb::commitAddImage()
{
if (tsk_verbose)
- tsk_fprintf(stderr, "TskAutoDb::commitAddImage: Commiting add image process\n");
+ tsk_fprintf(stderr, "TskAutoDb::commitAddImage: Committing add image process\n");
if (m_imgTransactionOpen == false) {
tsk_error_reset();
@@ -814,7 +814,7 @@ TskAutoDb::processAttribute(TSK_FS_FILE * fs_file,
if (run->flags & TSK_FS_ATTR_RUN_FLAG_SPARSE)
continue;
- // @@@ We probaly want to keep on going here
+ // @@@ We probably want to keep on going here
if (m_db->addFileLayoutRange(m_curFileId,
run->addr * block_size, run->len * block_size, sequence++)) {
registerError();
diff --git a/tsk/auto/db_postgresql.cpp b/tsk/auto/db_postgresql.cpp
index 9c39022aa76e7ac2fb6a488a863e28b9fcf0bfb4..a04518ae3e1830b5757abd59a0f0ab85904ed4dd 100755
--- a/tsk/auto/db_postgresql.cpp
+++ b/tsk/auto/db_postgresql.cpp
@@ -314,7 +314,7 @@ int TskDbPostgreSQL::isEscapedStringValid(const char *sql_str, const char *orig_
/**
* Execute SQL statement and returns PostgreSQL result sets in ASCII format. Sets TSK error values on error.
-* IMPORTANT: result set needs to be freed by caling PQclear(res) when no longer needed.
+* IMPORTANT: result set needs to be freed by calling PQclear(res) when no longer needed.
* @returns Result set on success, NULL on error
*/
PGresult* TskDbPostgreSQL::get_query_result_set(const char *sql, const char *errfmt)
@@ -345,7 +345,7 @@ PGresult* TskDbPostgreSQL::get_query_result_set(const char *sql, const char *err
/**
* Execute a statement and returns PostgreSQL result sets in binary format. Sets TSK error values on error.
* IMPORTANT: PostgreSQL returns binary representations in network byte order, which need to be converted to the local byte order.
-* IMPORTANT: result set needs to be freed by caling PQclear(res) when no longer needed.
+* IMPORTANT: result set needs to be freed by calling PQclear(res) when no longer needed.
* @returns Result set on success, NULL on error
*/
PGresult* TskDbPostgreSQL::get_query_result_set_binary(const char *sql, const char *errfmt)
@@ -1937,7 +1937,7 @@ int TskDbPostgreSQL::createSavepoint(const char *name)
// In PostgreSQL savepoints can only be established when inside a transaction block.
// NOTE: this will only work if we have 1 savepoint. If we use multiple savepoints, PostgreSQL will
// not allow us to call "BEGIN" inside a transaction. We will need to keep track of whether we are
- // in transaction and only call "BEGIN" if we are not in trasaction. Alternatively we can keep
+ // in transaction and only call "BEGIN" if we are not in transaction. Alternatively we can keep
// calling "BEGIN" every time we create a savepoint and simply ignore the error if there is one.
// Also see note inside TskDbPostgreSQL::releaseSavepoint().
snprintf(buff, 1024, "BEGIN;");
@@ -1988,7 +1988,7 @@ int TskDbPostgreSQL::releaseSavepoint(const char *name)
// "COMMIT" when releasing the outer most savepoint.
snprintf(buff, 1024, "COMMIT;");
- return attempt_exec(buff, "Error commiting transaction: %s\n");
+ return attempt_exec(buff, "Error committing transaction: %s\n");
}
/**
diff --git a/tsk/auto/db_sqlite.cpp b/tsk/auto/db_sqlite.cpp
index 207be5a10a2f600df43e6f327510903241ec338f..e135843fb33bbb5ac2549289c7e74238844feb5c 100755
--- a/tsk/auto/db_sqlite.cpp
+++ b/tsk/auto/db_sqlite.cpp
@@ -160,9 +160,9 @@ uint8_t
{
if (attempt(sqlite3_bind_int64(m_insertObjectPreparedStmt, 1, parObjId),
- "TskDbSqlite::addObj: Error binding parent to statment: %s (result code %d)\n")
+ "TskDbSqlite::addObj: Error binding parent to statement: %s (result code %d)\n")
|| attempt(sqlite3_bind_int(m_insertObjectPreparedStmt, 2, type),
- "TskDbSqlite::addObj: Error binding type to statment: %s (result code %d)\n")
+ "TskDbSqlite::addObj: Error binding type to statement: %s (result code %d)\n")
|| attempt(sqlite3_step(m_insertObjectPreparedStmt), SQLITE_DONE,
"TskDbSqlite::addObj: Error adding object to row: %s (result code %d)\n"))
{
@@ -227,7 +227,7 @@ int
if (sqlite3_file_control(m_db, NULL, SQLITE_FCNTL_CHUNK_SIZE, &chunkSize) != SQLITE_OK) {
tsk_error_reset();
tsk_error_set_errno(TSK_ERR_AUTO_DB);
- tsk_error_set_errstr("TskDbSqlite::initialze: error setting chunk size %s", sqlite3_errmsg(m_db));
+ tsk_error_set_errstr("TskDbSqlite::initialize: error setting chunk size %s", sqlite3_errmsg(m_db));
return 1;
}
@@ -443,7 +443,7 @@ int
}
/**
-* Must be called on an intialized database, before adding any content to it.
+* Must be called on an initialized database, before adding any content to it.
*/
int
TskDbSqlite::setupFilePreparedStmt()
@@ -817,13 +817,13 @@ int64_t TskDbSqlite::findParObjId(const TSK_FS_FILE * fs_file, const char *paren
// Find the parent file id in the database using the parent metadata address
// @@@ This should use sequence number when the new database supports it
if (attempt(sqlite3_bind_int64(m_selectFilePreparedStmt, 1, fs_file->name->par_addr),
- "TskDbSqlite::findParObjId: Error binding meta_addr to statment: %s (result code %d)\n")
+ "TskDbSqlite::findParObjId: Error binding meta_addr to statement: %s (result code %d)\n")
|| attempt(sqlite3_bind_int64(m_selectFilePreparedStmt, 2, fsObjId),
- "TskDbSqlite::findParObjId: Error binding fs_obj_id to statment: %s (result code %d)\n")
+ "TskDbSqlite::findParObjId: Error binding fs_obj_id to statement: %s (result code %d)\n")
|| attempt(sqlite3_bind_text(m_selectFilePreparedStmt, 3, parent_path, -1, SQLITE_STATIC),
- "TskDbSqlite::findParObjId: Error binding path to statment: %s (result code %d)\n")
+ "TskDbSqlite::findParObjId: Error binding path to statement: %s (result code %d)\n")
|| attempt(sqlite3_bind_text(m_selectFilePreparedStmt, 4, parent_name, -1, SQLITE_STATIC),
- "TskDbSqlite::findParObjId: Error binding path to statment: %s (result code %d)\n")
+ "TskDbSqlite::findParObjId: Error binding path to statement: %s (result code %d)\n")
|| attempt(sqlite3_step(m_selectFilePreparedStmt), SQLITE_ROW,
"TskDbSqlite::findParObjId: Error selecting file id by meta_addr: %s (result code %d)\n"))
{
@@ -1706,7 +1706,7 @@ TSK_RETVAL_ENUM TskDbSqlite::getObjectInfo(int64_t objId, TSK_DB_OBJECT & object
}
if (attempt(sqlite3_bind_int64(objectsStatement, 1, objId),
- "TskDbSqlite::getObjectInfo: Error binding objId to statment: %s (result code %d)\n")
+ "TskDbSqlite::getObjectInfo: Error binding objId to statement: %s (result code %d)\n")
|| attempt(sqlite3_step(objectsStatement), SQLITE_ROW,
"TskDbSqlite::getObjectInfo: Error selecting object by objid: %s (result code %d)\n")) {
sqlite3_finalize(objectsStatement);
@@ -1740,7 +1740,7 @@ TSK_RETVAL_ENUM TskDbSqlite::getVsInfo(int64_t objId, TSK_DB_VS_INFO & vsInfo) {
}
if (attempt(sqlite3_bind_int64(vsInfoStatement, 1, objId),
- "TskDbSqlite::getVsInfo: Error binding objId to statment: %s (result code %d)\n")
+ "TskDbSqlite::getVsInfo: Error binding objId to statement: %s (result code %d)\n")
|| attempt(sqlite3_step(vsInfoStatement), SQLITE_ROW,
"TskDbSqlite::getVsInfo: Error selecting object by objid: %s (result code %d)\n")) {
sqlite3_finalize(vsInfoStatement);
@@ -1807,7 +1807,7 @@ TSK_RETVAL_ENUM TskDbSqlite::getFsRootDirObjectInfo(const int64_t fsObjId, TSK_D
}
if (attempt(sqlite3_bind_int64(rootDirInfoStatement, 1, fsObjId),
- "TskDbSqlite::getFsRootDirObjectInfo: Error binding objId to statment: %s (result code %d)\n")
+ "TskDbSqlite::getFsRootDirObjectInfo: Error binding objId to statement: %s (result code %d)\n")
|| attempt(sqlite3_step(rootDirInfoStatement), SQLITE_ROW,
"TskDbSqlite::getFsRootDirObjectInfo: Error selecting object by objid: %s (result code %d)\n")) {
sqlite3_finalize(rootDirInfoStatement);
diff --git a/tsk/auto/tsk_case_db.h b/tsk/auto/tsk_case_db.h
index 2a0f383d8829fa918a7b3d3418640dea8fccfb5d..aeab0560c0288b0f0a70cb5515baa26d4a84da49 100644
--- a/tsk/auto/tsk_case_db.h
+++ b/tsk/auto/tsk_case_db.h
@@ -81,13 +81,13 @@ class TskAutoDb:public TskAuto {
/**
* When enabled, records for unallocated file system space will be added to the database. Default value is false.
- * @param addUnallocSpace If true, create records for contigious unallocated file system sectors.
+ * @param addUnallocSpace If true, create records for contiguous unallocated file system sectors.
*/
virtual void setAddUnallocSpace(bool addUnallocSpace);
/**
* When enabled, records for unallocated file system space will be added to the database. Default value is false.
- * @param addUnallocSpace If true, create records for contigious unallocated file system sectors.
+ * @param addUnallocSpace If true, create records for contiguous unallocated file system sectors.
* @param chunkSize the number of bytes to group unallocated data into. A value of 0 will create
* one large chunk and group only on volume boundaries. A value of -1 will group each consecutive
* chunk.
diff --git a/tsk/auto/tsk_db.h b/tsk/auto/tsk_db.h
index d5a5485d1bce6789451cdd6e8c78552a481e356c..c04e7fc710316950f7d51ce02ac447fe047a748e 100755
--- a/tsk/auto/tsk_db.h
+++ b/tsk/auto/tsk_db.h
@@ -11,7 +11,7 @@
/**
* \file tsk_db.h
* Contains TSK interface to abstract database handling class. The intent of this class
- * is so that different databases can be seamlesly used by TSK.
+ * is so that different databases can be seamlessly used by TSK.
*/
#ifndef _TSK_DB_H
diff --git a/tsk/base/crc.h b/tsk/base/crc.h
index cd41c44d1548b7451a88bfdf06a3554d26dea5db..f9f4617c3d04b019f897d6e7530e21b569601bf6 100644
--- a/tsk/base/crc.h
+++ b/tsk/base/crc.h
@@ -78,7 +78,7 @@ Status : Copyright (C) Ross Williams, 1993. However, permission is
/******************************************************************************/
/* The following #ifndef encloses this entire */
-/* header file, rendering it indempotent. */
+/* header file, rendering it idempotent. */
#ifndef CM_DONE
#define CM_DONE
diff --git a/tsk/base/md5c.c b/tsk/base/md5c.c
index 5f3a5e2865141206e4b085a8b2f821ff880bdef9..55262c0356a70ce665706fdea111d70418462183 100644
--- a/tsk/base/md5c.c
+++ b/tsk/base/md5c.c
@@ -163,7 +163,7 @@ TSK_MD5_Update(TSK_MD5_CTX * context, unsigned char *input,
/**
* \ingroup baselib
- * Cacluate the MD5 hash of the data added to this context. Context
+ * Calculate the MD5 hash of the data added to this context. Context
* will be zeroed after this call.
* @param digest Buffer to store MD5 value in.
* @param context Context that has data added to it.
diff --git a/tsk/base/mymalloc.c b/tsk/base/mymalloc.c
index ef92a097b3adb3a521bf19c1f1dc92cde2b63d26..fa2650b4ccb9bc563f39d48f95707eb460f79b12 100644
--- a/tsk/base/mymalloc.c
+++ b/tsk/base/mymalloc.c
@@ -7,7 +7,7 @@
*/
/** \file mymalloc.c
- * These functions allocate and realocate memory and set the error handling functions
+ * These functions allocate and reallocate memory and set the error handling functions
* when an error occurs.
*/
diff --git a/tsk/base/sha1c.c b/tsk/base/sha1c.c
index bcfdf750e217a65ef97a0d4f17aa2c607789a0d4..61b50ed59f2d68b87a8a49bf3781f23bfb8bbdf7 100644
--- a/tsk/base/sha1c.c
+++ b/tsk/base/sha1c.c
@@ -171,7 +171,7 @@ SHSTransform(digest, data)
E = digest[4];
memcpy((POINTER) eData, (POINTER) data, SHS_DATASIZE);
- /* Heavy mangling, in 4 sub-rounds of 20 interations each. */
+ /* Heavy mangling, in 4 sub-rounds of 20 iterations each. */
subRound(A, B, C, D, E, f1, K1, eData[0]);
subRound(E, A, B, C, D, f1, K1, eData[1]);
subRound(D, E, A, B, C, f1, K1, eData[2]);
diff --git a/tsk/base/tsk_base.h b/tsk/base/tsk_base.h
index dc05034d2b368dd3494f7b42157e230924d3e035..b763ff549acb29ef83565dfa35c07b784d452c9f 100644
--- a/tsk/base/tsk_base.h
+++ b/tsk/base/tsk_base.h
@@ -110,7 +110,7 @@ extern "C" {
// non-windows
#else
/* Note that there is an assumption that TSK_MULTITHREADED_LIB was
- * set only if we have ptheads. If we add a check for HAVE_PTHREAD
+ * set only if we have pthreads. If we add a check for HAVE_PTHREAD
* here, it causes problems when you try to include the library in
* a tool because they do not have tsk_config.h included.
*/
diff --git a/tsk/base/tsk_base_i.h b/tsk/base/tsk_base_i.h
index d797872970258687defd25d9930089de7fa60a1e..3fb21f7e513e5a228086805e39041b5175b79675 100644
--- a/tsk/base/tsk_base_i.h
+++ b/tsk/base/tsk_base_i.h
@@ -231,7 +231,7 @@ extern "C" {
Conversions between UTF32, UTF-16, and UTF-8. Header file.
- Several funtions are included here, forming a complete set of
+ Several functions are included here, forming a complete set of
conversions between the three formats. UTF-7 is not included
here, but is handled in a separate source file.
diff --git a/tsk/base/tsk_error.c b/tsk/base/tsk_error.c
index 9493acbfebd8bdfaa31f8924f07a885d3e8fa5c7..88fba9e2005fc55b881392de483594d90e41d7d1 100644
--- a/tsk/base/tsk_error.c
+++ b/tsk/base/tsk_error.c
@@ -137,7 +137,7 @@ tsk_error_get_info()
TSK_ERROR_INFO *ptr = NULL;
(void) pthread_once(&pt_tls_key_once, make_pt_tls_key);
if ((ptr = (TSK_ERROR_INFO *) pthread_getspecific(pt_tls_key)) == 0) {
- // Under high memory presure malloc will return NULL.
+ // Under high memory pressure malloc will return NULL.
ptr = (TSK_ERROR_INFO *) malloc(sizeof(TSK_ERROR_INFO));
if( ptr != NULL ) {
diff --git a/tsk/base/tsk_unicode.c b/tsk/base/tsk_unicode.c
index 14c2b482373d0545867156cec753d201cd85a50b..252ad91e809cef8b800df92d4dc6a4b09a2f11a1 100644
--- a/tsk/base/tsk_unicode.c
+++ b/tsk/base/tsk_unicode.c
@@ -135,7 +135,7 @@ static const UTF8 firstByteMark[7] =
* \ingroup baselib
* Convert a UTF-16 string to UTF-8.
* @param endian Endian ordering flag of UTF-16 text
- * @param sourceStart Pointer to pointer to start of UTF-16 string. Will be updated to last char proccessed.
+ * @param sourceStart Pointer to pointer to start of UTF-16 string. Will be updated to last char processed.
* @param sourceEnd Pointer to one entry past end of UTF-16 string
* @param targetStart Pointer to pointer to place where UTF-8 string should be written. Will be updated to next place to write to.
* @param targetEnd Pointer to end of UTF-8 buffer
@@ -248,7 +248,7 @@ tsk_UTF16toUTF8(TSK_ENDIAN_ENUM endian, const UTF16 ** sourceStart,
/**
* \ingroup baselib
* Convert a UTF-16 string in local endian ordering to UTF-8.
-* @param sourceStart Pointer to pointer to start of UTF-16 string. Will be updated to last char proccessed.
+* @param sourceStart Pointer to pointer to start of UTF-16 string. Will be updated to last char processed.
* @param sourceEnd Pointer to one entry past end of UTF-16 string
* @param targetStart Pointer to pointer to place where UTF-8 string should be written. Will be updated to next place to write to.
* @param targetEnd Pointer to end of UTF-8 buffer
@@ -573,7 +573,7 @@ tsk_cleanupUTF8(char *source, const char replacement)
/**
* \ingroup baselib
* Convert a UTF-8 string to UTF-16 (in local endian ordering).
-* @param sourceStart Pointer to pointer to start of UTF-8 string. Will be updated to last char proccessed.
+* @param sourceStart Pointer to pointer to start of UTF-8 string. Will be updated to last char processed.
* @param sourceEnd Pointer to one entry past end of UTF-8 string
* @param targetStart Pointer to pointer to place where UTF-16 string should be written. Will be updated to next place to write to.
* @param targetEnd Pointer to end of UTF-16 buffer
diff --git a/tsk/docs/auto.dox b/tsk/docs/auto.dox
index 07f4215fdb47c425906ba45394913f09abfcbb14..b20ea4156ac49dcefea38b74fd37e3efb94ec278 100644
--- a/tsk/docs/auto.dox
+++ b/tsk/docs/auto.dox
@@ -43,7 +43,7 @@ There are also a series of protected methods in TskAuto that will help you to sk
The goal of TskAuto is to get through the disk image and process as many files as possible. Therefore, it will continue even if an error is encountered.
-The public methods will return a value if any error occured. As an error occured, it was registered with TskAuto and recorded in a list. To determine how many and which errors occured, use the TskAuto::getErrorList() method.
+The public methods will return a value if any error occurred. As an error occurred, it was registered with TskAuto and recorded in a list. To determine how many and which errors occurred, use the TskAuto::getErrorList() method.
If you encounter error scenarios while implementing TskAuto::processFile() or TskAuto::processAttribute(), then you should also send the errors to TskAuto::registerError() so that they are all recorded in a central location.
diff --git a/tsk/docs/cpp.dox b/tsk/docs/cpp.dox
index 3ab2880f1ebe58ec5cc019ad947b248cb568dbe9..a9e2d0f5b7ee3dbf056b6b7942ce4772d6396ded 100644
--- a/tsk/docs/cpp.dox
+++ b/tsk/docs/cpp.dox
@@ -12,7 +12,7 @@ Note that the C++ interfaces simply create and use C structs behind
the scenes. Therefore, the methods are very similar to the C
functions. References to the C++ classes were given in earlier
sections of the User's Guide. It is assumed that the user has read
-the preceeding sections of the User's Guide to get an understanding of
+the preceding sections of the User's Guide to get an understanding of
what TSK is capable of doing. This section provides references and links
to the main C++ classes.
diff --git a/tsk/fs/exfatfs_meta.c b/tsk/fs/exfatfs_meta.c
index 5c1139094d59d07ac55881d4bc3dfbf959666460..d352db5a612ccdc774380a10253a1b65c5e3fe56 100755
--- a/tsk/fs/exfatfs_meta.c
+++ b/tsk/fs/exfatfs_meta.c
@@ -668,7 +668,7 @@ exfatfs_is_file_name_dentry(FATFS_DENTRY *a_dentry)
* @param [in] a_cluster_is_alloc The allocation status, possibly unknown, of the
* cluster from which the buffer was filled.
* @param [in] a_do_basic_tests_only Whether to do basic or in-depth testing.
- * @return 1 if the buffer likely contains a direcotry entry, 0 otherwise
+ * @return 1 if the buffer likely contains a directory entry, 0 otherwise
*/
uint8_t
exfatfs_is_dentry(FATFS_INFO *a_fatfs, FATFS_DENTRY *a_dentry, FATFS_DATA_UNIT_ALLOC_STATUS_ENUM a_cluster_is_alloc, uint8_t a_do_basic_tests_only)
@@ -1327,7 +1327,7 @@ exfatfs_copy_file_name_inode(FATFS_INFO *a_fatfs, TSK_INUM_T a_inum,
/**
* \internal
* Initialize the members of a TSK_FS_META object before copying the contents
- * of an an inode consisting of one or more raw exFAT directry entries into it.
+ * of an an inode consisting of one or more raw exFAT directory entries into it.
*
* @param [in] a_fatfs Source file system for the directory entries.
* @param [in] a_inum Address of the inode.
@@ -1642,7 +1642,7 @@ exfatfs_inode_lookup(FATFS_INFO *a_fatfs, TSK_FS_FILE *a_fs_file,
/* Check the allocation status of the sector. This status will be used
* not only as meta data to be reported, but also as a way to choose
* between the basic or in-depth version of the tests (below) that
- * determine whether or not the bytes corrresponding to the inode are
+ * determine whether or not the bytes corresponding to the inode are
* likely to be a directory entry. Note that in other places in the code
* information about whether or not the sector that contains the inode is
* part of a folder is used to select the test. Here, that information is
diff --git a/tsk/fs/ext2fs_dent.c b/tsk/fs/ext2fs_dent.c
index fd33bfc4b62dfc2004da2b5cae3e02ff4b307ef4..42cde71d0be17d45f6d21eec598bc4ef8c51ccba 100644
--- a/tsk/fs/ext2fs_dent.c
+++ b/tsk/fs/ext2fs_dent.c
@@ -223,10 +223,10 @@ ext2fs_dent_parse_block(EXT2FS_INFO * ext2fs, TSK_FS_DIR * a_fs_dir,
/** \internal
* Process a directory and load up FS_DIR with the entries. If a pointer to
-* an already allocated FS_DIR struture is given, it will be cleared. If no existing
+* an already allocated FS_DIR structure is given, it will be cleared. If no existing
* FS_DIR structure is passed (i.e. NULL), then a new one will be created. If the return
* value is error or corruption, then the FS_DIR structure could
-* have entries (depending on when the error occured).
+* have entries (depending on when the error occurred).
*
* @param a_fs File system to analyze
* @param a_fs_dir Pointer to FS_DIR pointer. Can contain an already allocated
diff --git a/tsk/fs/fatfs.c b/tsk/fs/fatfs.c
index 6585edbfa2eaea644e38fb0ee9348ed62bd2e5f0..f368f64fd07b36b1a582c90045c29db3e39044e7 100644
--- a/tsk/fs/fatfs.c
+++ b/tsk/fs/fatfs.c
@@ -216,7 +216,7 @@ getFATCacheIdx(FATFS_INFO * fatfs, TSK_DADDR_T sect)
* Set *value to the entry in the File Allocation Table (FAT)
* for the given cluster
*
- * *value is in clusters and may need to be coverted to
+ * *value is in clusters and may need to be converted to
* sectors by the calling function
*
* Invalid values in the FAT (i.e. greater than the largest
@@ -479,7 +479,7 @@ fatfs_block_walk(TSK_FS_INFO * fs, TSK_DADDR_T a_start_blk,
}
/* cycle through the sectors. We do the sectors before the first
- * cluster seperate from the data area */
+ * cluster separate from the data area */
addr = a_start_blk;
/* Before the data area beings (FAT, root directory etc.) */
@@ -761,7 +761,7 @@ fatfs_fscheck(TSK_FS_INFO * fs, FILE * hFile)
tsk_error_set_errstr("fscheck not implemented for FAT yet");
return 1;
- /* Check that allocated dentries point to start of allcated cluster chain */
+ /* Check that allocated dentries point to start of allocated cluster chain */
/* Size of file is consistent with cluster chain length */
diff --git a/tsk/fs/fatfs_dent.cpp b/tsk/fs/fatfs_dent.cpp
index 8635ce0417110a40f02e8c96aa32ccb4da913cb0..d89df692b198273a6dfa5316120f0ade9698eab7 100644
--- a/tsk/fs/fatfs_dent.cpp
+++ b/tsk/fs/fatfs_dent.cpp
@@ -209,10 +209,10 @@ static TSK_WALK_RET_ENUM
/** \internal
* Process a directory and load up FS_DIR with the entries. If a pointer to
-* an already allocated FS_DIR struture is given, it will be cleared. If no existing
+* an already allocated FS_DIR structure is given, it will be cleared. If no existing
* FS_DIR structure is passed (i.e. NULL), then a new one will be created. If the return
* value is error or corruption, then the FS_DIR structure could
-* have entries (depending on when the error occured).
+* have entries (depending on when the error occurred).
*
* @param a_fs File system to analyze
* @param a_fs_dir Pointer to FS_DIR pointer. Can contain an already allocated
@@ -323,7 +323,7 @@ TSK_RETVAL_ENUM
return TSK_COR;
}
- /* We did not copy the entire directory, which occurs if an error occured */
+ /* We did not copy the entire directory, which occurs if an error occurred */
if (load.dirleft > 0) {
tsk_error_reset();
tsk_error_set_errno(TSK_ERR_FS_FWALK);
diff --git a/tsk/fs/fatxxfs.c b/tsk/fs/fatxxfs.c
index 9cc48fab9776a8ad65a0fef3f0b54953887f2381..3b8794b88e40115e7120b8ad193f860eb309bb43 100755
--- a/tsk/fs/fatxxfs.c
+++ b/tsk/fs/fatxxfs.c
@@ -546,7 +546,7 @@ fatxxfs_open(FATFS_INFO *fatfs)
/* Calculate the block info
*
- * The sector of the begining of the data area - which is
+ * The sector of the beginning of the data area - which is
* after all of the FATs
*
* For TSK_FS_TYPE_FAT12 and TSK_FS_TYPE_FAT16, the data area starts with the root
@@ -830,7 +830,7 @@ fatxxfs_open(FATFS_INFO *fatfs)
fatfs->subtype = TSK_FATFS_SUBTYPE_SPEC;
test_dir1 = tsk_fs_dir_open_meta(fs, fs->root_inum);
- if (test_dir1 != NULL && test_dir1->names_used <= 4){ // At most four automatic directores ($MBR, $FAT1, $FAT1, $OrphanFiles)
+ if (test_dir1 != NULL && test_dir1->names_used <= 4){ // At most four automatic directories ($MBR, $FAT1, $FAT1, $OrphanFiles)
fatfs->subtype = TSK_FATFS_SUBTYPE_ANDROID_1;
test_dir2 = tsk_fs_dir_open_meta(fs, fs->root_inum);
diff --git a/tsk/fs/fatxxfs_meta.c b/tsk/fs/fatxxfs_meta.c
index d4b55d92f6744c2afaf5bfe1951c34c5885153ed..bf42fa4d3a14bbfbd807cbc9e5ff236e8bd6f3c7 100755
--- a/tsk/fs/fatxxfs_meta.c
+++ b/tsk/fs/fatxxfs_meta.c
@@ -148,7 +148,7 @@ is_83_name(FATXXFS_DENTRY * de)
* @param [in] a_cluster_is_alloc The allocation status, possibly unknown, of the
* cluster from which the buffer was filled.
* @param [in] a_do_basic_tests_only Whether to do basic or in-depth testing.
- * @return 1 if the buffer likely contains a direcotry entry, 0 otherwise
+ * @return 1 if the buffer likely contains a directory entry, 0 otherwise
*/
uint8_t
fatxxfs_is_dentry(FATFS_INFO *a_fatfs, FATFS_DENTRY *a_dentry, FATFS_DATA_UNIT_ALLOC_STATUS_ENUM a_cluster_is_alloc, uint8_t a_do_basic_tests_only)
diff --git a/tsk/fs/ffs_dent.c b/tsk/fs/ffs_dent.c
index ee7b8ae59f2115b71699039f61c101c311b1ce37..9f2304983cc2bc188bf2309d89edd6e637891fc6 100644
--- a/tsk/fs/ffs_dent.c
+++ b/tsk/fs/ffs_dent.c
@@ -213,10 +213,10 @@ ffs_dent_parse_block(FFS_INFO * ffs, TSK_FS_DIR * fs_dir, uint8_t a_is_del,
/** \internal
* Process a directory and load up FS_DIR with the entries. If a pointer to
- * an already allocated FS_DIR struture is given, it will be cleared. If no existing
+ * an already allocated FS_DIR structure is given, it will be cleared. If no existing
* FS_DIR structure is passed (i.e. NULL), then a new one will be created. If the return
* value is error or corruption, then the FS_DIR structure could
- * have entries (depending on when the error occured).
+ * have entries (depending on when the error occurred).
*
* @param a_fs File system to analyze
* @param a_fs_dir Pointer to FS_DIR pointer. Can contain an already allocated
diff --git a/tsk/fs/fs_attr.c b/tsk/fs/fs_attr.c
index a31f841629060333a9326023dfcbbcdfc45bd9aa..58a066ff9bc3aeb39764395ae212f14f05a5b5e0 100644
--- a/tsk/fs/fs_attr.c
+++ b/tsk/fs/fs_attr.c
@@ -325,7 +325,7 @@ tsk_fs_attr_set_run(TSK_FS_FILE * a_fs_file, TSK_FS_ATTR * a_fs_attr,
}
/*
- * If this is not in the begining, then we need to make a filler
+ * If this is not in the beginning, then we need to make a filler
* to account for the cluster numbers we haven't seen yet
*
* This commonly happens when we process an MFT entry that
@@ -472,7 +472,7 @@ tsk_fs_attr_add_run(TSK_FS_INFO * a_fs, TSK_FS_ATTR * a_fs_attr,
a_fs_attr->nrd.run = a_data_run_new;
}
- /* The new run does not start at the begining of
+ /* The new run does not start at the beginning of
* the filler, so make a new start filler
*/
else {
@@ -1154,7 +1154,7 @@ tsk_fs_attr_read(const TSK_FS_ATTR * a_fs_attr, TSK_OFF_T a_offset,
TSK_OFF_T fs_offset_b;
ssize_t cnt;
- // calcuate the byte offset in the file system
+ // calculate the byte offset in the file system
fs_offset_b =
(data_run_cur->addr +
blkoffset_inrun) * fs->block_size;
diff --git a/tsk/fs/fs_dir.c b/tsk/fs/fs_dir.c
index 50dd8040c8ed45e17f0b14fd39c1981d51b1b923..55a4719f6ac0b50a7a0840dfc1ec8279b88d52a4 100644
--- a/tsk/fs/fs_dir.c
+++ b/tsk/fs/fs_dir.c
@@ -185,7 +185,7 @@ tsk_fs_dir_add(TSK_FS_DIR * a_fs_dir, const TSK_FS_NAME * a_fs_name)
/* see if we already have it in the buffer / queue
* We skip this check for FAT because it will always fail because two entries
* never have the same meta address. */
- // @@@ We could do something more effecient here too with orphan files because we do not
+ // @@@ We could do something more efficient here too with orphan files because we do not
// need to check the contents of that directory either and this takes a lot of time on those
// large images.
if (TSK_FS_TYPE_ISFAT(a_fs_dir->fs_info->ftype) == 0) {
@@ -208,7 +208,7 @@ tsk_fs_dir_add(TSK_FS_DIR * a_fs_dir, const TSK_FS_NAME * a_fs_name)
&& (a_fs_name->flags & TSK_FS_NAME_FLAG_ALLOC)) {
fs_name_dest = &a_fs_dir->names[i];
- // free the memory - not the most effecient, but prevents
+ // free the memory - not the most efficient, but prevents
// duplicate code.
if (fs_name_dest->name) {
free(fs_name_dest->name);
@@ -945,7 +945,7 @@ tsk_fs_dir_load_inum_named(TSK_FS_INFO * a_fs)
/* Do a dir_walk. There is internal caching code that will populate
* the structure. The callback is really a dummy call. This could
- * be made more effecient in the future (not do callbacks...). We
+ * be made more efficient in the future (not do callbacks...). We
* specify UNALLOC only as a flag on the assumption that there will
* be fewer callbacks for UNALLOC than ALLOC.
*/
diff --git a/tsk/fs/fs_file.c b/tsk/fs/fs_file.c
index 9ac967ae607676b7d89f6e5c4529ca965a8af0c8..d114854cdcb9a3a9de37abdc192762e74ffdb65b 100644
--- a/tsk/fs/fs_file.c
+++ b/tsk/fs/fs_file.c
@@ -86,7 +86,7 @@ tsk_fs_file_close(TSK_FS_FILE * a_fs_file)
* that the returned TSK_FS_FILE structure will not have the file name set because
* it was not used to load the file and this function does not search the
* directory structure to find the name that points to the address. In general,
-* if you know the metadata address of a file, this function is more effecient
+* if you know the metadata address of a file, this function is more efficient
* then tsk_fs_file_open, which first maps a file name to the metadata address
* and then opens the file using this function.
*
@@ -139,7 +139,7 @@ tsk_fs_file_open_meta(TSK_FS_INFO * a_fs,
* \ingroup fslib
* Return the handle structure for a specific file, given its full path. Note that
* if you have the metadata address fo the file, then tsk_fs_file_open_meta() is a
-* more effecient approach.
+* more efficient approach.
*
* @param a_fs File system to analyze
* @param a_fs_file Structure to store file data in or NULL to have one allocated.
diff --git a/tsk/fs/fs_io.c b/tsk/fs/fs_io.c
index c32e20dddeeb72cb7f3f1e6bec093f408b3feb5f..760cc8da63b9c065b62559dd75c4db20d805867e 100644
--- a/tsk/fs/fs_io.c
+++ b/tsk/fs/fs_io.c
@@ -34,7 +34,7 @@
* @param a_off Byte offset into file system (i.e. not offset into image)
* @param a_buf Buffer to write data into
* @param a_len Number of bytes to read
- * @retuns Number of bytes read or -1 on error
+ * @returns Number of bytes read or -1 on error
*/
static ssize_t
fs_prepost_read(TSK_FS_INFO * a_fs, TSK_OFF_T a_off, char *a_buf,
diff --git a/tsk/fs/hfs.c b/tsk/fs/hfs.c
index 4d22ad28ece6fcc0cd5096fc4dd792aa9ce97cee..5d71187c08956991c3785db1cee74530fbadead6 100644
--- a/tsk/fs/hfs.c
+++ b/tsk/fs/hfs.c
@@ -1157,7 +1157,7 @@ hfs_cat_get_record_offset_cb(HFS_INFO * hfs, int8_t level_type,
* @param hfs File System being analyzed
* @param needle Key to search for
* @returns Byte offset or 0 on error. 0 is also returned if catalog
- * record was not found. Check tsk_errno to determine if error occured.
+ * record was not found. Check tsk_errno to determine if error occurred.
*/
static TSK_OFF_T
hfs_cat_get_record_offset(HFS_INFO * hfs, const hfs_btree_key_cat * needle)
@@ -1385,7 +1385,7 @@ hfs_lookup_hard_link(HFS_INFO * hfs, TSK_INUM_T linknum,
*
* If the error is serious, then is_error is set to 2 or 3, depending on the kind of error, and
* the TSK error code is set, and the function returns zero. is_error==2 means that an error
- * occured in looking up the target file in the Catalog. is_error==3 means that the given
+ * occurred in looking up the target file in the Catalog. is_error==3 means that the given
* entry appears to be a hard link, but the target file does not exist in the Catalog.
*
* @param hfs The file system
@@ -2793,7 +2793,7 @@ hfs_attr_walk_special(const TSK_FS_ATTR * fs_attr,
}
// Allocate two buffers for the raw and uncompressed data
- /* Raw data can be COMPRESSSION_UNIT_SIZE+1 if the data is not
+ /* Raw data can be COMPRESSION_UNIT_SIZE+1 if the data is not
* compressed and there is a 1-byte flag that indicates that
* the data is not compressed. */
rawBuf = (char *) tsk_malloc(COMPRESSION_UNIT_SIZE + 1);
@@ -3172,7 +3172,7 @@ hfs_file_read_special(const TSK_FS_ATTR * a_fs_attr,
bytesCopied = 0;
// Allocate buffers for the raw and uncompressed data
- /* Raw data can be COMPRESSSION_UNIT_SIZE+1 if the data is not
+ /* Raw data can be COMPRESSION_UNIT_SIZE+1 if the data is not
* compressed and there is a 1-byte flag that indicates that
* the data is not compressed. */
rawBuf = (char *) tsk_malloc(COMPRESSION_UNIT_SIZE + 1);
diff --git a/tsk/fs/hfs_dent.c b/tsk/fs/hfs_dent.c
index c1a04e4eb3701f3ba3b9f83f8c7102822aa4680e..39cbea698282faef31b5fc844f7dbd2d7b2566e0 100644
--- a/tsk/fs/hfs_dent.c
+++ b/tsk/fs/hfs_dent.c
@@ -339,10 +339,10 @@ hfs_dir_open_meta_cb(HFS_INFO * hfs, int8_t level_type,
/** \internal
* Process a directory and load up FS_DIR with the entries. If a pointer to
-* an already allocated FS_DIR struture is given, it will be cleared. If no existing
+* an already allocated FS_DIR structure is given, it will be cleared. If no existing
* FS_DIR structure is passed (i.e. NULL), then a new one will be created. If the return
* value is error or corruption, then the FS_DIR structure could
-* have entries (depending on when the error occured).
+* have entries (depending on when the error occurred).
*
* @param a_fs File system to analyze
* @param a_fs_dir Pointer to FS_DIR pointer. Can contain an already allocated
diff --git a/tsk/fs/ifind_lib.c b/tsk/fs/ifind_lib.c
index 23cadc41adff8d9f5fa26500c8855a6e3d9f5a19..dfbf0ded7379270f97e8da4b6983b12668d3ece2 100644
--- a/tsk/fs/ifind_lib.c
+++ b/tsk/fs/ifind_lib.c
@@ -210,7 +210,7 @@ tsk_fs_path2inum(TSK_FS_INFO * a_fs, const char *a_path,
return 0;
}
- /* If this is NTFS, seperate out the attribute of the current directory */
+ /* If this is NTFS, separate out the attribute of the current directory */
if (TSK_FS_TYPE_ISNTFS(a_fs->ftype)
&& ((cur_attr = strchr(cur_dir, ':')) != NULL)) {
*(cur_attr) = '\0';
@@ -516,7 +516,7 @@ ifind_data_act(TSK_FS_FILE * fs_file, void *ptr)
data->curinode = fs_file->meta->addr;
- /* Search all attrributes */
+ /* Search all attributes */
cnt = tsk_fs_file_attr_getsize(fs_file);
for (i = 0; i < cnt; i++) {
const TSK_FS_ATTR *fs_attr = tsk_fs_file_attr_get_idx(fs_file, i);
diff --git a/tsk/fs/iso9660.c b/tsk/fs/iso9660.c
index 948ff68851bf615c351b5a4fdd3c8156d374904a..234c2885adb95e9396c650fd8e5b43757a2a02b4 100644
--- a/tsk/fs/iso9660.c
+++ b/tsk/fs/iso9660.c
@@ -207,7 +207,7 @@ parse_susp(TSK_FS_INFO * fs, char *buf, int count, FILE * hFile)
}
buf += head->len;
}
- // SUSP Extention Registration -- not used
+ // SUSP Extension Registration -- not used
else if ((head->sig[0] == 'E') && (head->sig[1] == 'R')) {
iso9660_susp_er *er = (iso9660_susp_er *) buf;
if (hFile) {
@@ -229,7 +229,7 @@ parse_susp(TSK_FS_INFO * fs, char *buf, int count, FILE * hFile)
}
buf += head->len;
}
- // SUSP Extention Sigs -- not used
+ // SUSP Extension Sigs -- not used
else if ((head->sig[0] == 'E') && (head->sig[1] == 'S')) {
if (hFile) {
fprintf(hFile, "ES Entry\n");
@@ -753,7 +753,7 @@ iso9660_load_inodes_dir(TSK_FS_INFO * fs, TSK_OFF_T a_offs, int count,
* Process the path table for a joliet secondary volume descriptor
* and load all of the files pointed to it.
* The path table contains an entry for each directory. This code
- * then locates each of the diretories and proceses the contents.
+ * then locates each of the directories and processes the contents.
*
* @param fs File system to process
* @param svd Pointer to the secondary volume descriptor
@@ -1372,7 +1372,7 @@ iso9660_inode_walk(TSK_FS_INFO * fs, TSK_INUM_T start, TSK_INUM_T last,
return 0;
}
-// @@@ Doesn' thit seem to ignore interleave?
+// @@@ Doesn' this seem to ignore interleave?
/* return 1 if block is allocated in a file's extent, return 0 otherwise */
static int
iso9660_is_block_alloc(TSK_FS_INFO * fs, TSK_DADDR_T blk_num)
diff --git a/tsk/fs/iso9660_dent.c b/tsk/fs/iso9660_dent.c
index dabb0263e76abe62d3630ddbe90e4153766164cf..d5cf372078367fb9942a47c6a4df9c833480c8d0 100644
--- a/tsk/fs/iso9660_dent.c
+++ b/tsk/fs/iso9660_dent.c
@@ -79,7 +79,7 @@
* file data into a TSK_FS_DIR structure.
*
* @param a_fs File system
- * @param a_fs_dir Structore to store file names into
+ * @param a_fs_dir Structure to store file names into
* @param buf Buffer that contains the directory content
* @param a_length Number of bytes in buffer
* @param a_addr The metadata address for the directory being processed
@@ -205,10 +205,10 @@ iso9660_proc_dir(TSK_FS_INFO * a_fs, TSK_FS_DIR * a_fs_dir, char *buf,
/** \internal
* Process a directory and load up FS_DIR with the entries. If a pointer to
- * an already allocated FS_DIR struture is given, it will be cleared. If no existing
+ * an already allocated FS_DIR structure is given, it will be cleared. If no existing
* FS_DIR structure is passed (i.e. NULL), then a new one will be created. If the return
* value is error or corruption, then the FS_DIR structure could
- * have entries (depending on when the error occured).
+ * have entries (depending on when the error occurred).
*
* @param a_fs File system to analyze
* @param a_fs_dir Pointer to FS_DIR pointer. Can contain an already allocated
diff --git a/tsk/fs/ntfs.c b/tsk/fs/ntfs.c
index 2e029a6fc869fe0f45535168b8b6e45672437dc9..5d249b90b30c361be25a68c58b3f0234444a0c01 100755
--- a/tsk/fs/ntfs.c
+++ b/tsk/fs/ntfs.c
@@ -58,7 +58,7 @@
*
* So, the way this is solved is that generic mft_lookup is used to get
* any MFT entry, even $MFT. If $MFT is not cached then we calculate
- * the address of where to read based on mutliplication and guessing.
+ * the address of where to read based on multiplication and guessing.
* When we are loading the $MFT, we set 'loading_the_MFT' to 1 so
* that we can update things as we go along. When we read $MFT we
* read all the attributes and save info about the $Data one. If
@@ -728,7 +728,7 @@ ntfs_make_data_run(NTFS_INFO * ntfs, TSK_OFF_T start_vcn,
* NTFS Breaks compressed data into compression units, which are
* typically 16 clusters in size. If the data in the comp unit
* compresses to something smaller than 16 clusters then the
- * compresed data is stored and the rest of the compression unit
+ * compressed data is stored and the rest of the compression unit
* is filled with sparse clusters. The entire compression unit
* can also be sparse.
*
@@ -904,7 +904,7 @@ ntfs_uncompress_compunit(NTFS_COMP_INFO * comp)
/* Determine token type and parse appropriately. *
* Symbol tokens are the symbol themselves, so copy it
- * into the umcompressed buffer
+ * into the uncompressed buffer
*/
if ((header & NTFS_TOKEN_MASK) == NTFS_SYMBOL_TOKEN) {
if (tsk_verbose)
@@ -1881,7 +1881,7 @@ ntfs_proc_attrseq(NTFS_INFO * ntfs,
*
* When we are processing a non-base entry, we may
* find an attribute with an id of 0 and it is an
- * extention of a previous run (i.e. non-zero start VCN)
+ * extension of a previous run (i.e. non-zero start VCN)
*
* We will lookup if we already have such an attribute
* and get its ID
@@ -2338,7 +2338,7 @@ ntfs_proc_attrlist(NTFS_INFO * ntfs,
return TSK_ERR;
}
- /* The TSK design requres that each attribute have its own ID.
+ /* The TSK design requires that each attribute have its own ID.
* Therefore, we need to identify all of the unique attributes
* so that we can assign a unique ID to them.
* In this process, we will also identify the unique MFT entries to
@@ -2740,7 +2740,7 @@ ntfs_inode_lookup(TSK_FS_INFO * fs, TSK_FS_FILE * a_fs_file,
}
/* Check if the metadata is the same sequence as the name - if it was already set.
- * Note that this is not as effecient and elegant as desired, but works for now.
+ * Note that this is not as efficient and elegant as desired, but works for now.
* Better design would be to pass sequence into dinode_lookup and have a more
* obvious way to pass the desired sequence in. fs_dir_walk_lcl sets the name
* before calling this, which motivated this quick fix. */
diff --git a/tsk/fs/ntfs_dent.cpp b/tsk/fs/ntfs_dent.cpp
index 76a9c15406e1b7f15a69877085fbbcecd0fc9d16..eee43458aaffbb63e8431e7683f15dc4061c9249 100644
--- a/tsk/fs/ntfs_dent.cpp
+++ b/tsk/fs/ntfs_dent.cpp
@@ -118,7 +118,7 @@ static std::map<TSK_INUM_T, NTFS_PAR_MAP> * getParentMap(NTFS_INFO *ntfs) {
/** \internal
* Add a parent and child pair to the map stored in NTFS_INFO
*
- * Note: This routine assumes &ntfs->orhpan_map_lock is locked by the caller.
+ * Note: This routine assumes &ntfs->orphan_map_lock is locked by the caller.
*
* @param ntfs structure to add the pair to
* @param par Parent address
@@ -137,7 +137,7 @@ ntfs_parent_map_add(NTFS_INFO * ntfs, TSK_FS_META_NAME_LIST *name_list, TSK_FS_M
/** \internal
* Returns if a parent has children or not.
*
- * Note: This routine assumes &ntfs->orhpan_map_lock is locked by the caller.
+ * Note: This routine assumes &ntfs->orphan_map_lock is locked by the caller.
*
* @param ntfs File system that has already been analyzed
* @param par Parent inode to find child files for
@@ -160,7 +160,7 @@ ntfs_parent_map_exists(NTFS_INFO *ntfs, TSK_INUM_T par, uint32_t seq)
* Look up a map entry by the parent address. You should call ntfs_parent_map_exists() before this, otherwise
* an empty entry could be created.
*
- * Note: This routine assumes &ntfs->orhpan_map_lock is locked by the caller.
+ * Note: This routine assumes &ntfs->orphan_map_lock is locked by the caller.
*
* @param ntfs File system that has already been analyzed
* @param par Parent inode to find child files for
@@ -579,7 +579,7 @@ ntfs_proc_idxentry(NTFS_INFO * a_ntfs, TSK_FS_DIR * a_fs_dir,
tsk_getu16(fs->endian, a_idxe->idxlen)),
fs_name->flags);
- // WINDOS entries will not have a short 8.3 veresion, so add them now.
+ // WINDOS entries will not have a short 8.3 version, so add them now.
// otherwise, we stash the name to see if we get the 8.3 next.
if (fname->nspace == NTFS_FNAME_WINDOS) {
if (tsk_fs_dir_add(a_fs_dir, fs_name)) {
@@ -721,10 +721,10 @@ ntfs_fix_idxrec(NTFS_INFO * ntfs, ntfs_idxrec * idxrec, uint32_t len)
/** \internal
* Process a directory and load up FS_DIR with the entries. If a pointer to
-* an already allocated FS_DIR struture is given, it will be cleared. If no existing
+* an already allocated FS_DIR structure is given, it will be cleared. If no existing
* FS_DIR structure is passed (i.e. NULL), then a new one will be created. If the return
* value is error or corruption, then the FS_DIR structure could
-* have entries (depending on when the error occured).
+* have entries (depending on when the error occurred).
*
* @param a_fs File system to analyze
* @param a_fs_dir Pointer to FS_DIR pointer. Can contain an already allocated
@@ -1061,7 +1061,7 @@ ntfs_dir_open_meta(TSK_FS_INFO * a_fs, TSK_FS_DIR ** a_fs_dir,
PRIx32 "\n", off, tsk_getu32(a_fs->endian,
idxrec->magic));
- /* Is this the begining of an index record? */
+ /* Is this the beginning of an index record? */
if (tsk_getu32(a_fs->endian,
idxrec->magic) != NTFS_IDXREC_MAGIC)
continue;
@@ -1515,7 +1515,7 @@ ntfs_find_file_rec(TSK_FS_INFO * fs, NTFS_DINFO * dinfo,
* @param dir_walk_flags Flags to use during search
* @param action Callback that will be called for each name that uses the specified addresses.
* @param ptr Pointer that will be passed into action when it is called (so that you can pass in other data)
- * @returns 1 on error, 0 on sucess
+ * @returns 1 on error, 0 on success
*/
uint8_t
diff --git a/tsk/fs/tsk_fatxxfs.h b/tsk/fs/tsk_fatxxfs.h
index 42837db6712bbe5f70e221f377a3a1509e2b8c47..e315a244811f02ebd9f2c921e6df97d87883eecc 100755
--- a/tsk/fs/tsk_fatxxfs.h
+++ b/tsk/fs/tsk_fatxxfs.h
@@ -43,7 +43,7 @@
(name[0] == FATXXFS_SLOT_DELETED)
/*
- *Return 1 if c is an valid charactor for a short file name
+ *Return 1 if c is an valid character for a short file name
*
* NOTE: 0x05 is allowed in name[0], and 0x2e (".") is allowed for name[0]
* and name[1] and 0xe5 is allowed for name[0]
diff --git a/tsk/fs/tsk_fs.h b/tsk/fs/tsk_fs.h
index d927272ed9110c7c53c99e3dcfe9845e53a5b01e..e12d4d97d1682902d25c006d4cc6149b99aea25a 100644
--- a/tsk/fs/tsk_fs.h
+++ b/tsk/fs/tsk_fs.h
@@ -72,7 +72,7 @@ extern "C" {
TSK_FS_BLOCK_FLAG_META = 0x0008, ///< Block (could) contain file system metadata (and not TSK_FS_BLOCK_FLAG_CONT)
TSK_FS_BLOCK_FLAG_BAD = 0x0010, ///< Block has been marked as bad by the file system
TSK_FS_BLOCK_FLAG_RAW = 0x0020, ///< The data has been read raw from the disk (and not COMP or SPARSE)
- TSK_FS_BLOCK_FLAG_SPARSE = 0x0040, ///< The data passed in the file_walk calback was stored as sparse (all zeros) (and not RAW or COMP)
+ TSK_FS_BLOCK_FLAG_SPARSE = 0x0040, ///< The data passed in the file_walk callback was stored as sparse (all zeros) (and not RAW or COMP)
TSK_FS_BLOCK_FLAG_COMP = 0x0080, ///< The data passed in the file_walk callback was stored in a compressed form (and not RAW or SPARSE)
TSK_FS_BLOCK_FLAG_RES = 0x0100, ///< The data passed in the file_walk callback is from an NTFS resident file
TSK_FS_BLOCK_FLAG_AONLY = 0x0200 /// < The buffer in TSK_FS_BLOCK has no content (it could be non-empty, but should be ignored), but the flags and such are accurate
@@ -518,7 +518,7 @@ extern "C" {
/**
* inode walk callback function definition. This is called for every file
- * that meets the critera specified when inode_walk was called.
+ * that meets the criteria specified when inode_walk was called.
* @param a_fs_file Pointer to the current file
* @param a_ptr Pointer that was specified by caller to inode_walk
* @returns Value that tells inode walk to continue or stop
@@ -576,7 +576,7 @@ extern "C" {
#define TSK_FS_NAME_TAG 0x23147869
/**
* Generic structure to store the file name information that is stored in
- * a directory. Most file systems seperate the file name from the metadata, but
+ * a directory. Most file systems separate the file name from the metadata, but
* some do not (such as FAT). This structure contains the name and address of the
* metadata.
*/
@@ -905,7 +905,7 @@ extern "C" {
before and after the actual user sector. For example, a raw cd
image may have 16 bytes before the start of each sector.
*/
- unsigned int block_pre_size; ///< Number of bytes that preceed each block (currently only used for RAW CDs)
+ unsigned int block_pre_size; ///< Number of bytes that precede each block (currently only used for RAW CDs)
unsigned int block_post_size; ///< Number of bytes that follow each block (currently only used for RAW CDs)
/* Journal */
@@ -1200,7 +1200,7 @@ class TskFsAttrRun {
/**
* \ingroup fslib_cpp
* Stores the file name information that is stored in
-* a directory. Most file systems seperate the file name from the metadata, but
+* a directory. Most file systems separate the file name from the metadata, but
* some do not (such as FAT). This structure contains the file name and the
* address of the metadata. See TSK_FS_NAME for more details.
*/
@@ -1628,7 +1628,7 @@ extern TSK_WALK_RET_ENUM tsk_fs_jentry_walk_cpp_c_cb(TSK_FS_INFO *
a_fsInfo, TSK_FS_JENTRY * a_jentry, int a_num, void *a_ptr);
/**
* inode walk callback function definition. This is called for every file
-* that meets the critera specified when inode_walk was called.
+* that meets the criteria specified when inode_walk was called.
* @param a_fs_file Pointer to the current file
* @param a_ptr Pointer that was specified by caller to inode_walk
* @returns Value that tells inode walk to continue or stop
@@ -2161,7 +2161,7 @@ class TskFsInfo {
* \ingroup fslib_cpp
* Stores information about a file system block. Must be created by either
* allocating an empty block and opening one or by passing in a TSK_FS_BLOCK struct.
-* If NULL is passed to the contstructor and open() is not called, the other methods
+* If NULL is passed to the constructor and open() is not called, the other methods
* return undefined data. See TSK_FS_BLOCK for more details.
*/
class TskFsBlock {
@@ -2174,7 +2174,7 @@ class TskFsBlock {
public:
/**
- * constuct a TskFsBlock using a TSK_FS_BLOCK structure
+ * construct a TskFsBlock using a TSK_FS_BLOCK structure
* @param a_fsBlock a pointer of TSK_FS_BLOCK. If NULL, the getX() methods return undefined data.
*/
TskFsBlock(const TSK_FS_BLOCK * a_fsBlock) {
@@ -2183,7 +2183,7 @@ class TskFsBlock {
};
/**
- * default constructor to constuct a TskFsBlock. Must call open() before using other methods.
+ * default constructor to construct a TskFsBlock. Must call open() before using other methods.
*/
TskFsBlock() {
m_fsBlock = NULL;
@@ -2706,7 +2706,7 @@ class TskFsFile {
* that the returned class will not have the file name set because
* it was not used to load the file and this function does not search the
* directory structure to find the name that points to the address. In general,
- * if you know the metadata address of a file, this function is more effecient
+ * if you know the metadata address of a file, this function is more efficient
* then tsk_fs_file_open, which first maps a file name to the metadata address
* and then open the file using this function.
* See tsk_fs_file_open_meta() for details
@@ -2731,7 +2731,7 @@ class TskFsFile {
/**
* Return the handle structure for a specific file, given its full path. Note that
* if you have the metadata address fo the file, then tsk_fs_file_open_meta() is a
- * more effecient approach.
+ * more efficient approach.
* See tsk_fs_file_open() for details
* @param a_fs File system to analyze
* @param a_fs_file Structure to store file data in or NULL to have one allocated.
diff --git a/tsk/fs/tsk_hfs.h b/tsk/fs/tsk_hfs.h
index 21dec3135a4e2ab9b0f6503f4c2d226a47efa2be..820daec33214c746843664140a94dc12b5eb3d75 100644
--- a/tsk/fs/tsk_hfs.h
+++ b/tsk/fs/tsk_hfs.h
@@ -247,7 +247,7 @@ typedef struct {
uint8_t blk_cnt[4]; /* block count */
} hfs_ext_desc;
-/* Structre used in the extents tree */
+/* Structure used in the extents tree */
typedef struct {
hfs_ext_desc extents[8];
} hfs_extents;
diff --git a/tsk/fs/tsk_iso9660.h b/tsk/fs/tsk_iso9660.h
index 716432b32b135f465d6c5d61714df3a06cba930f..7525c009c3d448f8fdc52595360f6792903e1c29 100644
--- a/tsk/fs/tsk_iso9660.h
+++ b/tsk/fs/tsk_iso9660.h
@@ -61,7 +61,7 @@
* Contains the structures and function APIs for ISO9660 file system support.
*/
-/* refernece documents used:
+/* reference documents used:
* IEEE P1281 - System Use Sharing Protocol, version 1.12
* IEEE P1282 - Rock Ridge Interchange Protocol, version 1.12
* ECMA-119 - Volume and File Structure of CDROM for Information Interchange,
diff --git a/tsk/fs/tsk_ntfs.h b/tsk/fs/tsk_ntfs.h
index b1f695e1af62301a591256d2ef85fc54f722b296..b4a0afe6fc19a74071b614c6a288ccad99b7c392 100644
--- a/tsk/fs/tsk_ntfs.h
+++ b/tsk/fs/tsk_ntfs.h
@@ -53,7 +53,7 @@ extern "C" {
/************************************************************************
* Update sequence structure. This is located at upd_off from the
- * begining of the original structure
+ * beginning of the original structure
*/
typedef struct {
uint8_t upd_val[2]; // what they should be
diff --git a/tsk/fs/yaffs.cpp b/tsk/fs/yaffs.cpp
index ae61a2976eb582aa4e2f50962afe3f7db1132310..35c173965fdd92165ca167e46964bca5a6af413b 100644
--- a/tsk/fs/yaffs.cpp
+++ b/tsk/fs/yaffs.cpp
@@ -52,7 +52,7 @@ v** Copyright (c) 2002-2003 Brian Carrier, @stake Inc. All rights reserved
* - Since inodes are composed using the object id in the least
* significant bits and the version up higher, requesting the
* inode that matches the object id you are looking for will
-* retreive the latest version of this object.
+* retrieve the latest version of this object.
*
* - Files always exist in the latest version of their parent directory
* only.
@@ -928,7 +928,7 @@ yaffs_validate_config_file(std::map<std::string, std::string> & paramMap){
* Results of the analysis (if the format could be determined) will be stored
* in yfs variables.
*
-* @param yfs File system being anlayzed
+* @param yfs File system being analyzed
* @param maxBlocksToTest Number of block groups to scan to detect spare area or 0 if there is no limit.
* @returns TSK_ERR if format could not be detected and TSK_OK if it could be.
*/
@@ -1043,7 +1043,7 @@ yaffs_initialize_spare_format(YAFFSFS_INFO * yfs, TSK_OFF_T maxBlocksToTest){
continue;
}
- // If this block is potentially valid (i.e., the spare contains something besides 0x00 and 0xff), copy all the spares into
+ // If this block is potentialy valid (i.e., the spare contains something besides 0x00 and 0xff), copy all the spares into
// the big array of extracted spare areas
// Copy this spare area
@@ -1123,7 +1123,7 @@ yaffs_initialize_spare_format(YAFFSFS_INFO * yfs, TSK_OFF_T maxBlocksToTest){
(0xff == allSpares[thisChunkBase + currentOffset + 3])){
if(tsk_verbose && (! yfs->autoDetect)){
tsk_fprintf(stderr,
- "yaffs_initialize_spare_format: Elimimating offset %d - invalid sequence number 0xffffffff\n",
+ "yaffs_initialize_spare_format: Eliminating offset %d - invalid sequence number 0xffffffff\n",
currentOffset);
}
goodOffset = 0;
@@ -1137,7 +1137,7 @@ yaffs_initialize_spare_format(YAFFSFS_INFO * yfs, TSK_OFF_T maxBlocksToTest){
(0 == allSpares[thisChunkBase + currentOffset + 3])){
if(tsk_verbose && (! yfs->autoDetect)){
tsk_fprintf(stderr,
- "yaffs_initialize_spare_format: Elimimating offset %d - invalid sequence number 0\n",
+ "yaffs_initialize_spare_format: Eliminating offset %d - invalid sequence number 0\n",
currentOffset);
}
goodOffset = 0;
@@ -1151,7 +1151,7 @@ yaffs_initialize_spare_format(YAFFSFS_INFO * yfs, TSK_OFF_T maxBlocksToTest){
(allSpares[lastChunkBase + currentOffset + 3] != allSpares[thisChunkBase + currentOffset + 3])){
if(tsk_verbose && (! yfs->autoDetect)){
tsk_fprintf(stderr,
- "yaffs_initialize_spare_format: Elimimating offset %d - did not match previous chunk sequence number\n",
+ "yaffs_initialize_spare_format: Eliminating offset %d - did not match previous chunk sequence number\n",
currentOffset);
}
goodOffset = 0;
@@ -1165,7 +1165,7 @@ yaffs_initialize_spare_format(YAFFSFS_INFO * yfs, TSK_OFF_T maxBlocksToTest){
(0 == allSpares[thisChunkBase + currentOffset + 7])){
if(tsk_verbose && (! yfs->autoDetect)){
tsk_fprintf(stderr,
- "yaffs_initialize_spare_format: Elimimating offset %d - invalid object id 0\n",
+ "yaffs_initialize_spare_format: Eliminating offset %d - invalid object id 0\n",
currentOffset);
}
goodOffset = 0;
@@ -1184,7 +1184,7 @@ yaffs_initialize_spare_format(YAFFSFS_INFO * yfs, TSK_OFF_T maxBlocksToTest){
if(allSameByte){
if(tsk_verbose && (! yfs->autoDetect)){
tsk_fprintf(stderr,
- "yaffs_initialize_spare_format: Elimimating offset %d - all repeated bytes\n",
+ "yaffs_initialize_spare_format: Eliminating offset %d - all repeated bytes\n",
currentOffset);
}
goodOffset = 0;
@@ -1553,7 +1553,7 @@ static uint8_t
fflush(stderr);
- // Having multiple inodes point to the same object seems to cause trouble in TSK, especally in orphan file detection,
+ // Having multiple inodes point to the same object seems to cause trouble in TSK, especially in orphan file detection,
// so set the version number of the final one to zero.
// While we're at it, find the highest obj_id and the highest version (before resetting to zero)
TSK_INUM_T orphanParentID = yfs->fs_info.last_inum;
diff --git a/tsk/hashdb/binsrch_index.cpp b/tsk/hashdb/binsrch_index.cpp
index 51b8522b7fce5a59df169334da1acba492d65119..f265ca8899bea01b8e867c470b9bf0536b6783df 100755
--- a/tsk/hashdb/binsrch_index.cpp
+++ b/tsk/hashdb/binsrch_index.cpp
@@ -859,7 +859,7 @@ static uint8_t
#endif
// Allocate an array to hold the starting offsets in the index file for each
- // set of hashes with identical intitial (3) nibbles.
+ // set of hashes with identical initial (3) nibbles.
hdb_binsrch_info->idx_offsets = (uint64_t*)tsk_malloc(IDX_IDX_SIZE);
if (NULL == hdb_binsrch_info->idx_offsets) {
return 1;
@@ -1240,7 +1240,7 @@ int8_t
return -1;
}
- /* Set the delimter to NULL so we can treat the hash as a string */
+ /* Set the delimiter to NULL so we can treat the hash as a string */
hdb_binsrch_info->idx_lbuf[hdb_binsrch_info->hash_len] = '\0';
cmp = strcasecmp(hdb_binsrch_info->idx_lbuf, ucHash);
diff --git a/tsk/hashdb/encase.c b/tsk/hashdb/encase.c
index da78b1938c26f6d0264539d43198928d85efe2e5..2d6bbc2fd11eed747aa664f10d2f799d3fc6d8ce 100644
--- a/tsk/hashdb/encase.c
+++ b/tsk/hashdb/encase.c
@@ -221,7 +221,7 @@ uint8_t
memset(buf, 0, sizeof(buf));
- /* Loop so that we can find multiple occurances of the same hash */
+ /* Loop so that we can find multiple occurrences of the same hash */
fseeko(hdb_binsrch_info->hDb, offset, SEEK_SET);
while (1) {
int retval;
diff --git a/tsk/hashdb/hashkeeper.c b/tsk/hashdb/hashkeeper.c
index 2b9c209d197473d919380d1820ff25c578178a51..682d194a3be4e0cc9318b5e662be01f63d5fb47d 100644
--- a/tsk/hashdb/hashkeeper.c
+++ b/tsk/hashdb/hashkeeper.c
@@ -394,7 +394,7 @@ uint8_t
memset(pname, '0', TSK_HDB_MAXLEN);
- /* Loop so that we can find multiple occurances of the same hash */
+ /* Loop so that we can find multiple occurrences of the same hash */
while (1) {
size_t len;
diff --git a/tsk/hashdb/hdb_base.c b/tsk/hashdb/hdb_base.c
index 195524fa1e7b4bc65d0379c23c806cf863c12bc5..cb86bf560371e044ba93bdd22dd9f4b0c55ead93 100755
--- a/tsk/hashdb/hdb_base.c
+++ b/tsk/hashdb/hdb_base.c
@@ -75,7 +75,7 @@ void
* setup of values.
* @param hdb_info Allocated struct to initialize.
* @param db_path
-* @return 0 on sucess, 1 on failure.
+* @return 0 on success, 1 on failure.
*/
uint8_t
hdb_info_base_open(TSK_HDB_INFO *hdb_info, const TSK_TCHAR *db_path)
@@ -268,7 +268,7 @@ uint8_t hdb_base_rollback_transaction(TSK_HDB_INFO *hdb_info)
* \ingroup hashdblib
* De-initializes struct representation of a hash database.
* @param hdb_info Struct representation of a hash database.
-* @return 0 on sucess, 1 on failure.
+* @return 0 on success, 1 on failure.
*/
void hdb_info_base_close(TSK_HDB_INFO *hdb_info)
{
diff --git a/tsk/hashdb/md5sum.c b/tsk/hashdb/md5sum.c
index 1884a8ef6737aeb1d691b065245dde73b0f6df93..6049ae8f53a215cec242746fc6ea17860a5792c5 100644
--- a/tsk/hashdb/md5sum.c
+++ b/tsk/hashdb/md5sum.c
@@ -323,7 +323,7 @@ uint8_t
memset(pname, '0', TSK_HDB_MAXLEN);
- /* Loop so that we can find multiple occurances of the same hash */
+ /* Loop so that we can find multiple occurrences of the same hash */
while (1) {
size_t len;
diff --git a/tsk/hashdb/nsrl.c b/tsk/hashdb/nsrl.c
index ff0c342ab09fb0071649f8703b0f2b2ff936f6df..9997996d04b366ad706e0ccae8ceeb43083ed841 100644
--- a/tsk/hashdb/nsrl.c
+++ b/tsk/hashdb/nsrl.c
@@ -550,7 +550,7 @@ uint8_t
memset(pname, '0', TSK_HDB_MAXLEN);
- /* Loop so that we can find consecutive occurances of the same hash */
+ /* Loop so that we can find consecutive occurrences of the same hash */
while (1) {
size_t len;
diff --git a/tsk/hashdb/tsk_hashdb.c b/tsk/hashdb/tsk_hashdb.c
index 6fd10e4007f1865902dbe2e1e0eac3865c774dbc..325d6141445e566e260493b5a8aec442d913623f 100644
--- a/tsk/hashdb/tsk_hashdb.c
+++ b/tsk/hashdb/tsk_hashdb.c
@@ -491,7 +491,7 @@ uint8_t
* @param md5 Text representation of MD5 hash (can be NULL)
* @param sha1 Text representation of SHA1 hash (can be NULL)
* @param sha256 Text representation of SHA256 hash (can be NULL)
-* @param comment A comment to asociate with the hash (can be NULL)
+* @param comment A comment to associate with the hash (can be NULL)
* @return 1 on error, 0 on success
*/
uint8_t
diff --git a/tsk/img/ewf.c b/tsk/img/ewf.c
index fe26d55333e9f00f8106438d34f229771fcae770..64d1c1bc4cf4eec3d90dec673064981d8fc7f0ca 100644
--- a/tsk/img/ewf.c
+++ b/tsk/img/ewf.c
@@ -23,7 +23,7 @@
#if defined( HAVE_LIBEWF_V2_API )
/**
- * Get error string from libewf and make buffer emtpy if that didn't work.
+ * Get error string from libewf and make buffer empty if that didn't work.
* @returns 1 if error message was not set
*/
static uint8_t
diff --git a/tsk/img/img_open.c b/tsk/img/img_open.c
index c38f9182bd126c729407787225993f4b03edf740..4f732369deeb4acdc8d5a2fd24452eece8438288 100644
--- a/tsk/img/img_open.c
+++ b/tsk/img/img_open.c
@@ -462,7 +462,7 @@ tsk_img_open_external(
/* This interface needs some more thought because the size of wchar is not standard.
* If the goal i to provide a constant wchar interface, then we need to incorporate
* UTF-32 to UTF-8 support as well. If the goal is to provide a standard UTF-16
- * interface, we should use another type besiddes wchar_t.
+ * interface, we should use another type besides wchar_t.
*/
TSK_IMG_INFO *
tsk_img_open_utf16(int num_img,
@@ -478,7 +478,7 @@ tsk_img_open_utf16(int num_img,
TSK_ENDIAN_ENUM endian;
uint16_t tmp1;
- /* The unicode conversio routines are primarily to convert Unicode
+ /* The unicode conversion routines are primarily to convert Unicode
* in file and volume system images, which means they could be in
* an endian ordering different from the local one. We need to figure
* out our local ordering so we can give it the right flag */
diff --git a/tsk/img/img_writer.cpp b/tsk/img/img_writer.cpp
index 763dbb3320791ecca009f1f53de1b7922e54c349..d7a88296342252148ec50ba3fc7de59a8e1b9ae3 100644
--- a/tsk/img/img_writer.cpp
+++ b/tsk/img/img_writer.cpp
@@ -601,7 +601,7 @@ static TSK_RETVAL_ENUM tsk_img_writer_finish_image(TSK_IMG_WRITER* img_writer) {
/* Any method that can be accessed from WIN32 or non-WIN32 goes after this point */
/*
- * Create and initailize the TSK_IMG_WRITER struct and save reference in img_info,
+ * Create and initialize the TSK_IMG_WRITER struct and save reference in img_info,
* then write the headers to the output file
* @param img_info the TSK_IMG_INFO object
* @param outputFileName path to the VHD
@@ -730,7 +730,7 @@ TSK_RETVAL_ENUM tsk_img_writer_create(TSK_IMG_INFO * img_info, const TSK_TCHAR *
/* Offset for the first data block - 0x600 bytes for the two headers plus the BAT length*/
writer->nextDataOffset = 0x600 + batLengthOnDisk;
- /* Initialze all the bookkeeping arrays */
+ /* Initialize all the bookkeeping arrays */
writer->blockStatus = (IMG_WRITER_BLOCK_STATUS_ENUM*)tsk_malloc(writer->totalBlocks * sizeof(IMG_WRITER_BLOCK_STATUS_ENUM));
writer->blockToSectorNumber = (uint32_t*)tsk_malloc(writer->totalBlocks * sizeof(uint32_t));
writer->blockToSectorBitmap = (unsigned char **)tsk_malloc(writer->totalBlocks * sizeof(unsigned char *));
diff --git a/tsk/img/raw.c b/tsk/img/raw.c
index cdb2d9027c024d947543d54c2072e1c2253651cd..ecdeebc9b8a6cc7d0b88c8878ed0807beac49029 100644
--- a/tsk/img/raw.c
+++ b/tsk/img/raw.c
@@ -703,7 +703,7 @@ raw_open(int a_num_img, const TSK_TCHAR * const a_images[],
}
/* get size info for each file - we do not open each one because that
- * could cause us to run out of file decsriptors when we only need a few.
+ * could cause us to run out of file descriptors when we only need a few.
* The descriptors are opened as needed */
for (i = 1; i < raw_info->img_info.num_img; i++) {
TSK_OFF_T size;
diff --git a/tsk/img/vhd.c b/tsk/img/vhd.c
index ba45fedc1e3b2a32cb189e586c9a18614b29a400..24bb276a2dec8c7e38a658bea9e2e82fac354e48 100644
--- a/tsk/img/vhd.c
+++ b/tsk/img/vhd.c
@@ -20,7 +20,7 @@
#define TSK_VHDI_ERROR_STRING_SIZE 512
/**
- * Get error string from libvhdi and make buffer emtpy if that didn't work.
+ * Get error string from libvhdi and make buffer empty if that didn't work.
* @returns 1 if error message was not set
*/
static uint8_t
diff --git a/tsk/img/vmdk.c b/tsk/img/vmdk.c
index 99fbab7435b11ffe1f33b753d86128d48d1bfb8a..5c0febd46004cb4d0c3ea290288debaf3738a4f1 100644
--- a/tsk/img/vmdk.c
+++ b/tsk/img/vmdk.c
@@ -20,7 +20,7 @@
/**
- * Get error string from libvmdk and make buffer emtpy if that didn't work.
+ * Get error string from libvmdk and make buffer empty if that didn't work.
* @returns 1 if error message was not set
*/
static uint8_t
diff --git a/tsk/vs/bsd.c b/tsk/vs/bsd.c
index eeeeea093fdc5dd4d7866c22b824dfec1c20788e..d04e7e33c9a2a2a52677c30cd1ec08ad0d0ffb56 100644
--- a/tsk/vs/bsd.c
+++ b/tsk/vs/bsd.c
@@ -230,7 +230,7 @@ tsk_vs_bsd_open(TSK_IMG_INFO * img_info, TSK_DADDR_T offset)
/* use the offset provided */
vs->offset = offset;
- /* inititialize settings */
+ /* initialize settings */
vs->part_list = NULL;
vs->part_count = 0;
vs->endian = 0;
diff --git a/tsk/vs/dos.c b/tsk/vs/dos.c
index f2d0868ca893918b9e5308d7b4a52cf666f647ce..32b992d606786502766ea7aa16b771b4bc3b2716 100644
--- a/tsk/vs/dos.c
+++ b/tsk/vs/dos.c
@@ -806,7 +806,7 @@ dos_load_ext_table(TSK_VS_INFO * vs, TSK_DADDR_T sect_cur,
* This will automatically call load_ext_table for extended
* partitions
*
- * sect_cur is the addres of the table to load
+ * sect_cur is the address of the table to load
*
* 0 is returned if the load is successful and 1 if error
*/
@@ -1051,7 +1051,7 @@ tsk_vs_dos_open(TSK_IMG_INFO * img_info, TSK_DADDR_T offset, uint8_t test)
vs->offset = offset;
- /* inititialize settings */
+ /* initialize settings */
vs->part_list = NULL;
vs->part_count = 0;
vs->endian = 0;
diff --git a/tsk/vs/gpt.c b/tsk/vs/gpt.c
index 8bd510b486087326995bafd2c306aa2b2f3715ad..67ea92e6e3ac1d0609a79636021b7c9a00319d39 100644
--- a/tsk/vs/gpt.c
+++ b/tsk/vs/gpt.c
@@ -320,7 +320,7 @@ tsk_vs_gpt_open(TSK_IMG_INFO * img_info, TSK_DADDR_T offset)
/* If an offset was given, then use that too */
vs->offset = offset;
- /* inititialize settings */
+ /* initialize settings */
vs->part_list = NULL;
vs->part_count = 0;
vs->endian = 0;
diff --git a/tsk/vs/mac.c b/tsk/vs/mac.c
index 552ce26b8ea1d46e70399d0e4cca440ede024049..d37443eefa9c6989aeafe15b098b514f051e00fb 100644
--- a/tsk/vs/mac.c
+++ b/tsk/vs/mac.c
@@ -208,7 +208,7 @@ tsk_vs_mac_open(TSK_IMG_INFO * img_info, TSK_DADDR_T offset)
//vs->sect_offset = offset + MAC_PART_OFFSET;
- /* inititialize settings */
+ /* initialize settings */
vs->part_list = NULL;
vs->part_count = 0;
vs->endian = 0;
diff --git a/tsk/vs/sun.c b/tsk/vs/sun.c
index 76d803a1d0d0bf8b162881608006de02324bb7ff..7c2ce7aa0b3efe250f6602892210ae41e712bb87 100644
--- a/tsk/vs/sun.c
+++ b/tsk/vs/sun.c
@@ -359,7 +359,7 @@ tsk_vs_sun_open(TSK_IMG_INFO * img_info, TSK_DADDR_T offset)
vs->offset = offset;
- /* inititialize settings */
+ /* initialize settings */
vs->part_list = NULL;
vs->part_count = 0;
vs->endian = 0;
diff --git a/unit_tests/base/test_base.cpp b/unit_tests/base/test_base.cpp
index 403222fab2a2b7c2c935b8b98f71123f4e7e2454..c7e0f9f184740ef498aebd49cf979689c6209b26 100644
--- a/unit_tests/base/test_base.cpp
+++ b/unit_tests/base/test_base.cpp
@@ -28,10 +28,10 @@ int main(int argc, char **argv) {
runner.setOutputter( new CppUnit::CompilerOutputter( &runner.result(),
std::cerr ) );
// Run the tests.
- bool wasSucessful = runner.run();
+ bool wasSuccessful = runner.run();
// Return error code 1 if the one of test failed.
- return wasSucessful ? 0 : 1;
+ return wasSuccessful ? 0 : 1;
}