From 3808d091f86e079c8f3437f5cd66bd2c507cef8a Mon Sep 17 00:00:00 2001 From: Otto Kekäläinen Date: Sun, 3 Jul 2016 15:26:04 +0300 Subject: Fix spelling in strings and comments --- cmake/examples.cmake | 4 ++-- conformance/ConformanceJavaLite.java | 4 ++-- java/README.md | 4 ++-- java/compatibility_tests/README.md | 4 ++-- java/compatibility_tests/v2.5.0/test.sh | 8 +++---- .../java/com/google/protobuf/AbstractMessage.java | 12 +++++----- .../main/java/com/google/protobuf/ByteString.java | 28 +++++++++++----------- .../com/google/protobuf/LiteEqualsAndHashTest.java | 2 +- .../google/protobuf/nano/MessageNanoPrinter.java | 2 +- php/ext/google/protobuf/upb.h | 2 +- python/google/protobuf/descriptor.py | 6 ++--- python/google/protobuf/internal/_parameterized.py | 2 +- ruby/ext/google/protobuf_c/upb.h | 2 +- ruby/lib/google/protobuf/repeated_field.rb | 2 +- .../protobuf/compiler/command_line_interface.cc | 2 +- src/google/protobuf/compiler/cpp/cpp_message.h | 2 +- src/google/protobuf/compiler/java/java_helpers.h | 2 +- .../protobuf/compiler/java/java_string_field.cc | 2 +- src/google/protobuf/compiler/js/js_generator.cc | 2 +- .../compiler/objectivec/objectivec_field.cc | 2 +- src/google/protobuf/compiler/parser.h | 2 +- .../protobuf/generated_message_reflection.cc | 2 +- src/google/protobuf/io/tokenizer.h | 2 +- src/google/protobuf/map_entry.h | 2 +- src/google/protobuf/map_field.h | 4 ++-- src/google/protobuf/map_field_lite.h | 2 +- src/google/protobuf/map_lite_unittest.proto | 2 +- src/google/protobuf/map_test.cc | 2 +- src/google/protobuf/map_unittest.proto | 2 +- src/google/protobuf/reflection.h | 2 +- src/google/protobuf/repeated_field.h | 2 +- src/google/protobuf/repeated_field_reflection.h | 2 +- src/google/protobuf/stubs/bytestream.h | 2 +- src/google/protobuf/util/field_comparator.cc | 2 +- src/google/protobuf/util/internal/proto_writer.h | 2 +- src/google/protobuf/util/message_differencer.cc | 2 +- src/google/protobuf/util/message_differencer.h | 2 +- .../protobuf/util/message_differencer_unittest.cc | 2 +- src/google/protobuf/wire_format.h | 2 +- 39 files changed, 67 insertions(+), 67 deletions(-) diff --git a/cmake/examples.cmake b/cmake/examples.cmake index 83d0e988..0a651051 100644 --- a/cmake/examples.cmake +++ b/cmake/examples.cmake @@ -37,7 +37,7 @@ mark_as_advanced(protobuf_BUILD_EXAMPLES_MULTITEST) if(protobuf_BUILD_EXAMPLES_MULTITEST) set_property(GLOBAL PROPERTY USE_FOLDERS ON) - #Build using the legacy compatiblity module. + #Build using the legacy compatibility module. add_examples_build(examples-legacy "-Dprotobuf_DIR:PATH=${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_CMAKEDIR}" "-Dprotobuf_MODULE_COMPATIBLE:BOOL=TRUE" @@ -49,7 +49,7 @@ if(protobuf_BUILD_EXAMPLES_MULTITEST) "-Dprotobuf_DIR:PATH=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_CMAKEDIR}" ) - #Build using the installed library in legacy compatiblity mode. + #Build using the installed library in legacy compatibility mode. add_examples_build(examples-installed-legacy "-Dprotobuf_DIR:PATH=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_CMAKEDIR}" "-Dprotobuf_MODULE_COMPATIBLE:BOOL=TRUE" diff --git a/conformance/ConformanceJavaLite.java b/conformance/ConformanceJavaLite.java index 121dc7d1..016f7932 100644 --- a/conformance/ConformanceJavaLite.java +++ b/conformance/ConformanceJavaLite.java @@ -58,7 +58,7 @@ class ConformanceJavaLite { } case JSON_PAYLOAD: { return Conformance.ConformanceResponse.newBuilder().setSkipped( - "Lite runtime does not suport Json Formant.").build(); + "Lite runtime does not support JSON format.").build(); } case PAYLOAD_NOT_SET: { throw new RuntimeException("Request didn't have payload."); @@ -78,7 +78,7 @@ class ConformanceJavaLite { case JSON: return Conformance.ConformanceResponse.newBuilder().setSkipped( - "Lite runtime does not suport Json Formant.").build(); + "Lite runtime does not support JSON format.").build(); default: { throw new RuntimeException("Unexpected request output."); diff --git a/java/README.md b/java/README.md index 83f91e18..0e0fba64 100644 --- a/java/README.md +++ b/java/README.md @@ -88,7 +88,7 @@ Compatibility Notice * Protobuf minor version releases are backwards-compatible. If your code can build/run against the old version, it's expected to build/run against - the new version as well. Both binary compatibility and source compatbility + the new version as well. Both binary compatibility and source compatibility are guaranteed for minor version releases if the user follows the guideline described in this section. @@ -98,7 +98,7 @@ Compatibility Notice * APIs marked with the @ExperimentalApi annotation are subject to change. They can be modified in any way, or even removed, at any time. Don't use them if - compatiblity is needed. If your code is a library itself (i.e. it is used on + compatibility is needed. If your code is a library itself (i.e. it is used on the CLASSPATH of users outside your own control), you should not use experimental APIs, unless you repackage them (e.g. using ProGuard). diff --git a/java/compatibility_tests/README.md b/java/compatibility_tests/README.md index 2465941e..72c6034c 100644 --- a/java/compatibility_tests/README.md +++ b/java/compatibility_tests/README.md @@ -5,7 +5,7 @@ previously released versions. ## Directory Layout -For each released protobuf version we are testing compatiblity with, there +For each released protobuf version we are testing compatibility with, there is a sub-directory with the following layout (take v2.5.0 as an example): * v2.5.0 @@ -47,4 +47,4 @@ For each version, the test script will test: * only upgrading more_protos to the new version and see whether everything builds/runs fine. Both source compatibility and -binary compatiblity will be tested. +binary compatibility will be tested. diff --git a/java/compatibility_tests/v2.5.0/test.sh b/java/compatibility_tests/v2.5.0/test.sh index 05503bb1..b7922b1a 100755 --- a/java/compatibility_tests/v2.5.0/test.sh +++ b/java/compatibility_tests/v2.5.0/test.sh @@ -11,7 +11,7 @@ TEST_VERSION=`grep "^ .*" pom.xml | sed "s| \(.*\) # The old version of protobuf that we are testing compatibility against. This # is usually the same as TEST_VERSION (i.e., we use the tests extracted from -# that version to test compatibilty of the newest runtime against it), but it +# that version to test compatibility of the newest runtime against it), but it # is also possible to use this same test set to test the compatibiilty of the # latest version against other versions. case "$1" in @@ -40,7 +40,7 @@ esac # Extract the latest protobuf version number. VERSION_NUMBER=`grep "^ .*" ../../pom.xml | sed "s| \(.*\)|\1|"` -echo "Running compatibilty tests between $VERSION_NUMBER and $OLD_VERSION" +echo "Running compatibility tests between $VERSION_NUMBER and $OLD_VERSION" # Check protoc [ -f ../../../src/protoc ] || { @@ -55,7 +55,7 @@ echo "Running compatibilty tests between $VERSION_NUMBER and $OLD_VERSION" popd } -# Download old version source for the compatiblity test +# Download old version source for the compatibility test [ -d protobuf ] || { git clone https://github.com/google/protobuf.git cd protobuf @@ -92,7 +92,7 @@ mvn clean test \ # jar against the new runtime directly without recompile. # Collect all test dependencies in a single jar file (except for protobuf) to -# make it easier to run binary compatibilty test (where we will need to run +# make it easier to run binary compatibility test (where we will need to run # the jar files directly). cd deps mvn assembly:single diff --git a/java/core/src/main/java/com/google/protobuf/AbstractMessage.java b/java/core/src/main/java/com/google/protobuf/AbstractMessage.java index b8fdb2b2..46ddbf48 100644 --- a/java/core/src/main/java/com/google/protobuf/AbstractMessage.java +++ b/java/core/src/main/java/com/google/protobuf/AbstractMessage.java @@ -498,7 +498,7 @@ public abstract class AbstractMessage * override this method. */ void markClean() { - throw new IllegalStateException("Should be overriden by subclasses."); + throw new IllegalStateException("Should be overridden by subclasses."); } /** @@ -510,7 +510,7 @@ public abstract class AbstractMessage * override this method. */ void dispose() { - throw new IllegalStateException("Should be overriden by subclasses."); + throw new IllegalStateException("Should be overridden by subclasses."); } // =============================================================== @@ -605,7 +605,7 @@ public abstract class AbstractMessage } /** - * @deprecated from v3.0.0-beta-3+, for compatiblity with v2.5.0 and v2.6.1 + * @deprecated from v3.0.0-beta-3+, for compatibility with v2.5.0 and v2.6.1 * generated code. */ @Deprecated @@ -614,7 +614,7 @@ public abstract class AbstractMessage } // /** - * @deprecated from v3.0.0-beta-3+, for compatiblity with v2.5.0 and v2.6.1 + * @deprecated from v3.0.0-beta-3+, for compatibility with v2.5.0 and v2.6.1 * generated code. */ @Deprecated @@ -623,7 +623,7 @@ public abstract class AbstractMessage } // /** - * @deprecated from v3.0.0-beta-3+, for compatiblity with v2.5.0 and v2.6.1 + * @deprecated from v3.0.0-beta-3+, for compatibility with v2.5.0 and v2.6.1 * generated code. */ @Deprecated @@ -632,7 +632,7 @@ public abstract class AbstractMessage } // /** - * @deprecated from v3.0.0-beta-3+, for compatiblity with v2.5.0 and v2.6.1 + * @deprecated from v3.0.0-beta-3+, for compatibility with v2.5.0 and v2.6.1 * generated code. */ @Deprecated diff --git a/java/core/src/main/java/com/google/protobuf/ByteString.java b/java/core/src/main/java/com/google/protobuf/ByteString.java index 62c94508..49653899 100644 --- a/java/core/src/main/java/com/google/protobuf/ByteString.java +++ b/java/core/src/main/java/com/google/protobuf/ByteString.java @@ -87,17 +87,17 @@ public abstract class ByteString implements Iterable, Serializable { * Empty {@code ByteString}. */ public static final ByteString EMPTY = new LiteralByteString(Internal.EMPTY_BYTE_ARRAY); - - /** + + /** * An interface to efficiently copy {@code byte[]}. - * - *

One of the noticable costs of copying a byte[] into a new array using - * {@code System.arraycopy} is nullification of a new buffer before the copy. It has been shown + * + *

One of the noticeable costs of copying a byte[] into a new array using + * {@code System.arraycopy} is nullification of a new buffer before the copy. It has been shown * the Hotspot VM is capable to intrisicfy {@code Arrays.copyOfRange} operation to avoid this * expensive nullification and provide substantial performance gain. Unfortunately this does not * hold on Android runtimes and could make the copy slightly slower due to additional code in * the {@code Arrays.copyOfRange}. Thus we provide two different implementation for array copier - * for Hotspot and Android runtimes. + * for Hotspot and Android runtimes. */ private interface ByteArrayCopier { /** @@ -105,7 +105,7 @@ public abstract class ByteString implements Iterable, Serializable { */ byte[] copyFrom(byte[] bytes, int offset, int size); } - + /** Implementation of {@code ByteArrayCopier} which uses {@link System#arraycopy}. */ private static final class SystemByteArrayCopier implements ByteArrayCopier { @Override @@ -115,7 +115,7 @@ public abstract class ByteString implements Iterable, Serializable { return copy; } } - + /** Implementation of {@code ByteArrayCopier} which uses {@link Arrays#copyOfRange}. */ private static final class ArraysByteArrayCopier implements ByteArrayCopier { @Override @@ -123,7 +123,7 @@ public abstract class ByteString implements Iterable, Serializable { return Arrays.copyOfRange(bytes, offset, offset + size); } } - + private static final ByteArrayCopier byteArrayCopier; static { boolean isAndroid = true; @@ -132,7 +132,7 @@ public abstract class ByteString implements Iterable, Serializable { } catch (ClassNotFoundException e) { isAndroid = false; } - + byteArrayCopier = isAndroid ? new SystemByteArrayCopier() : new ArraysByteArrayCopier(); } @@ -309,7 +309,7 @@ public abstract class ByteString implements Iterable, Serializable { public static ByteString copyFrom(byte[] bytes) { return copyFrom(bytes, 0, bytes.length); } - + /** * Wraps the given bytes into a {@code ByteString}. Intended for internal only * usage to force a classload of ByteString before LiteralByteString. @@ -402,7 +402,7 @@ public abstract class ByteString implements Iterable, Serializable { * immutable tree of byte arrays ("chunks") of the stream data. The * first chunk is small, with subsequent chunks each being double * the size, up to 8K. - * + * *

Each byte read from the input stream will be copied twice to ensure * that the resulting ByteString is truly immutable. * @@ -1226,7 +1226,7 @@ public abstract class ByteString implements Iterable, Serializable { return String.format("", Integer.toHexString(System.identityHashCode(this)), size()); } - + /** * This class implements a {@link com.google.protobuf.ByteString} backed by a * single array of bytes, contiguous in memory. It supports substring by @@ -1450,7 +1450,7 @@ public abstract class ByteString implements Iterable, Serializable { return 0; } } - + /** * This class is used to represent the substring of a {@link ByteString} over a * single byte array. In terms of the public API of {@link ByteString}, you end diff --git a/java/core/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java b/java/core/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java index 29e8d875..4764ca1b 100644 --- a/java/core/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java +++ b/java/core/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java @@ -55,7 +55,7 @@ public class LiteEqualsAndHashTest extends TestCase { // correctly when linked only against the lite library. // We do however do some basic testing to make sure that equals is actually - // overriden to test for value equality rather than simple object equality. + // overridden to test for value equality rather than simple object equality. // Check that two identical objs are equal. Foo foo1a = Foo.newBuilder() diff --git a/javanano/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java b/javanano/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java index d9500bb9..5f329f02 100644 --- a/javanano/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java +++ b/javanano/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java @@ -156,7 +156,7 @@ public final class MessageNanoPrinter { } catch (NoSuchMethodException e) { continue; } - // If hazzer does't exist or returns false, no need to continue + // If hazzer doesn't exist or returns false, no need to continue if (!(Boolean) hazzer.invoke(object)) { continue; } diff --git a/php/ext/google/protobuf/upb.h b/php/ext/google/protobuf/upb.h index 078e2a28..073faf41 100644 --- a/php/ext/google/protobuf/upb.h +++ b/php/ext/google/protobuf/upb.h @@ -54,7 +54,7 @@ ** store pointers or integers of at least 32 bits (upb isn't really useful on ** systems where sizeof(void*) < 4). ** -** The table must be homogenous (all values of the same type). In debug +** The table must be homogeneous (all values of the same type). In debug ** mode, we check this on insert and lookup. */ diff --git a/python/google/protobuf/descriptor.py b/python/google/protobuf/descriptor.py index 2eba1232..873af306 100755 --- a/python/google/protobuf/descriptor.py +++ b/python/google/protobuf/descriptor.py @@ -349,7 +349,7 @@ class Descriptor(_NestedDescriptorBase): Args: proto: An empty descriptor_pb2.DescriptorProto. """ - # This function is overriden to give a better doc comment. + # This function is overridden to give a better doc comment. super(Descriptor, self).CopyToProto(proto) @@ -626,7 +626,7 @@ class EnumDescriptor(_NestedDescriptorBase): Args: proto: An empty descriptor_pb2.EnumDescriptorProto. """ - # This function is overriden to give a better doc comment. + # This function is overridden to give a better doc comment. super(EnumDescriptor, self).CopyToProto(proto) @@ -747,7 +747,7 @@ class ServiceDescriptor(_NestedDescriptorBase): Args: proto: An empty descriptor_pb2.ServiceDescriptorProto. """ - # This function is overriden to give a better doc comment. + # This function is overridden to give a better doc comment. super(ServiceDescriptor, self).CopyToProto(proto) diff --git a/python/google/protobuf/internal/_parameterized.py b/python/google/protobuf/internal/_parameterized.py index dea3f199..23a78f03 100755 --- a/python/google/protobuf/internal/_parameterized.py +++ b/python/google/protobuf/internal/_parameterized.py @@ -347,7 +347,7 @@ class TestGeneratorMetaclass(type): iterable conforms to the test pattern, the injected methods will be picked up as tests by the unittest framework. - In general, it is supposed to be used in conjuction with the + In general, it is supposed to be used in conjunction with the Parameters decorator. """ diff --git a/ruby/ext/google/protobuf_c/upb.h b/ruby/ext/google/protobuf_c/upb.h index 2faf74e5..e8b683bd 100644 --- a/ruby/ext/google/protobuf_c/upb.h +++ b/ruby/ext/google/protobuf_c/upb.h @@ -55,7 +55,7 @@ ** store pointers or integers of at least 32 bits (upb isn't really useful on ** systems where sizeof(void*) < 4). ** -** The table must be homogenous (all values of the same type). In debug +** The table must be homogeneous (all values of the same type). In debug ** mode, we check this on insert and lookup. */ diff --git a/ruby/lib/google/protobuf/repeated_field.rb b/ruby/lib/google/protobuf/repeated_field.rb index 0ad2060d..831e0320 100644 --- a/ruby/lib/google/protobuf/repeated_field.rb +++ b/ruby/lib/google/protobuf/repeated_field.rb @@ -173,7 +173,7 @@ module Google external_enumerator.each_with_index do |val, i| result = yield(val) results << result - #nil means no change occured from yield; usually occurs when #to_a is called + #nil means no change occurred from yield; usually occurs when #to_a is called if result repeated_field[i] = result if result != val end diff --git a/src/google/protobuf/compiler/command_line_interface.cc b/src/google/protobuf/compiler/command_line_interface.cc index df6f8afc..435a7b8d 100644 --- a/src/google/protobuf/compiler/command_line_interface.cc +++ b/src/google/protobuf/compiler/command_line_interface.cc @@ -614,7 +614,7 @@ CommandLineInterface::MemoryOutputStream::~MemoryOutputStream() { } else { // This was an OpenForInsert(). - // If the data doens't end with a clean line break, add one. + // If the data doesn't end with a clean line break, add one. if (!data_.empty() && data_[data_.size() - 1] != '\n') { data_.push_back('\n'); } diff --git a/src/google/protobuf/compiler/cpp/cpp_message.h b/src/google/protobuf/compiler/cpp/cpp_message.h index 31223e13..b1e3fe21 100644 --- a/src/google/protobuf/compiler/cpp/cpp_message.h +++ b/src/google/protobuf/compiler/cpp/cpp_message.h @@ -66,7 +66,7 @@ class MessageGenerator { // Header stuff. - // Return names for foward declarations of this class and all its nested + // Return names for forward declarations of this class and all its nested // types. A given key in {class,enum}_names will map from a class name to the // descriptor that was responsible for its inclusion in the map. This can be // used to associate the descriptor with the code generated for it. diff --git a/src/google/protobuf/compiler/java/java_helpers.h b/src/google/protobuf/compiler/java/java_helpers.h index 5316d2f9..829ec3d7 100644 --- a/src/google/protobuf/compiler/java/java_helpers.h +++ b/src/google/protobuf/compiler/java/java_helpers.h @@ -243,7 +243,7 @@ inline bool HasGenericServices(const FileDescriptor *file, bool enforce_lite) { } inline bool IsLazy(const FieldDescriptor* descriptor, bool enforce_lite) { - // Currently, the proto-lite version suports lazy field. + // Currently, the proto-lite version supports lazy field. // TODO(niwasaki): Support lazy fields also for other proto runtimes. if (HasDescriptorMethods(descriptor->file(), enforce_lite)) { return false; diff --git a/src/google/protobuf/compiler/java/java_string_field.cc b/src/google/protobuf/compiler/java/java_string_field.cc index b74c7447..e1e5496a 100644 --- a/src/google/protobuf/compiler/java/java_string_field.cc +++ b/src/google/protobuf/compiler/java/java_string_field.cc @@ -715,7 +715,7 @@ GenerateInterfaceMembers(io::Printer* printer) const { // NOTE: the same method in the implementation class actually returns // com.google.protobuf.ProtocolStringList (a subclass of List). It's // changed between protobuf 2.5.0 release and protobuf 2.6.1 release. - // To retain binary compatibilty with both 2.5.0 and 2.6.1 generated + // To retain binary compatibility with both 2.5.0 and 2.6.1 generated // code, we make this interface method return List so both methods // with different return types exist in the compiled byte code. "$deprecation$java.util.List\n" diff --git a/src/google/protobuf/compiler/js/js_generator.cc b/src/google/protobuf/compiler/js/js_generator.cc index f5185ab1..8a2633d7 100755 --- a/src/google/protobuf/compiler/js/js_generator.cc +++ b/src/google/protobuf/compiler/js/js_generator.cc @@ -151,7 +151,7 @@ string StripProto(const string& filename) { return StripSuffixString(filename, suffix); } -// Given a filename like foo/bar/baz.proto, returns the correspoding JavaScript +// Given a filename like foo/bar/baz.proto, returns the corresponding JavaScript // file foo/bar/baz.js. string GetJSFilename(const string& filename) { return StripProto(filename) + "_pb.js"; diff --git a/src/google/protobuf/compiler/objectivec/objectivec_field.cc b/src/google/protobuf/compiler/objectivec/objectivec_field.cc index 66cb4a16..812b4a1c 100644 --- a/src/google/protobuf/compiler/objectivec/objectivec_field.cc +++ b/src/google/protobuf/compiler/objectivec/objectivec_field.cc @@ -228,7 +228,7 @@ int FieldGenerator::ExtraRuntimeHasBitsNeeded(void) const { void FieldGenerator::SetExtraRuntimeHasBitsBase(int index_base) { // NOTE: src/google/protobuf/compiler/plugin.cc makes use of cerr for some // error cases, so it seems to be ok to use as a back door for errors. - cerr << "Error: should have overriden SetExtraRuntimeHasBitsBase()." << endl; + cerr << "Error: should have overridden SetExtraRuntimeHasBitsBase()." << endl; cerr.flush(); abort(); } diff --git a/src/google/protobuf/compiler/parser.h b/src/google/protobuf/compiler/parser.h index 2c561c23..0f80e78b 100644 --- a/src/google/protobuf/compiler/parser.h +++ b/src/google/protobuf/compiler/parser.h @@ -71,7 +71,7 @@ class LIBPROTOBUF_EXPORT Parser { // it. Returns true if no errors occurred, false otherwise. bool Parse(io::Tokenizer* input, FileDescriptorProto* file); - // Optional fetaures: + // Optional features: // DEPRECATED: New code should use the SourceCodeInfo embedded in the // FileDescriptorProto. diff --git a/src/google/protobuf/generated_message_reflection.cc b/src/google/protobuf/generated_message_reflection.cc index 347bac5a..d1f7b5ca 100644 --- a/src/google/protobuf/generated_message_reflection.cc +++ b/src/google/protobuf/generated_message_reflection.cc @@ -2126,7 +2126,7 @@ inline void GeneratedMessageReflection::ClearOneofField( inline void GeneratedMessageReflection::ClearOneof( Message* message, const OneofDescriptor* oneof_descriptor) const { // TODO(jieluo): Consider to cache the unused object instead of deleting - // it. It will be much faster if an aplication switches a lot from + // it. It will be much faster if an application switches a lot from // a few oneof fields. Time/space tradeoff uint32 oneof_case = GetOneofCase(*message, oneof_descriptor); if (oneof_case > 0) { diff --git a/src/google/protobuf/io/tokenizer.h b/src/google/protobuf/io/tokenizer.h index 64ee7d84..77a873bc 100644 --- a/src/google/protobuf/io/tokenizer.h +++ b/src/google/protobuf/io/tokenizer.h @@ -329,7 +329,7 @@ class LIBPROTOBUF_EXPORT Tokenizer { // depending on what was read. This needs to know if the first // character was a zero in order to correctly recognize hex and octal // numbers. - // It also needs to know if the first characted was a . to parse floating + // It also needs to know if the first character was a . to parse floating // point correctly. TokenType ConsumeNumber(bool started_with_zero, bool started_with_dot); diff --git a/src/google/protobuf/map_entry.h b/src/google/protobuf/map_entry.h index 801e7522..e87eda64 100644 --- a/src/google/protobuf/map_entry.h +++ b/src/google/protobuf/map_entry.h @@ -83,7 +83,7 @@ class LIBPROTOBUF_EXPORT MapEntryBase : public Message { // reflection, its in-memory type is the same as generated message with the same // fields. However, in order to decide the in-memory type of key/value, we need // to know both their cpp type in generated api and proto type. In -// implmentation, all in-memory types have related wire format functions to +// implementation, all in-memory types have related wire format functions to // support except ArenaStringPtr. Therefore, we need to define another type with // supporting wire format functions. Since this type is only used as return type // of MapEntry accessors, it's named MapEntry accessor type. diff --git a/src/google/protobuf/map_field.h b/src/google/protobuf/map_field.h index 4b46f3aa..d6af8532 100644 --- a/src/google/protobuf/map_field.h +++ b/src/google/protobuf/map_field.h @@ -54,7 +54,7 @@ class ContendedMapCleanTest; class GeneratedMessageReflection; class MapFieldAccessor; -// This class provides accesss to map field using reflection, which is the same +// This class provides access to map field using reflection, which is the same // as those provided for RepeatedPtrField. It is used for internal // reflection implentation only. Users should never use this directly. class LIBPROTOBUF_EXPORT MapFieldBase { @@ -208,7 +208,7 @@ class TypeDefinedMapFieldBase : public MapFieldBase { virtual void SetMapIteratorValue(MapIterator* map_iter) const = 0; }; -// This class provides accesss to map field using generated api. It is used for +// This class provides access to map field using generated api. It is used for // internal generated message implentation only. Users should never use this // directly. template map_field = 1; } diff --git a/src/google/protobuf/map_test.cc b/src/google/protobuf/map_test.cc index dccb31ca..cdd1ccd5 100644 --- a/src/google/protobuf/map_test.cc +++ b/src/google/protobuf/map_test.cc @@ -502,7 +502,7 @@ static void StressTestIterators(int n, bool test_old_style_proto2_maps) { // Test old iterator vs new iterator, with table modification in between. TestOldVersusNewIterator::const_iterator>(n % 3, &m); TestOldVersusNewIterator::iterator>(n % (1 + (n / 40)), &m); - // Finally, ensure erase(iterator) doesn't reorder anything, becuase that is + // Finally, ensure erase(iterator) doesn't reorder anything, because that is // what its documentation says. m[last_key] = m[last_key ^ 999] = 0; vector::iterator> v; diff --git a/src/google/protobuf/map_unittest.proto b/src/google/protobuf/map_unittest.proto index aea1e8ce..c6154f04 100644 --- a/src/google/protobuf/map_unittest.proto +++ b/src/google/protobuf/map_unittest.proto @@ -83,7 +83,7 @@ enum MapEnum { MAP_ENUM_BAZ = 2; } -// Test embeded message with required fields +// Test embedded message with required fields message TestRequiredMessageMap { map map_field = 1; } diff --git a/src/google/protobuf/reflection.h b/src/google/protobuf/reflection.h index 671aafdc..2391f453 100755 --- a/src/google/protobuf/reflection.h +++ b/src/google/protobuf/reflection.h @@ -356,7 +356,7 @@ class LIBPROTOBUF_EXPORT RepeatedFieldAccessor { virtual void Swap(Field* data, const RepeatedFieldAccessor* other_mutator, Field* other_data) const = 0; - // Create an iterator that points at the begining of the repeated field. + // Create an iterator that points at the beginning of the repeated field. virtual Iterator* BeginIterator(const Field* data) const = 0; // Create an iterator that points at the end of the repeated field. virtual Iterator* EndIterator(const Field* data) const = 0; diff --git a/src/google/protobuf/repeated_field.h b/src/google/protobuf/repeated_field.h index 38358dbb..bc567555 100644 --- a/src/google/protobuf/repeated_field.h +++ b/src/google/protobuf/repeated_field.h @@ -2363,7 +2363,7 @@ template class RepeatedPtrFieldBackInsertIterator RepeatedPtrField* field_; }; -// A back inserter for RepeatedPtrFields that inserts by transfering ownership +// A back inserter for RepeatedPtrFields that inserts by transferring ownership // of a pointer. template class AllocatedRepeatedPtrFieldBackInsertIterator : public std::iterator { diff --git a/src/google/protobuf/repeated_field_reflection.h b/src/google/protobuf/repeated_field_reflection.h index 44d14d5b..512c0f1d 100644 --- a/src/google/protobuf/repeated_field_reflection.h +++ b/src/google/protobuf/repeated_field_reflection.h @@ -94,7 +94,7 @@ class LIBPROTOBUF_EXPORT RepeatedFieldAccessor { virtual void Swap(Field* data, const RepeatedFieldAccessor* other_mutator, Field* other_data) const = 0; - // Create an iterator that points at the begining of the repeated field. + // Create an iterator that points at the beginning of the repeated field. virtual Iterator* BeginIterator(const Field* data) const = 0; // Create an iterator that points at the end of the repeated field. virtual Iterator* EndIterator(const Field* data) const = 0; diff --git a/src/google/protobuf/stubs/bytestream.h b/src/google/protobuf/stubs/bytestream.h index de8e0204..07604e17 100644 --- a/src/google/protobuf/stubs/bytestream.h +++ b/src/google/protobuf/stubs/bytestream.h @@ -208,7 +208,7 @@ class LIBPROTOBUF_EXPORT CheckedArrayByteSink : public ByteSink { }; // Implementation of ByteSink that allocates an internal buffer (a char array) -// and expands it as needed to accomodate appended data (similar to a string), +// and expands it as needed to accommodate appended data (similar to a string), // and allows the caller to take ownership of the internal buffer via the // GetBuffer() method. The buffer returned from GetBuffer() must be deleted by // the caller with delete[]. GetBuffer() also sets the internal buffer to be diff --git a/src/google/protobuf/util/field_comparator.cc b/src/google/protobuf/util/field_comparator.cc index 60b8b8a5..a1a56ee6 100644 --- a/src/google/protobuf/util/field_comparator.cc +++ b/src/google/protobuf/util/field_comparator.cc @@ -189,7 +189,7 @@ bool DefaultFieldComparator::CompareDoubleOrFloat(const FieldDescriptor& field, return MathUtil::AlmostEquals(value_1, value_2); } else { // Use user-provided fraction and margin. Since they are stored as - // doubles, we explicitely cast them to types of values provided. This + // doubles, we explicitly cast them to types of values provided. This // is very likely to fail if provided values are not numeric. return MathUtil::WithinFractionOrMargin( value_1, value_2, static_cast(tolerance->fraction), diff --git a/src/google/protobuf/util/internal/proto_writer.h b/src/google/protobuf/util/internal/proto_writer.h index da121809..8b7c6c34 100644 --- a/src/google/protobuf/util/internal/proto_writer.h +++ b/src/google/protobuf/util/internal/proto_writer.h @@ -184,7 +184,7 @@ class LIBPROTOBUF_EXPORT ProtoWriter : public StructuredObjectWriter { return static_cast(BaseElement::parent()); } - // Returns true if the index is already taken by a preceeding oneof input. + // Returns true if the index is already taken by a preceding oneof input. bool IsOneofIndexTaken(int32 index); // Marks the oneof 'index' as taken. Future inputs to this oneof will diff --git a/src/google/protobuf/util/message_differencer.cc b/src/google/protobuf/util/message_differencer.cc index fc55c2b9..a6d0cb07 100644 --- a/src/google/protobuf/util/message_differencer.cc +++ b/src/google/protobuf/util/message_differencer.cc @@ -1386,7 +1386,7 @@ bool MessageDifferencer::MatchRepeatedFieldIndices( if (key_comparator != NULL || IsTreatedAsSet(repeated_field)) { if (scope_ == PARTIAL) { // When partial matching is enabled, Compare(a, b) && Compare(a, c) - // doesn't neccessarily imply Compare(b, c). Therefore a naive greedy + // doesn't necessarily imply Compare(b, c). Therefore a naive greedy // algorithm will fail to find a maximum matching. // Here we use the argumenting path algorithm. MaximumMatcher::NodeMatchCallback* callback = diff --git a/src/google/protobuf/util/message_differencer.h b/src/google/protobuf/util/message_differencer.h index 1abbfcba..654d1a67 100644 --- a/src/google/protobuf/util/message_differencer.h +++ b/src/google/protobuf/util/message_differencer.h @@ -278,7 +278,7 @@ class LIBPROTOBUF_EXPORT MessageDifferencer { const Message& message2, const vector& field_path) { } - // Report that an unkown field is ignored. (see comment above). + // Report that an unknown field is ignored. (see comment above). // Note this is a different function since the last SpecificField in field // path has a null field. This could break existing Reporter. virtual void ReportUnknownFieldIgnored( diff --git a/src/google/protobuf/util/message_differencer_unittest.cc b/src/google/protobuf/util/message_differencer_unittest.cc index a867c881..ed43c512 100755 --- a/src/google/protobuf/util/message_differencer_unittest.cc +++ b/src/google/protobuf/util/message_differencer_unittest.cc @@ -2349,7 +2349,7 @@ TEST_F(ComparisonTest, RepeatedMapFieldTest_RepeatedMessageKey) { } TEST_F(ComparisonTest, RepeatedSetOptionTest_Unknown) { - // Currently, as_set option doens't have affects on unknown field. + // Currently, as_set option doesn't have affects on unknown field. // If needed, this feature will be added by request. repeated_field_as_set(); unknown1_->AddGroup(245)->AddFixed32(248, 1); diff --git a/src/google/protobuf/wire_format.h b/src/google/protobuf/wire_format.h index 941be75b..aaee21f0 100644 --- a/src/google/protobuf/wire_format.h +++ b/src/google/protobuf/wire_format.h @@ -315,7 +315,7 @@ inline void WireFormat::VerifyUTF8String(const char* data, int size, WireFormatLite::VerifyUtf8String( data, size, static_cast(op), NULL); #else - // Avoid the compiler warning about unsued variables. + // Avoid the compiler warning about unused variables. (void)data; (void)size; (void)op; #endif } -- cgit v1.2.3