Correct some spellings.
Test: mma
Change-Id: Icc49a4ee76f12d302ed18982d334f2f70b7263a8
diff --git a/common/boot_control_stub.h b/common/boot_control_stub.h
index 7832adc..9e3b05c 100644
--- a/common/boot_control_stub.h
+++ b/common/boot_control_stub.h
@@ -27,7 +27,7 @@
// typically used when e.g. an underlying HAL implementation cannot be
// loaded or doesn't exist.
//
-// You are gauranteed that the implementation of GetNumSlots() method
+// You are guaranteed that the implementation of GetNumSlots() method
// always returns 0. This can be used to identify that this
// implementation is in use.
class BootControlStub : public BootControlInterface {
diff --git a/common/error_code.h b/common/error_code.h
index ce41d19..c7e4967 100644
--- a/common/error_code.h
+++ b/common/error_code.h
@@ -116,7 +116,7 @@
// modify the implementation of ErrorCode into a properly encapsulated class.
kDevModeFlag = 1 << 31,
- // Set if resuming an interruped update.
+ // Set if resuming an interrupted update.
kResumedFlag = 1 << 30,
// Set if using a dev/test image as opposed to an MP-signed image.
diff --git a/common/utils.cc b/common/utils.cc
index f651823..d935535 100644
--- a/common/utils.cc
+++ b/common/utils.cc
@@ -291,7 +291,10 @@
return true;
}
-bool PReadAll(const FileDescriptorPtr& fd, void* buf, size_t count, off_t offset,
+bool PReadAll(const FileDescriptorPtr& fd,
+ void* buf,
+ size_t count,
+ off_t offset,
ssize_t* out_bytes_read) {
TEST_AND_RETURN_FALSE_ERRNO(fd->Seek(offset, SEEK_SET) !=
static_cast<off_t>(-1));
@@ -774,7 +777,7 @@
if (size < offsetof(Elf32_Ehdr, e_machine) + sizeof(hdr->e_machine))
return true;
uint16_t e_machine;
- // Fix endianess regardless of the host endianess.
+ // Fix endianness regardless of the host endianness.
if (ei_data == ELFDATA2LSB)
e_machine = le16toh(hdr->e_machine);
else
diff --git a/common/utils.h b/common/utils.h
index c102a16..5c44083 100644
--- a/common/utils.h
+++ b/common/utils.h
@@ -110,7 +110,7 @@
// occurs, -1 is returned.
off_t BlockDevSize(int fd);
-// Returns the size of the file at path, or the file desciptor fd. If the file
+// Returns the size of the file at path, or the file descriptor fd. If the file
// is actually a block device, this function will automatically call
// BlockDevSize. If the file doesn't exist or some error occurrs, -1 is
// returned.
diff --git a/daemon_state_android.cc b/daemon_state_android.cc
index 0960b1a..c9c09b8 100644
--- a/daemon_state_android.cc
+++ b/daemon_state_android.cc
@@ -36,7 +36,7 @@
hardware_ = hardware::CreateHardware();
if (!hardware_) {
- LOG(ERROR) << "Error intializing the HardwareInterface.";
+ LOG(ERROR) << "Error initializing the HardwareInterface.";
return false;
}
diff --git a/omaha_request_action.cc b/omaha_request_action.cc
index 6354641..78d8d50 100644
--- a/omaha_request_action.cc
+++ b/omaha_request_action.cc
@@ -180,7 +180,7 @@
const string arg_name,
const string prefs_key) {
// There's nothing wrong with not having a given cohort setting, so we check
- // existance first to avoid the warning log message.
+ // existence first to avoid the warning log message.
if (!prefs->Exists(prefs_key))
return "";
string cohort_value;
diff --git a/p2p_manager_unittest.cc b/p2p_manager_unittest.cc
index 5ffb358..01bdc35 100644
--- a/p2p_manager_unittest.cc
+++ b/p2p_manager_unittest.cc
@@ -183,7 +183,7 @@
}
// Check that we keep files with the .$EXT.p2p extension not older
-// than some specificed age (5 days, in this test).
+// than some specific age (5 days, in this test).
TEST_F(P2PManagerTest, HousekeepingAgeLimit) {
// We set the cutoff time to be 1 billion seconds (01:46:40 UTC on 9
// September 2001 - arbitrary number, but constant to avoid test
diff --git a/payload_consumer/cached_file_descriptor_unittest.cc b/payload_consumer/cached_file_descriptor_unittest.cc
index 6a6302a..d2965fc 100644
--- a/payload_consumer/cached_file_descriptor_unittest.cc
+++ b/payload_consumer/cached_file_descriptor_unittest.cc
@@ -159,7 +159,7 @@
off64_t seek = 10;
brillo::Blob blob_in(kFileSize, 0);
std::fill_n(&blob_in[seek], kCacheSize, value_);
- // We are writing exactly one cache size; Then it should be commited.
+ // We are writing exactly one cache size; Then it should be committed.
EXPECT_EQ(cfd_->Seek(seek, SEEK_SET), seek);
Write(&blob_in[seek], kCacheSize);
@@ -174,7 +174,7 @@
EXPECT_EQ(cfd_->Seek(seek, SEEK_SET), seek);
brillo::Blob blob_in(kFileSize, 0);
std::fill_n(&blob_in[seek], less_than_cache_size, value_);
- // We are writing less than one cache size; then it should not be commited.
+ // We are writing less than one cache size; then it should not be committed.
Write(&blob_in[seek], less_than_cache_size);
// Revert the changes in |blob_in|.
@@ -190,7 +190,7 @@
EXPECT_EQ(cfd_->Seek(seek, SEEK_SET), seek);
brillo::Blob blob_in(kFileSize, 0);
std::fill_n(&blob_in[seek], less_than_cache_size, value_);
- // We are writing less than one cache size; then it should not be commited.
+ // We are writing less than one cache size; then it should not be committed.
Write(&blob_in[seek], less_than_cache_size);
// Then we seek, it should've written the cache after seek.
diff --git a/payload_consumer/file_descriptor_utils.h b/payload_consumer/file_descriptor_utils.h
index 397c35e..68fb001 100644
--- a/payload_consumer/file_descriptor_utils.h
+++ b/payload_consumer/file_descriptor_utils.h
@@ -42,7 +42,7 @@
uint64_t block_size,
brillo::Blob* hash_out);
-// Reads blocks from |source| and caculates the hash. The blocks to read are
+// Reads blocks from |source| and calculates the hash. The blocks to read are
// specified by |extents|. Stores the hash in |hash_out| if it is not null. The
// block sizes are passed as |block_size|. In case of error reading, it returns
// false and the value pointed by |hash_out| is undefined.
diff --git a/payload_generator/extent_ranges_unittest.cc b/payload_generator/extent_ranges_unittest.cc
index 3705bac..d9dd467 100644
--- a/payload_generator/extent_ranges_unittest.cc
+++ b/payload_generator/extent_ranges_unittest.cc
@@ -304,7 +304,7 @@
}
TEST(ExtentRangesTest, FilterExtentRangesMultipleRanges) {
- // Two overlaping extents, with three ranges to remove.
+ // Two overlapping extents, with three ranges to remove.
vector<Extent> extents {
ExtentForRange(10, 100),
ExtentForRange(30, 100) };
diff --git a/payload_generator/filesystem_interface.h b/payload_generator/filesystem_interface.h
index b1506e4..08dfd19 100644
--- a/payload_generator/filesystem_interface.h
+++ b/payload_generator/filesystem_interface.h
@@ -19,9 +19,9 @@
// This class is used to abstract a filesystem and iterate the blocks
// associated with the files and filesystem structures.
-// For the purposes of the update payload generation, a filesystem is a formated
-// partition composed by fixed-size blocks, since that's the interface used in
-// the update payload.
+// For the purposes of the update payload generation, a filesystem is a
+// formatted partition composed by fixed-size blocks, since that's the interface
+// used in the update payload.
#include <sys/stat.h>
#include <sys/types.h>
diff --git a/payload_generator/payload_generation_config.h b/payload_generator/payload_generation_config.h
index ca6fb04..d64bf35 100644
--- a/payload_generator/payload_generation_config.h
+++ b/payload_generator/payload_generation_config.h
@@ -154,7 +154,7 @@
// if is_full is false, so we are requested a delta payload.
ImageConfig source;
- // Wheter the requested payload is a delta payload.
+ // Whether the requested payload is a delta payload.
bool is_delta = false;
// The major/minor version of the payload.
diff --git a/payload_state.h b/payload_state.h
index d1906c2..17c1ce0 100644
--- a/payload_state.h
+++ b/payload_state.h
@@ -337,7 +337,7 @@
// Loads the number of bytes that have been currently downloaded through the
// previous attempts from the persisted state for the given source. It's
- // reset to 0 everytime we begin a full update and is continued from previous
+ // reset to 0 every time we begin a full update and is continued from previous
// attempt if we're resuming the update.
void LoadCurrentBytesDownloaded(DownloadSource source);
@@ -349,7 +349,7 @@
// Loads the total number of bytes that have been downloaded (since the last
// successful update) from the persisted state for the given source. It's
- // reset to 0 everytime we successfully apply an update and counts the bytes
+ // reset to 0 every time we successfully apply an update and counts the bytes
// downloaded for both successful and failed attempts since then.
void LoadTotalBytesDownloaded(DownloadSource source);
@@ -485,7 +485,7 @@
int32_t url_switch_count_;
// The current download source based on the current URL. This value is
- // not persisted as it can be recomputed everytime we update the URL.
+ // not persisted as it can be recomputed every time we update the URL.
// We're storing this so as not to recompute this on every few bytes of
// data we read from the socket.
DownloadSource current_download_source_;
diff --git a/real_system_state.cc b/real_system_state.cc
index 8e7ad51..0ce326b 100644
--- a/real_system_state.cc
+++ b/real_system_state.cc
@@ -62,7 +62,7 @@
hardware_ = hardware::CreateHardware();
if (!hardware_) {
- LOG(ERROR) << "Error intializing the HardwareInterface.";
+ LOG(ERROR) << "Error initializing the HardwareInterface.";
return false;
}
@@ -76,13 +76,13 @@
connection_manager_ = connection_manager::CreateConnectionManager(this);
if (!connection_manager_) {
- LOG(ERROR) << "Error intializing the ConnectionManagerInterface.";
+ LOG(ERROR) << "Error initializing the ConnectionManagerInterface.";
return false;
}
power_manager_ = power_manager::CreatePowerManager();
if (!power_manager_) {
- LOG(ERROR) << "Error intializing the PowerManagerInterface.";
+ LOG(ERROR) << "Error initializing the PowerManagerInterface.";
return false;
}
diff --git a/scripts/update_payload/checker.py b/scripts/update_payload/checker.py
index e241b0b..e9e9958 100644
--- a/scripts/update_payload/checker.py
+++ b/scripts/update_payload/checker.py
@@ -336,7 +336,7 @@
self.new_kernel_fs_size = 0
self.minor_version = None
# TODO(*): When fixing crbug.com/794404, the major version should be
- # correclty handled in update_payload scripts. So stop forcing
+ # correctly handled in update_payload scripts. So stop forcing
# major_verions=1 here and set it to the correct value.
self.major_version = 1
@@ -742,7 +742,7 @@
self.block_size,
op_name + '.data_length', 'dst')
else:
- # Check: data_length must be smaller than the alotted dst blocks.
+ # Check: data_length must be smaller than the allotted dst blocks.
if data_length >= total_dst_blocks * self.block_size:
raise error.PayloadError(
'%s: data_length (%d) must be less than allotted dst block '
@@ -867,7 +867,7 @@
if data_length is None:
raise error.PayloadError('%s: missing data_{offset,length}.' % op_name)
- # Check: data_length is strictly smaller than the alotted dst blocks.
+ # Check: data_length is strictly smaller than the allotted dst blocks.
if data_length >= total_dst_blocks * self.block_size:
raise error.PayloadError(
'%s: data_length (%d) must be smaller than allotted dst space '
diff --git a/update_attempter.cc b/update_attempter.cc
index c26a661..a1cec07 100644
--- a/update_attempter.cc
+++ b/update_attempter.cc
@@ -1421,7 +1421,7 @@
// Write out the new value of update_check_count_value.
if (prefs_->SetInt64(kPrefsUpdateCheckCount, update_check_count_value)) {
- // We successfully wrote out te new value, so enable the
+ // We successfully wrote out the new value, so enable the
// update check based wait.
LOG(INFO) << "New update check count = " << update_check_count_value;
return true;
diff --git a/update_attempter.h b/update_attempter.h
index 41b7f8e..2ec6174 100644
--- a/update_attempter.h
+++ b/update_attempter.h
@@ -160,7 +160,7 @@
BootControlInterface::Slot GetRollbackSlot() const;
// Initiates a reboot if the current state is
- // UPDATED_NEED_REBOOT. Returns true on sucess, false otherwise.
+ // UPDATED_NEED_REBOOT. Returns true on success, false otherwise.
bool RebootIfNeeded();
// DownloadActionDelegate methods:
@@ -198,7 +198,7 @@
virtual bool GetBootTimeAtUpdate(base::Time *out_boot_time);
// Returns a version OS version that was being used before the last reboot,
- // and if that reboot happended to be into an update (current version).
+ // and if that reboot happened to be into an update (current version).
// This will return an empty string otherwise.
std::string const& GetPrevVersion() const { return prev_version_; }
@@ -332,7 +332,7 @@
// Helper method of Update() to calculate the update-related parameters
// from various sources and set the appropriate state. Please refer to
- // Update() method for the meaning of the parametes.
+ // Update() method for the meaning of the parameters.
bool CalculateUpdateParams(const std::string& app_version,
const std::string& omaha_url,
const std::string& target_channel,
diff --git a/update_attempter_android_unittest.cc b/update_attempter_android_unittest.cc
index 94452df..7d0daec 100644
--- a/update_attempter_android_unittest.cc
+++ b/update_attempter_android_unittest.cc
@@ -184,7 +184,7 @@
_))
.Times(1);
- // The first update fails after receving 50 bytes in total.
+ // The first update fails after receiving 50 bytes in total.
update_attempter_android_.BytesReceived(30, 50, 200);
update_attempter_android_.ProcessingDone(nullptr, ErrorCode::kError);
EXPECT_EQ(
diff --git a/update_engine_client.cc b/update_engine_client.cc
index bb19632..94253de 100644
--- a/update_engine_client.cc
+++ b/update_engine_client.cc
@@ -396,7 +396,7 @@
string rollback_partition;
if (!client_->GetRollbackPartition(&rollback_partition)) {
- LOG(ERROR) << "Error while querying rollback partition availabilty.";
+ LOG(ERROR) << "Error while querying rollback partition availability.";
return 1;
}
diff --git a/update_manager/evaluation_context.h b/update_manager/evaluation_context.h
index df5816a..0bdbaec 100644
--- a/update_manager/evaluation_context.h
+++ b/update_manager/evaluation_context.h
@@ -114,7 +114,7 @@
// there's no cached variable, this method returns false.
//
// Right before the passed closure is called the EvaluationContext is
- // reseted, removing all the non-const cached values.
+ // reset, removing all the non-const cached values.
bool RunOnValueChangeOrTimeout(base::Closure callback);
// Returns a textual representation of the evaluation context,
diff --git a/update_manager/policy.h b/update_manager/policy.h
index b60c4da..05bb2ad 100644
--- a/update_manager/policy.h
+++ b/update_manager/policy.h
@@ -118,7 +118,7 @@
// Information pertaining to update scattering.
//
- // The currently knwon (persisted) scattering wallclock-based wait period and
+ // The currently known (persisted) scattering wallclock-based wait period and
// update check threshold; zero if none.
base::TimeDelta scatter_wait_period;
int scatter_check_threshold;
diff --git a/update_metadata.proto b/update_metadata.proto
index 7ff032a..fe81efb 100644
--- a/update_metadata.proto
+++ b/update_metadata.proto
@@ -82,7 +82,7 @@
// the new partition.
//
// The operations allowed in the payload (supported by the client) depend on the
-// major and minor version. See InstallOperation.Type bellow for details.
+// major and minor version. See InstallOperation.Type below for details.
syntax = "proto2";