From 7a9040fe7fb2fc436fab15ebd9373de88084d656 Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Thu, 14 Jan 2016 22:12:03 -0800 Subject: Remove redundant `the` in comments. --- examples/README.txt | 2 +- java/core/src/main/java/com/google/protobuf/RopeByteString.java | 2 +- java/core/src/main/java/com/google/protobuf/UnsafeByteOperations.java | 2 +- objectivec/DevTools/pddm.py | 2 +- objectivec/GPBUtilities.m | 2 +- ruby/ext/google/protobuf_c/upb.c | 2 +- src/google/protobuf/compiler/objectivec/objectivec_helpers.cc | 2 +- src/google/protobuf/compiler/objectivec/objectivec_helpers.h | 4 ++-- src/google/protobuf/dynamic_message.cc | 2 +- src/google/protobuf/util/field_mask_util.cc | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/examples/README.txt b/examples/README.txt index e6f30370..b33f8414 100644 --- a/examples/README.txt +++ b/examples/README.txt @@ -35,7 +35,7 @@ build with all the other examples. See: https://github.com/golang/protobuf for more information about Go protocol buffer support. -First, install the the Protocol Buffers compiler (protoc). +First, install the Protocol Buffers compiler (protoc). Then, install the Go Protocol Buffers plugin ($GOPATH/bin must be in your $PATH for protoc to find it): go get github.com/golang/protobuf/protoc-gen-go diff --git a/java/core/src/main/java/com/google/protobuf/RopeByteString.java b/java/core/src/main/java/com/google/protobuf/RopeByteString.java index 469c90c2..8badfabd 100644 --- a/java/core/src/main/java/com/google/protobuf/RopeByteString.java +++ b/java/core/src/main/java/com/google/protobuf/RopeByteString.java @@ -187,7 +187,7 @@ final class RopeByteString extends ByteString { && leftRope.getTreeDepth() > right.getTreeDepth()) { // Typically for concatenate-built strings the left-side is deeper than // the right. This is our final attempt to concatenate without - // increasing the tree depth. We'll redo the the node on the RHS. This + // increasing the tree depth. We'll redo the node on the RHS. This // is yet another optimization for building the string by repeatedly // concatenating on the right. ByteString newRight = new RopeByteString(leftRope.right, right); diff --git a/java/core/src/main/java/com/google/protobuf/UnsafeByteOperations.java b/java/core/src/main/java/com/google/protobuf/UnsafeByteOperations.java index 8806395c..f443ee39 100644 --- a/java/core/src/main/java/com/google/protobuf/UnsafeByteOperations.java +++ b/java/core/src/main/java/com/google/protobuf/UnsafeByteOperations.java @@ -38,7 +38,7 @@ import java.nio.ByteBuffer; * potentially expose the backing buffer of a {@link ByteString} to the application. * *

DISCLAIMER: The methods in this class should only be called if it is - * guaranteed that the the buffer backing the {@link ByteString} will never change! Mutation of a + * guaranteed that the buffer backing the {@link ByteString} will never change! Mutation of a * {@link ByteString} can lead to unexpected and undesirable consequences in your application, * and will likely be difficult to debug. Proceed with caution! */ diff --git a/objectivec/DevTools/pddm.py b/objectivec/DevTools/pddm.py index d1b53f5a..510067e0 100755 --- a/objectivec/DevTools/pddm.py +++ b/objectivec/DevTools/pddm.py @@ -625,7 +625,7 @@ class SourceFile(object): def main(args): usage = '%prog [OPTIONS] PATH ...' description = ( - 'Processes PDDM directives in the the given paths and write them back' + 'Processes PDDM directives in the given paths and write them back' ' out.' ) parser = optparse.OptionParser(usage=usage, description=description) diff --git a/objectivec/GPBUtilities.m b/objectivec/GPBUtilities.m index eaa28bbc..d4d6471f 100644 --- a/objectivec/GPBUtilities.m +++ b/objectivec/GPBUtilities.m @@ -1253,7 +1253,7 @@ static void AppendTextFormatForMessageField(GPBMessage *message, if ([fieldName length] == 0) { fieldName = [NSString stringWithFormat:@"%u", GPBFieldNumber(field)]; // If there is only one entry, put the objc name as a comment, other wise - // add it before the the repeated values. + // add it before the repeated values. if (count > 1) { [toStr appendFormat:@"%@# %@\n", lineIndent, field.name]; } else { diff --git a/ruby/ext/google/protobuf_c/upb.c b/ruby/ext/google/protobuf_c/upb.c index 048a163a..9e6aa674 100644 --- a/ruby/ext/google/protobuf_c/upb.c +++ b/ruby/ext/google/protobuf_c/upb.c @@ -8537,7 +8537,7 @@ bool upb_pbdecoder_setmaxnesting(upb_pbdecoder *d, size_t max) { ** to perfectly match the output of reference encoders that always use the ** optimal amount of space for each length. ** -** (2) requires guessing the the size upfront, and if multiple lengths are +** (2) requires guessing the size upfront, and if multiple lengths are ** guessed wrong the minimum required number of memmove() operations may ** be complicated to compute correctly. Implemented properly, it may have ** a useful amortized or average cost, but more investigation is required diff --git a/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc b/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc index 990aca24..8527b74b 100644 --- a/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc +++ b/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc @@ -883,7 +883,7 @@ bool Parser::ParseLoop() { StringPiece prefix(line, offset + 1, line.length() - offset - 1); TrimWhitespace(&package); TrimWhitespace(&prefix); - // Don't really worry about error checking the the package/prefix for + // Don't really worry about error checking the package/prefix for // being valid. Assume the file is validated when it is created/edited. (*prefix_map_)[package.ToString()] = prefix.ToString(); } diff --git a/src/google/protobuf/compiler/objectivec/objectivec_helpers.h b/src/google/protobuf/compiler/objectivec/objectivec_helpers.h index 072a2e57..85744862 100644 --- a/src/google/protobuf/compiler/objectivec/objectivec_helpers.h +++ b/src/google/protobuf/compiler/objectivec/objectivec_helpers.h @@ -64,7 +64,7 @@ string FilePath(const FileDescriptor* file); // Gets the name of the root class we'll generate in the file. This class // is not meant for external consumption, but instead contains helpers that -// the rest of the the classes need +// the rest of the classes need string FileClassName(const FileDescriptor* file); // These return the fully-qualified class name corresponding to the given @@ -148,7 +148,7 @@ string BuildCommentsString(const SourceLocation& location); bool ValidateObjCClassPrefix(const FileDescriptor* file, string *out_error); // Generate decode data needed for ObjC's GPBDecodeTextFormatName() to transform -// the input into the the expected output. +// the input into the expected output. class LIBPROTOC_EXPORT TextFormatDecodeData { public: TextFormatDecodeData() {} diff --git a/src/google/protobuf/dynamic_message.cc b/src/google/protobuf/dynamic_message.cc index bb400476..8d689ac8 100644 --- a/src/google/protobuf/dynamic_message.cc +++ b/src/google/protobuf/dynamic_message.cc @@ -419,7 +419,7 @@ DynamicMessage::~DynamicMessage() { } // We need to manually run the destructors for repeated fields and strings, - // just as we ran their constructors in the the DynamicMessage constructor. + // just as we ran their constructors in the DynamicMessage constructor. // We also need to manually delete oneof fields if it is set and is string // or message. // Additionally, if any singular embedded messages have been allocated, we diff --git a/src/google/protobuf/util/field_mask_util.cc b/src/google/protobuf/util/field_mask_util.cc index 29ca9c1e..c59f43aa 100644 --- a/src/google/protobuf/util/field_mask_util.cc +++ b/src/google/protobuf/util/field_mask_util.cc @@ -103,7 +103,7 @@ class FieldMaskTree { // Add a field path into the tree. In a FieldMask, each field path matches // the specified field and also all its sub-fields. If the field path to // add is a sub-path of an existing field path in the tree (i.e., a leaf - // node), it means the tree already matchesthe the given path so nothing will + // node), it means the tree already matches the given path so nothing will // be added to the tree. If the path matches an existing non-leaf node in the // tree, that non-leaf node will be turned into a leaf node with all its // children removed because the path matches all the node's children. -- cgit v1.2.3 From 86325d7c95af4c82f7531b21c6d845fad8a4a2bb Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Thu, 11 Feb 2016 12:47:52 -0800 Subject: Rewrap the line --- objectivec/DevTools/pddm.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/objectivec/DevTools/pddm.py b/objectivec/DevTools/pddm.py index 510067e0..9a11fec4 100755 --- a/objectivec/DevTools/pddm.py +++ b/objectivec/DevTools/pddm.py @@ -625,8 +625,7 @@ class SourceFile(object): def main(args): usage = '%prog [OPTIONS] PATH ...' description = ( - 'Processes PDDM directives in the given paths and write them back' - ' out.' + 'Processes PDDM directives in the given paths and write them back out.' ) parser = optparse.OptionParser(usage=usage, description=description) parser.add_option('--dry-run', -- cgit v1.2.3