Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
3ee2e205
Commit
3ee2e205
authored
Feb 12, 2016
by
Joshua Haberman
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1144 from dongjoon-hyun/remove_redundant_the
Remove redundant `the`.
parents
caf1fb71
86325d7c
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
11 additions
and
12 deletions
+11
-12
README.txt
examples/README.txt
+1
-1
RopeByteString.java
...ore/src/main/java/com/google/protobuf/RopeByteString.java
+1
-1
UnsafeByteOperations.java
...c/main/java/com/google/protobuf/UnsafeByteOperations.java
+1
-1
pddm.py
objectivec/DevTools/pddm.py
+1
-2
GPBUtilities.m
objectivec/GPBUtilities.m
+1
-1
upb.c
ruby/ext/google/protobuf_c/upb.c
+1
-1
objectivec_helpers.cc
...google/protobuf/compiler/objectivec/objectivec_helpers.cc
+1
-1
objectivec_helpers.h
src/google/protobuf/compiler/objectivec/objectivec_helpers.h
+2
-2
dynamic_message.cc
src/google/protobuf/dynamic_message.cc
+1
-1
field_mask_util.cc
src/google/protobuf/util/field_mask_util.cc
+1
-1
No files found.
examples/README.txt
View file @
3ee2e205
...
@@ -35,7 +35,7 @@ build with all the other examples. See:
...
@@ -35,7 +35,7 @@ build with all the other examples. See:
https://github.com/golang/protobuf
https://github.com/golang/protobuf
for more information about Go protocol buffer support.
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
Then, install the Go Protocol Buffers plugin
($GOPATH/bin must be in your $PATH for protoc to find it):
($GOPATH/bin must be in your $PATH for protoc to find it):
go get github.com/golang/protobuf/protoc-gen-go
go get github.com/golang/protobuf/protoc-gen-go
...
...
java/core/src/main/java/com/google/protobuf/RopeByteString.java
View file @
3ee2e205
...
@@ -187,7 +187,7 @@ final class RopeByteString extends ByteString {
...
@@ -187,7 +187,7 @@ final class RopeByteString extends ByteString {
&&
leftRope
.
getTreeDepth
()
>
right
.
getTreeDepth
())
{
&&
leftRope
.
getTreeDepth
()
>
right
.
getTreeDepth
())
{
// Typically for concatenate-built strings the left-side is deeper than
// Typically for concatenate-built strings the left-side is deeper than
// the right. This is our final attempt to concatenate without
// 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
// is yet another optimization for building the string by repeatedly
// concatenating on the right.
// concatenating on the right.
ByteString
newRight
=
new
RopeByteString
(
leftRope
.
right
,
right
);
ByteString
newRight
=
new
RopeByteString
(
leftRope
.
right
,
right
);
...
...
java/core/src/main/java/com/google/protobuf/UnsafeByteOperations.java
View file @
3ee2e205
...
@@ -38,7 +38,7 @@ import java.nio.ByteBuffer;
...
@@ -38,7 +38,7 @@ import java.nio.ByteBuffer;
* potentially expose the backing buffer of a {@link ByteString} to the application.
* potentially expose the backing buffer of a {@link ByteString} to the application.
*
*
* <p><strong>DISCLAIMER:</strong> The methods in this class should only be called if it is
* <p><strong>DISCLAIMER:</strong> 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,
* {@link ByteString} can lead to unexpected and undesirable consequences in your application,
* and will likely be difficult to debug. Proceed with caution!
* and will likely be difficult to debug. Proceed with caution!
*/
*/
...
...
objectivec/DevTools/pddm.py
View file @
3ee2e205
...
@@ -625,8 +625,7 @@ class SourceFile(object):
...
@@ -625,8 +625,7 @@ class SourceFile(object):
def
main
(
args
):
def
main
(
args
):
usage
=
'
%
prog [OPTIONS] PATH ...'
usage
=
'
%
prog [OPTIONS] PATH ...'
description
=
(
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.'
' out.'
)
)
parser
=
optparse
.
OptionParser
(
usage
=
usage
,
description
=
description
)
parser
=
optparse
.
OptionParser
(
usage
=
usage
,
description
=
description
)
parser
.
add_option
(
'--dry-run'
,
parser
.
add_option
(
'--dry-run'
,
...
...
objectivec/GPBUtilities.m
View file @
3ee2e205
...
@@ -1253,7 +1253,7 @@ static void AppendTextFormatForMessageField(GPBMessage *message,
...
@@ -1253,7 +1253,7 @@ static void AppendTextFormatForMessageField(GPBMessage *message,
if
([
fieldName
length
]
==
0
)
{
if
([
fieldName
length
]
==
0
)
{
fieldName
=
[
NSString
stringWithFormat
:
@"%u"
,
GPBFieldNumber
(
field
)];
fieldName
=
[
NSString
stringWithFormat
:
@"%u"
,
GPBFieldNumber
(
field
)];
// If there is only one entry, put the objc name as a comment, other wise
// 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
)
{
if
(
count
>
1
)
{
[
toStr
appendFormat
:
@"%@# %@
\n
"
,
lineIndent
,
field
.
name
];
[
toStr
appendFormat
:
@"%@# %@
\n
"
,
lineIndent
,
field
.
name
];
}
else
{
}
else
{
...
...
ruby/ext/google/protobuf_c/upb.c
View file @
3ee2e205
...
@@ -8537,7 +8537,7 @@ bool upb_pbdecoder_setmaxnesting(upb_pbdecoder *d, size_t max) {
...
@@ -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
** to perfectly match the output of reference encoders that always use the
** optimal amount of space for each length.
** 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
** guessed wrong the minimum required number of memmove() operations may
** be complicated to compute correctly. Implemented properly, it may have
** be complicated to compute correctly. Implemented properly, it may have
** a useful amortized or average cost, but more investigation is required
** a useful amortized or average cost, but more investigation is required
...
...
src/google/protobuf/compiler/objectivec/objectivec_helpers.cc
View file @
3ee2e205
...
@@ -883,7 +883,7 @@ bool Parser::ParseLoop() {
...
@@ -883,7 +883,7 @@ bool Parser::ParseLoop() {
StringPiece
prefix
(
line
,
offset
+
1
,
line
.
length
()
-
offset
-
1
);
StringPiece
prefix
(
line
,
offset
+
1
,
line
.
length
()
-
offset
-
1
);
TrimWhitespace
(
&
package
);
TrimWhitespace
(
&
package
);
TrimWhitespace
(
&
prefix
);
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.
// being valid. Assume the file is validated when it is created/edited.
(
*
prefix_map_
)[
package
.
ToString
()]
=
prefix
.
ToString
();
(
*
prefix_map_
)[
package
.
ToString
()]
=
prefix
.
ToString
();
}
}
...
...
src/google/protobuf/compiler/objectivec/objectivec_helpers.h
View file @
3ee2e205
...
@@ -64,7 +64,7 @@ string FilePath(const FileDescriptor* file);
...
@@ -64,7 +64,7 @@ string FilePath(const FileDescriptor* file);
// Gets the name of the root class we'll generate in the file. This class
// 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
// 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
);
string
FileClassName
(
const
FileDescriptor
*
file
);
// These return the fully-qualified class name corresponding to the given
// These return the fully-qualified class name corresponding to the given
...
@@ -148,7 +148,7 @@ string BuildCommentsString(const SourceLocation& location);
...
@@ -148,7 +148,7 @@ string BuildCommentsString(const SourceLocation& location);
bool
ValidateObjCClassPrefix
(
const
FileDescriptor
*
file
,
string
*
out_error
);
bool
ValidateObjCClassPrefix
(
const
FileDescriptor
*
file
,
string
*
out_error
);
// Generate decode data needed for ObjC's GPBDecodeTextFormatName() to transform
// 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
{
class
LIBPROTOC_EXPORT
TextFormatDecodeData
{
public
:
public
:
TextFormatDecodeData
()
{}
TextFormatDecodeData
()
{}
...
...
src/google/protobuf/dynamic_message.cc
View file @
3ee2e205
...
@@ -419,7 +419,7 @@ DynamicMessage::~DynamicMessage() {
...
@@ -419,7 +419,7 @@ DynamicMessage::~DynamicMessage() {
}
}
// We need to manually run the destructors for repeated fields and strings,
// 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
// We also need to manually delete oneof fields if it is set and is string
// or message.
// or message.
// Additionally, if any singular embedded messages have been allocated, we
// Additionally, if any singular embedded messages have been allocated, we
...
...
src/google/protobuf/util/field_mask_util.cc
View file @
3ee2e205
...
@@ -103,7 +103,7 @@ class FieldMaskTree {
...
@@ -103,7 +103,7 @@ class FieldMaskTree {
// Add a field path into the tree. In a FieldMask, each field path matches
// 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
// 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
// add is a sub-path of an existing field path in the tree (i.e., a leaf
// node), it means the tree already matches
the
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
// 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
// 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.
// children removed because the path matches all the node's children.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment