diff --git a/README.rst b/README.rst index 29a38d5..279a755 100644 --- a/README.rst +++ b/README.rst @@ -539,11 +539,11 @@ severity level. "program with --v=1 or more"; VLOG_EVERY_N(1, 10) << "I’m printed every 10th occurrence, and when you run the program " - "with --v=1 or more. Present occurence is " << google::COUNTER; + "with --v=1 or more. Present occurrence is " << google::COUNTER; VLOG_IF_EVERY_N(1, (size > 1024), 10) - << "I’m printed on every 10th occurence of case when size is more " + << "I’m printed on every 10th occurrence of case when size is more " " than 1024, when you run the program with --v=1 or more. "; - "Present occurence is " << google::COUNTER; + "Present occurrence is " << google::COUNTER; Custom Log Prefix Format diff --git a/cmake/TestPackageConfig.cmake b/cmake/TestPackageConfig.cmake index 97244ab..9aa5df0 100644 --- a/cmake/TestPackageConfig.cmake +++ b/cmake/TestPackageConfig.cmake @@ -21,7 +21,7 @@ execute_process ( # Capture the PATH environment variable content set during project generation # stage. This is required because later during the build stage the PATH is # modified again (e.g., for MinGW AppVeyor CI builds) by adding back the - # directory containing git.exe. Incidently, the Git installation directory + # directory containing git.exe. Incidentally, the Git installation directory # also contains sh.exe which causes MinGW Makefile generation to fail. COMMAND ${CMAKE_COMMAND} -E env PATH=${PATH} ${CMAKE_COMMAND} -C ${INITIAL_CACHE} diff --git a/src/demangle.cc b/src/demangle.cc index b19d446..3dde4a6 100644 --- a/src/demangle.cc +++ b/src/demangle.cc @@ -294,7 +294,7 @@ static void MaybeAppendWithLength(State *state, const char * const str, } } -// A convenient wrapper arount MaybeAppendWithLength(). +// A convenient wrapper around MaybeAppendWithLength(). static bool MaybeAppend(State *state, const char * const str) { if (state->append) { size_t length = StrLen(str); diff --git a/src/demangle_unittest.cc b/src/demangle_unittest.cc index 144781c..ab3653d 100644 --- a/src/demangle_unittest.cc +++ b/src/demangle_unittest.cc @@ -80,7 +80,7 @@ TEST(Demangle, Windows) { #else -// Test corner cases of bounary conditions. +// Test corner cases of boundary conditions. TEST(Demangle, CornerCases) { const size_t size = 10; char tmp[size] = { 0 }; diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in index e8e6c41..09f9645 100644 --- a/src/glog/logging.h.in +++ b/src/glog/logging.h.in @@ -290,11 +290,11 @@ typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, vo // "program with --v=1 or more"; // VLOG_EVERY_N(1, 10) // << "I'm printed every 10th occurrence, and when you run the program " -// "with --v=1 or more. Present occurence is " << google::COUNTER; +// "with --v=1 or more. Present occurrence is " << google::COUNTER; // VLOG_IF_EVERY_N(1, (size > 1024), 10) -// << "I'm printed on every 10th occurence of case when size is more " +// << "I'm printed on every 10th occurrence of case when size is more " // " than 1024, when you run the program with --v=1 or more. "; -// "Present occurence is " << google::COUNTER; +// "Present occurrence is " << google::COUNTER; // // The supported severity levels for macros that allow you to specify one // are (in increasing order of severity) INFO, WARNING, ERROR, and FATAL. @@ -842,7 +842,7 @@ DEFINE_CHECK_OP_IMPL(Check_GT, > ) #define CHECK_OP_LOG(name, op, val1, val2, log) CHECK((val1) op (val2)) #elif DCHECK_IS_ON() // In debug mode, avoid constructing CheckOpStrings if possible, -// to reduce the overhead of CHECK statments by 2x. +// to reduce the overhead of CHECK statements by 2x. // Real DCHECK-heavy tests have seen 1.5x speedups. // The meaning of "string" might be different between now and @@ -1425,7 +1425,7 @@ public: // is so that streaming can be done more efficiently. static const size_t kMaxLogMessageLen; - // Theses should not be called directly outside of logging.*, + // These should not be called directly outside of logging.*, // only passed as SendMethod arguments to other LogMessage methods: void SendToLog(); // Actually dispatch to the logs void SendToSyslogAndLog(); // Actually dispatch to syslog and the logs @@ -1652,8 +1652,8 @@ GLOG_EXPORT void LogToStderr(); GLOG_EXPORT void SetEmailLogging(LogSeverity min_severity, const char* addresses); -// A simple function that sends email. dest is a commma-separated -// list of addressess. Thread-safe. +// A simple function that sends email. dest is a comma-separated +// list of addresses. Thread-safe. GLOG_EXPORT bool SendEmail(const char* dest, const char* subject, const char* body); diff --git a/src/glog/vlog_is_on.h.in b/src/glog/vlog_is_on.h.in index ed37e0d..15dee61 100644 --- a/src/glog/vlog_is_on.h.in +++ b/src/glog/vlog_is_on.h.in @@ -104,7 +104,7 @@ struct SiteFlag { SiteFlag* next; }; -// Helper routine which determines the logging info for a particalur VLOG site. +// Helper routine which determines the logging info for a particular VLOG site. // site_flag is the address of the site-local pointer to the controlling // verbosity level // site_default is the default to use for *site_flag diff --git a/src/logging_unittest.cc b/src/logging_unittest.cc index 61039a3..85e8516 100644 --- a/src/logging_unittest.cc +++ b/src/logging_unittest.cc @@ -376,7 +376,7 @@ void TestRawLogging() { FlagSaver saver; - // Check that RAW loggging does not use mallocs. + // Check that RAW logging does not use mallocs. NewHook new_hook; RAW_LOG(INFO, "%s%s%d%c%f", foo->c_str(), "bar ", 10, ' ', 3.4); diff --git a/src/stacktrace_powerpc-inl.h b/src/stacktrace_powerpc-inl.h index 30217db..af95adb 100644 --- a/src/stacktrace_powerpc-inl.h +++ b/src/stacktrace_powerpc-inl.h @@ -121,7 +121,7 @@ int GetStackTrace(void** result, int max_depth, int skip_count) { // This check is in case the compiler doesn't define _CALL_SYSV. result[n++] = *(sp+1); #else -#error Need to specify the PPC ABI for your archiecture. +#error Need to specify the PPC ABI for your architecture. #endif } // Use strict unwinding rules. diff --git a/src/utilities.h b/src/utilities.h index 45e555b..5d8f1c5 100644 --- a/src/utilities.h +++ b/src/utilities.h @@ -29,7 +29,7 @@ // // Author: Shinichiro Hamaji // -// Define utilties for glog internal usage. +// Define utilities for glog internal usage. #ifndef UTILITIES_H__ #define UTILITIES_H__ @@ -174,7 +174,7 @@ inline T sync_val_compare_and_swap(T* ptr, T oldval, T newval) { :"=a"(ret) // GCC may produces %sil or %dil for // constraint "r", but some of apple's gas - // dosn't know the 8 bit registers. + // doesn't know the 8 bit registers. // We use "q" to avoid these registers. :"q"(newval), "q"(ptr), "a"(oldval) :"memory", "cc");