Fix a bunch of typos.

kilobyte · kilobyte · commit 3292e6fa257f · 2021-03-06T02:08:07.000+01:00
diff --git a/ChangeLog b/ChangeLog
@@ -58,7 +58,7 @@ Wed Sep 30 2020 Szymon Romik <szymon.romik@intel.com>
 	- string_view class (support for compilers older than C++17)
 	- experimental self_relative_ptr and std::atomic<self_relative_ptr>
 		specialization (persistent smart ptr which encapsulates the self
-		offseted pointer and provides member access, dereference and
+		offsetted pointer and provides member access, dereference and
 		array access operators - for some workloads it could be faster
 		alternative for persistent_ptr)
 
@@ -88,7 +88,7 @@ Thu May 28 2020 Szymon Romik <szymon.romik@intel.com>
 
 	Optimizations:
 	- optimized clear() and erase() for trivial types in segment_vector
-	- optimized move constructor and assignement for basic_string
+	- optimized move constructor and assignment for basic_string
 
 	Bug Fixes:
 	- fixed free_data() in concurrent_hash_map
diff --git a/cmake/functions.cmake b/cmake/functions.cmake
@@ -201,7 +201,7 @@ endfunction()
 # src version shows the current version, as reported by git describe
 # unless git is not available, then it's set to the recently released VERSION
 function(set_source_ver SRCVERSION)
-	# if there's version file commited, use it
+	# if there's version file committed, use it
 	if(EXISTS "${LIBPMEMOBJCPP_ROOT_DIR}/.version")
 		file(STRINGS ${LIBPMEMOBJCPP_ROOT_DIR}/.version FILE_VERSION)
 		set(SRCVERSION ${FILE_VERSION} PARENT_SCOPE)
diff --git a/examples/concurrent_hash_map/concurrent_hash_map.cpp b/examples/concurrent_hash_map/concurrent_hash_map.cpp
@@ -186,7 +186,7 @@ main(int argc, char *argv[])
 		}
 		pop.close();
 	} catch (std::exception &e) {
-		std::cerr << "Exception occured: " << e.what() << std::endl;
+		std::cerr << "Exception occurred: " << e.what() << std::endl;
 		try {
 			pop.close();
 		} catch (const std::logic_error &e) {
diff --git a/examples/concurrent_hash_map/concurrent_hash_map_string.cpp b/examples/concurrent_hash_map/concurrent_hash_map_string.cpp
@@ -203,7 +203,7 @@ main(int argc, char *argv[])
 			});
 		}
 	} catch (std::exception &e) {
-		std::cerr << "Exception occured: " << e.what() << std::endl;
+		std::cerr << "Exception occurred: " << e.what() << std::endl;
 		retval = -1;
 	}
 	try {
diff --git a/examples/radix_tree/radix_tree_inline_string.cpp b/examples/radix_tree/radix_tree_inline_string.cpp
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-/* Copyright 2020, Intel Corporation */
+/* Copyright 2020-2021, Intel Corporation */
 
 /**
  * radix_tree_inline_string.cpp -- example which shows how to use
@@ -62,7 +62,7 @@ insert_elements_kv(pmem::obj::pool<root> pop)
 		assert(pmem::obj::string_view(it->value())
 			       .compare("some long string") == 0);
 
-		/* If reallocation happend on assign_val, it2 will be
+		/* If reallocation happened on assign_val, it2 will be
 		 * invalidated */
 		(void)it2;
 
diff --git a/include/libpmemobj++/container/basic_string.hpp b/include/libpmemobj++/container/basic_string.hpp
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-/* Copyright 2019-2020, Intel Corporation */
+/* Copyright 2019-2021, Intel Corporation */
 
 /**
  * @file
@@ -697,7 +697,7 @@ basic_string<CharT, Traits>::basic_string(std::initializer_list<CharT> ilist)
 }
 
 /**
- * Implicitly converts argument to a string view then initilizes
+ * Implicitly converts argument to a string view then initializes
  * the string with the content of string view.
  *
  * @param[in] t object (convertible to std::basic_string_view)
@@ -725,7 +725,7 @@ basic_string<CharT, Traits>::basic_string(const T &t)
 }
 
 /**
- * Implicitly converts argument to a string view then initilizes
+ * Implicitly converts argument to a string view then initializes
  * the string with the subrange [pos, pos + n) of string view.
  *
  * @param[in] t object (convertible to std::basic_string_view)
diff --git a/include/libpmemobj++/container/concurrent_hash_map.hpp b/include/libpmemobj++/container/concurrent_hash_map.hpp
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-/* Copyright 2019-2020, Intel Corporation */
+/* Copyright 2019-2021, Intel Corporation */
 
 /**
  * @file
@@ -1028,7 +1028,7 @@ class hash_map_base {
 
 	/*
 	 * Should be called before concurrent_hash_map destructor is called.
-	 * Otherwise, program can terminate if an exception occurs wile freeing
+	 * Otherwise, program can terminate if an exception occurs while freeing
 	 * memory inside dtor.
 	 */
 	void
diff --git a/include/libpmemobj++/container/detail/concurrent_skip_list_impl.hpp b/include/libpmemobj++/container/detail/concurrent_skip_list_impl.hpp
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-/* Copyright 2020, Intel Corporation */
+/* Copyright 2020-2021, Intel Corporation */
 
 #ifndef PMEMOBJ_CONCURRENT_SKIP_LIST_IMPL_HPP
 #define PMEMOBJ_CONCURRENT_SKIP_LIST_IMPL_HPP
@@ -720,8 +720,8 @@ class concurrent_skip_list {
 	}
 
 	/**
-	 * Intialize concurrent_skip_list after process restart.
-	 * MUST be called everytime after process restart.
+	 * Initialize concurrent_skip_list after process restart.
+	 * MUST be called every time after process restart.
 	 * Not thread safe.
 	 *
 	 */
@@ -3060,7 +3060,7 @@ class concurrent_skip_list {
 	 * Each node object has different size which depends on number of layers
 	 * the node is linked. In this method we calculate the size of the new
 	 * node based on the node height. Then required amount of bytes are
-	 * allcoated and casted to the persistent_node_ptr.
+	 * allocated and casted to the persistent_node_ptr.
 	 *
 	 * @pre Should be called inside transaction.
 	 */
diff --git a/include/libpmemobj++/detail/self_relative_ptr_base_impl.hpp b/include/libpmemobj++/detail/self_relative_ptr_base_impl.hpp
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-/* Copyright 2020, Intel Corporation */
+/* Copyright 2020-2021, Intel Corporation */
 
 /**
  * @file
@@ -291,7 +291,7 @@ class self_relative_ptr_base_impl {
 };
 
 /**
- * Static class accesssor to self_relative_ptr_base
+ * Static class accessor to self_relative_ptr_base
  */
 template <typename T>
 class self_relative_accessor {
diff --git a/include/libpmemobj++/experimental/self_relative_ptr.hpp b/include/libpmemobj++/experimental/self_relative_ptr.hpp
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-/* Copyright 2020, Intel Corporation */
+/* Copyright 2020-2021, Intel Corporation */
 
 /**
  * @file
@@ -25,7 +25,7 @@ namespace experimental
  * Persistent self-relative pointer class.
  *
  * self_relative_ptr implements a smart ptr. It encapsulates the
- * self offseted pointer and provides member access, dereference and array
+ * self offsetted pointer and provides member access, dereference and array
  * access operators.
  *
  * @includedoc shared/pointer_requirements.txt
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -104,7 +104,7 @@ endif()
 
 # Produce general warnings, e.g. when a command/tool is missing
 if(NOT GDB_FOUND)
-	message(WARNING "GDB was not found - skipping some tests. To fix, make sure `gdb` command is OS-wide accesible.")
+	message(WARNING "GDB was not found - skipping some tests. To fix, make sure `gdb` command is OS-wide accessible.")
 endif()
 
 # ----------------------------------------------------------------- #
diff --git a/tests/compatibility/CMakeLists.txt b/tests/compatibility/CMakeLists.txt
@@ -7,7 +7,7 @@ include(ExternalProject)
 set(COMPATIBILITY_TEST_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/headers)
 
 # Add external cmake projects with libpmemobj-cpp in selected {version}
-# to build their headers (to include in compatbility tests).
+# to build their headers (to include in compatibility tests).
 function(add_libpmemobj_cpp version)
     ExternalProject_Add(libpmemobj-cpp-${version}
         GIT_REPOSITORY https://github.com/pmem/libpmemobj-cpp
diff --git a/tests/concurrent_hash_map/concurrent_hash_map_defrag.cpp b/tests/concurrent_hash_map/concurrent_hash_map_defrag.cpp
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-/* Copyright 2020, Intel Corporation */
+/* Copyright 2020-2021, Intel Corporation */
 
 /*
  * concurrent_hash_map_defrag.cpp -- pmem::obj::concurrent_hash_map test
@@ -198,7 +198,7 @@ erase_defrag_concurrent_test(nvobj::pool<root> &pop, bool reversed_order,
 
 	size_t cnt = 0;
 	for (auto &v : *map) {
-		/* first NUMBER_ITEMS_SAVE elements wont be erased */
+		/* first NUMBER_ITEMS_SAVE elements won't be erased */
 		if (cnt++ < NUMBER_ITEMS_SAVE)
 			elements_to_save.push_back(
 				std::string(v.first.c_str()));
diff --git a/tests/concurrent_hash_map/concurrent_hash_map_singlethread.cpp b/tests/concurrent_hash_map/concurrent_hash_map_singlethread.cpp
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-/* Copyright 2018-2020, Intel Corporation */
+/* Copyright 2018-2021, Intel Corporation */
 
 /*
  * concurrent_hash_map.cpp -- pmem::obj::concurrent_hash_map test
@@ -191,7 +191,7 @@ tx_alloc_wrapper(nvobj::pool_base &pop, nvobj::persistent_ptr<U> &ptr,
 }
 
 /*
- * ctor_test -- (internal) test constrcutors
+ * ctor_test -- (internal) test constructors
  * pmem::obj::concurrent_hash_map<nvobj::p<int>, nvobj::p<int> >
  */
 void
diff --git a/tests/external/CMakeLists.txt b/tests/external/CMakeLists.txt
@@ -1272,7 +1272,7 @@ if (TEST_CONCURRENT_MAP)
 	build_test_ext(NAME map_libcxx_count SRC_FILES libcxx/map/map.ops/count.pass.cpp BUILD_OPTIONS -DLIBPMEMOBJ_CPP_TESTS_CONCURRENT_MAP)
 	add_test_generic(NAME map_libcxx_count TRACERS none pmemcheck memcheck)
 
-	# Test map with std::less<void> avaialable from C++14. Rest of the tests use custom implementation based on std::less.
+	# Test map with std::less<void> available from C++14. Rest of the tests use custom implementation based on std::less.
 	if (CXX_STANDARD GREATER 11)
 		build_test_ext(NAME map_libcxx_count_std_less SRC_FILES libcxx/map/map.ops/count.pass.cpp BUILD_OPTIONS -DLIBPMEMOBJ_CPP_TESTS_CONCURRENT_MAP -DLIBPMEMOBJ_CPP_TESTS_USE_STD_LESS)
 		add_test_generic(NAME map_libcxx_count_std_less TRACERS none pmemcheck memcheck)
diff --git a/tests/external/libcxx/map/map.cons/dtor_noexcept.pass.cpp b/tests/external/libcxx/map/map.cons/dtor_noexcept.pass.cpp
@@ -101,7 +101,7 @@ run(pmem::obj::pool<root> &pop)
 		typedef nvobjex::concurrent_map<MoveOnly, MoveOnly> C;
 		static_assert(std::is_nothrow_destructible<C>::value, "");
 	}
-#ifdef XXX // XXX: Implemenet test_allocator and other_allocator class
+#ifdef XXX // XXX: Implement test_allocator and other_allocator class
 	typedef std::pair<const MoveOnly, MoveOnly> V;
 	{
 		typedef nvobjex::concurrent_map<MoveOnly, MoveOnly,
diff --git a/utils/docker/pull-or-rebuild-image.sh b/utils/docker/pull-or-rebuild-image.sh
@@ -18,7 +18,7 @@
 # 2. "rebuild" param was passed as a first argument to this script.
 #
 # The script pulls the Docker image if:
-# 1. it does not have to be rebuilt (based on commited changes), or
+# 1. it does not have to be rebuilt (based on committed changes), or
 # 2. "pull" param was passed as a first argument to this script.
 #
 
@@ -85,7 +85,7 @@ elif [[ "${1}" == "pull" ]]; then
 fi
 
 # Determine if we need to rebuild the image or just pull it from
-# the Container Registry, based on commited changes.
+# the Container Registry, based on committed changes.
 if [ -n "${CI_COMMIT_RANGE}" ]; then
 	commits=$(git rev-list ${CI_COMMIT_RANGE})
 else
diff --git a/utils/docker/set-ci-vars.sh b/utils/docker/set-ci-vars.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2020, Intel Corporation
+# Copyright 2020-2021, Intel Corporation
 
 #
 # set-ci-vars.sh -- set CI variables common for both:
@@ -29,7 +29,7 @@ function get_commit_range_from_last_merge {
 		fi
 	elif [ "${LAST_MERGE}" == "${LAST_COMMIT}" ] &&
 		([ "${TRAVIS_EVENT_TYPE}" == "push" ] || [ "${GITHUB_EVENT_NAME}" == "push" ]); then
-		# Other case in which last commit equals last merge, is when commiting
+		# Other case in which last commit equals last merge, is when committing
 		# a manual merge. Push events don't set proper COMMIT_RANGE.
 		# It has to be then set: from merge's left parent to the current commit.
 		LAST_MERGE=$(git log --merges --pretty=%P -1 | cut -d" " -f1)

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ main(int argc, char *argv[])`
`186`	`186`	`}`
`187`	`187`	`pop.close();`
`188`	`188`	`} catch (std::exception &e) {`
`189`		`- std::cerr << "Exception occured: " << e.what() << std::endl;`
	`189`	`+ std::cerr << "Exception occurred: " << e.what() << std::endl;`
`190`	`190`	`try {`
`191`	`191`	`pop.close();`
`192`	`192`	`} catch (const std::logic_error &e) {`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ main(int argc, char *argv[])`
`203`	`203`	`});`
`204`	`204`	`}`
`205`	`205`	`} catch (std::exception &e) {`
`206`		`- std::cerr << "Exception occured: " << e.what() << std::endl;`
	`206`	`+ std::cerr << "Exception occurred: " << e.what() << std::endl;`
`207`	`207`	`retval = -1;`
`208`	`208`	`}`
`209`	`209`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`// SPDX-License-Identifier: BSD-3-Clause`
`2`		`-/* Copyright 2019-2020, Intel Corporation */`
	`2`	`+/* Copyright 2019-2021, Intel Corporation */`
`3`	`3`
`4`	`4`	`/**`
`5`	`5`	`* @file`
`@@ -697,7 +697,7 @@ basic_string<CharT, Traits>::basic_string(std::initializer_list<CharT> ilist)`
`697`	`697`	`}`
`698`	`698`
`699`	`699`	`/**`
`700`		`- * Implicitly converts argument to a string view then initilizes`
	`700`	`+ * Implicitly converts argument to a string view then initializes`
`701`	`701`	`* the string with the content of string view.`
`702`	`702`	`*`
`703`	`703`	`* @param[in] t object (convertible to std::basic_string_view)`
`@@ -725,7 +725,7 @@ basic_string<CharT, Traits>::basic_string(const T &t)`
`725`	`725`	`}`
`726`	`726`
`727`	`727`	`/**`
`728`		`- * Implicitly converts argument to a string view then initilizes`
	`728`	`+ * Implicitly converts argument to a string view then initializes`
`729`	`729`	`* the string with the subrange [pos, pos + n) of string view.`
`730`	`730`	`*`
`731`	`731`	`* @param[in] t object (convertible to std::basic_string_view)`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`// SPDX-License-Identifier: BSD-3-Clause`
`2`		`-/* Copyright 2020, Intel Corporation */`
	`2`	`+/* Copyright 2020-2021, Intel Corporation */`
`3`	`3`
`4`	`4`	`/**`
`5`	`5`	`* @file`
`@@ -25,7 +25,7 @@ namespace experimental`
`25`	`25`	`* Persistent self-relative pointer class.`
`26`	`26`	`*`
`27`	`27`	`* self_relative_ptr implements a smart ptr. It encapsulates the`
`28`		`- * self offseted pointer and provides member access, dereference and array`
	`28`	`+ * self offsetted pointer and provides member access, dereference and array`
`29`	`29`	`* access operators.`
`30`	`30`	`*`
`31`	`31`	`* @includedoc shared/pointer_requirements.txt`