~ubuntu-branches/debian/stretch/protobuf/stretch

« back to all changes in this revision

Viewing changes to src/google/protobuf/io/zero_copy_stream_impl.cc

Committer: Package Import Robot
Author(s): Robert S. Edmonds
Date: 2014-09-11 22:50:10 UTC
mfrom: (10.1.9 experimental)
Revision ID: package-import@ubuntu.com-20140911225010-wt4yo9dpc1fzuq5g

Tags: 2.6.0-3

Upload to unstable.

files added:
.pc/debian-changes

.pc/debian-changes/python

.pc/debian-changes/python/setup.py

debian/clean

debian/libprotobuf-lite9.install

debian/libprotobuf-lite9.shlibs

debian/libprotobuf9.install

debian/libprotobuf9.shlibs

debian/libprotoc9.install

debian/libprotoc9.shlibs

debian/patches/debian-changes

java/src/main/java/com/google/protobuf/Extension.java

java/src/main/java/com/google/protobuf/LazyFieldLite.java

java/src/main/java/com/google/protobuf/MessageReflection.java

java/src/main/java/com/google/protobuf/ProtocolStringList.java

java/src/test/java/com/google/protobuf/CheckUtf8Test.java

java/src/test/java/com/google/protobuf/LazyFieldLiteTest.java

java/src/test/java/com/google/protobuf/LazyFieldTest.java

java/src/test/java/com/google/protobuf/LazyMessageLiteTest.java

java/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java

java/src/test/java/com/google/protobuf/lazy_fields_lite.proto

java/src/test/java/com/google/protobuf/lite_equals_and_hash.proto

java/src/test/java/com/google/protobuf/outer_class_name_test.proto

java/src/test/java/com/google/protobuf/outer_class_name_test2.proto

java/src/test/java/com/google/protobuf/outer_class_name_test3.proto

java/src/test/java/com/google/protobuf/test_check_utf8.proto

java/src/test/java/com/google/protobuf/test_check_utf8_size.proto

java/src/test/java/com/google/protobuf/test_custom_options.proto

python/google/protobuf/internal/api_implementation.cc

python/google/protobuf/internal/api_implementation_default_test.py

python/google/protobuf/internal/descriptor_pool_test1.proto

python/google/protobuf/internal/descriptor_pool_test2.proto

python/google/protobuf/internal/descriptor_python_test.py

python/google/protobuf/internal/message_factory_python_test.py

python/google/protobuf/internal/message_python_test.py

python/google/protobuf/internal/missing_enum_values.proto

python/google/protobuf/internal/symbol_database_test.py

python/google/protobuf/internal/text_encoding_test.py

python/google/protobuf/pyext/README

python/google/protobuf/pyext/__init__.py

python/google/protobuf/pyext/cpp_message.py

python/google/protobuf/pyext/descriptor.cc

python/google/protobuf/pyext/descriptor.h

python/google/protobuf/pyext/descriptor_cpp2_test.py

python/google/protobuf/pyext/extension_dict.cc

python/google/protobuf/pyext/extension_dict.h

python/google/protobuf/pyext/message.cc

python/google/protobuf/pyext/message.h

python/google/protobuf/pyext/message_factory_cpp2_test.py

python/google/protobuf/pyext/proto2_api_test.proto

python/google/protobuf/pyext/python.proto

python/google/protobuf/pyext/reflection_cpp2_generated_test.py

python/google/protobuf/pyext/repeated_composite_container.cc

python/google/protobuf/pyext/repeated_composite_container.h

python/google/protobuf/pyext/repeated_scalar_container.cc

python/google/protobuf/pyext/repeated_scalar_container.h

python/google/protobuf/pyext/scoped_pyobject_ptr.h

python/google/protobuf/symbol_database.py

python/google/protobuf/text_encoding.py

src/google/protobuf/compiler/java/java_context.cc

src/google/protobuf/compiler/java/java_context.h

src/google/protobuf/compiler/java/java_generator_factory.cc

src/google/protobuf/compiler/java/java_generator_factory.h

src/google/protobuf/compiler/java/java_lazy_message_field.cc

src/google/protobuf/compiler/java/java_lazy_message_field.h

src/google/protobuf/compiler/java/java_name_resolver.cc

src/google/protobuf/compiler/java/java_name_resolver.h

src/google/protobuf/compiler/java/java_shared_code_generator.cc

src/google/protobuf/compiler/java/java_shared_code_generator.h

src/google/protobuf/io/strtod.cc

src/google/protobuf/io/strtod.h

src/google/protobuf/stubs/atomicops_internals_arm64_gcc.h

src/google/protobuf/stubs/atomicops_internals_tsan.h

src/google/protobuf/stubs/map_util.h

src/google/protobuf/stubs/shared_ptr.h

src/google/protobuf/testdata/bad_utf8_string

src/google/protobuf/testdata/golden_message_oneof_implemented

src/google/protobuf/testdata/text_format_unittest_data_oneof_implemented.txt

src/google/protobuf/testdata/text_format_unittest_data_pointy.txt

src/google/protobuf/testdata/text_format_unittest_data_pointy_oneof.txt

src/google/protobuf/testdata/text_format_unittest_extensions_data_pointy.txt

files removed:
.pc/arm_optimization.diff

.pc/arm_optimization.diff/src

.pc/arm_optimization.diff/src/google

.pc/arm_optimization.diff/src/google/protobuf

.pc/arm_optimization.diff/src/google/protobuf/wire_format_lite.h

.pc/disable-setuptools-download.diff

.pc/disable-setuptools-download.diff/python

.pc/disable-setuptools-download.diff/python/ez_setup.py

.pc/fix-ftbfs-gcc4.7-kfreebsd.patch

.pc/fix-ftbfs-gcc4.7-kfreebsd.patch/gtest

.pc/fix-ftbfs-gcc4.7-kfreebsd.patch/gtest/include

.pc/fix-ftbfs-gcc4.7-kfreebsd.patch/gtest/include/gtest

.pc/fix-ftbfs-gcc4.7-kfreebsd.patch/gtest/include/gtest/internal

.pc/fix-ftbfs-gcc4.7-kfreebsd.patch/gtest/include/gtest/internal/gtest-port.h

.pc/fix-ftbfs-upstream-issue-488.patch

.pc/fix-ftbfs-upstream-issue-488.patch/src

.pc/fix-ftbfs-upstream-issue-488.patch/src/Makefile.am

.pc/fix-ftbfs-upstream-issue-488.patch/src/google

.pc/fix-ftbfs-upstream-issue-488.patch/src/google/protobuf

.pc/fix-ftbfs-upstream-issue-488.patch/src/google/protobuf/stubs

.pc/fix-ftbfs-upstream-issue-488.patch/src/google/protobuf/stubs/atomicops.h

.pc/fix-ftbfs-upstream-issue-488.patch/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h

.pc/fix-ftbfs-upstream-issue-488.patch/src/google/protobuf/stubs/platform_macros.h

.pc/revert_upstream_issue_388_about_rpath.diff

.pc/revert_upstream_issue_388_about_rpath.diff/python

.pc/revert_upstream_issue_388_about_rpath.diff/python/README.txt

.pc/revert_upstream_issue_388_about_rpath.diff/python/setup.py

debian/libprotobuf-lite8.install

debian/libprotobuf-lite8.shlibs

debian/libprotobuf8.install

debian/libprotobuf8.shlibs

debian/libprotoc8.install

debian/libprotoc8.shlibs

debian/patches/arm_optimization.diff

debian/patches/disable-setuptools-download.diff

debian/patches/fix-ftbfs-gcc4.7-kfreebsd.patch

debian/patches/fix-ftbfs-upstream-issue-488.patch

debian/patches/revert_upstream_issue_388_about_rpath.diff

debian/watch

python/google/protobuf/internal/message_cpp_test.py

python/google/protobuf/internal/reflection_cpp_generated_test.py

python/google/protobuf/pyext/python-proto2.cc

python/google/protobuf/pyext/python_descriptor.cc

python/google/protobuf/pyext/python_descriptor.h

python/google/protobuf/pyext/python_protobuf.cc

src/google/protobuf/stubs/map-util.h

files modified:
.pc/applied-patches

CHANGES.txt

Makefile.am

Makefile.in

configure

configure.ac

debian/changelog

debian/control

debian/libprotobuf-dev.install

debian/libprotoc-dev.install

debian/patches/series

debian/python-protobuf.README.Debian

debian/rules

examples/list_people.cc

gtest/include/gtest/internal/gtest-port.h

java/pom.xml

java/src/main/java/com/google/protobuf/AbstractMessage.java

java/src/main/java/com/google/protobuf/AbstractMessageLite.java

java/src/main/java/com/google/protobuf/AbstractParser.java

java/src/main/java/com/google/protobuf/ByteString.java

java/src/main/java/com/google/protobuf/CodedInputStream.java

java/src/main/java/com/google/protobuf/CodedOutputStream.java

java/src/main/java/com/google/protobuf/Descriptors.java

java/src/main/java/com/google/protobuf/DynamicMessage.java

java/src/main/java/com/google/protobuf/ExtensionRegistry.java

java/src/main/java/com/google/protobuf/FieldSet.java

java/src/main/java/com/google/protobuf/GeneratedMessage.java

java/src/main/java/com/google/protobuf/GeneratedMessageLite.java

java/src/main/java/com/google/protobuf/Internal.java

java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java

java/src/main/java/com/google/protobuf/LazyField.java

java/src/main/java/com/google/protobuf/LazyStringArrayList.java

java/src/main/java/com/google/protobuf/LazyStringList.java

java/src/main/java/com/google/protobuf/LiteralByteString.java

java/src/main/java/com/google/protobuf/Message.java

java/src/main/java/com/google/protobuf/MessageLite.java

java/src/main/java/com/google/protobuf/MessageOrBuilder.java

java/src/main/java/com/google/protobuf/Parser.java

java/src/main/java/com/google/protobuf/RopeByteString.java

java/src/main/java/com/google/protobuf/RpcUtil.java

java/src/main/java/com/google/protobuf/TextFormat.java

java/src/main/java/com/google/protobuf/UnknownFieldSet.java

java/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java

java/src/test/java/com/google/protobuf/AbstractMessageTest.java

java/src/test/java/com/google/protobuf/ByteStringTest.java

java/src/test/java/com/google/protobuf/CodedInputStreamTest.java

java/src/test/java/com/google/protobuf/CodedOutputStreamTest.java

java/src/test/java/com/google/protobuf/DescriptorsTest.java

java/src/test/java/com/google/protobuf/DynamicMessageTest.java

java/src/test/java/com/google/protobuf/GeneratedMessageTest.java

java/src/test/java/com/google/protobuf/LazyStringArrayListTest.java

java/src/test/java/com/google/protobuf/ParserTest.java

java/src/test/java/com/google/protobuf/TestBadIdentifiers.java

java/src/test/java/com/google/protobuf/TestUtil.java

java/src/test/java/com/google/protobuf/TextFormatTest.java

java/src/test/java/com/google/protobuf/UnknownFieldSetTest.java

java/src/test/java/com/google/protobuf/UnmodifiableLazyStringListTest.java

java/src/test/java/com/google/protobuf/WireFormatTest.java

java/src/test/java/com/google/protobuf/multiple_files_test.proto

java/src/test/java/com/google/protobuf/nested_extension.proto

java/src/test/java/com/google/protobuf/non_nested_extension.proto

java/src/test/java/com/google/protobuf/test_bad_identifiers.proto

python/README.txt

python/ez_setup.py

python/google/protobuf/descriptor.py

python/google/protobuf/descriptor_database.py

python/google/protobuf/descriptor_pool.py

python/google/protobuf/internal/api_implementation.py

python/google/protobuf/internal/containers.py

python/google/protobuf/internal/cpp_message.py

python/google/protobuf/internal/decoder.py

python/google/protobuf/internal/descriptor_database_test.py

python/google/protobuf/internal/descriptor_pool_test.py

python/google/protobuf/internal/descriptor_test.py

python/google/protobuf/internal/encoder.py

python/google/protobuf/internal/factory_test1.proto

python/google/protobuf/internal/factory_test2.proto

python/google/protobuf/internal/generator_test.py

python/google/protobuf/internal/message_factory_test.py

python/google/protobuf/internal/message_test.py

python/google/protobuf/internal/python_message.py

python/google/protobuf/internal/reflection_test.py

python/google/protobuf/internal/service_reflection_test.py

python/google/protobuf/internal/test_util.py

python/google/protobuf/internal/text_format_test.py

python/google/protobuf/internal/type_checkers.py

python/google/protobuf/internal/unknown_fields_test.py

python/google/protobuf/internal/wire_format_test.py

python/google/protobuf/message.py

python/google/protobuf/message_factory.py

python/google/protobuf/reflection.py

python/google/protobuf/text_format.py

python/setup.py

src/Makefile.am

src/Makefile.in

src/google/protobuf/compiler/code_generator.cc

src/google/protobuf/compiler/code_generator.h

src/google/protobuf/compiler/command_line_interface.cc

src/google/protobuf/compiler/command_line_interface.h

src/google/protobuf/compiler/command_line_interface_unittest.cc

src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc

src/google/protobuf/compiler/cpp/cpp_enum.cc

src/google/protobuf/compiler/cpp/cpp_enum.h

src/google/protobuf/compiler/cpp/cpp_enum_field.cc

src/google/protobuf/compiler/cpp/cpp_enum_field.h

src/google/protobuf/compiler/cpp/cpp_field.cc

src/google/protobuf/compiler/cpp/cpp_field.h

src/google/protobuf/compiler/cpp/cpp_file.cc

src/google/protobuf/compiler/cpp/cpp_file.h

src/google/protobuf/compiler/cpp/cpp_generator.cc

src/google/protobuf/compiler/cpp/cpp_helpers.cc

src/google/protobuf/compiler/cpp/cpp_helpers.h

src/google/protobuf/compiler/cpp/cpp_message.cc

src/google/protobuf/compiler/cpp/cpp_message.h

src/google/protobuf/compiler/cpp/cpp_message_field.cc

src/google/protobuf/compiler/cpp/cpp_message_field.h

src/google/protobuf/compiler/cpp/cpp_plugin_unittest.cc

src/google/protobuf/compiler/cpp/cpp_primitive_field.cc

src/google/protobuf/compiler/cpp/cpp_primitive_field.h

src/google/protobuf/compiler/cpp/cpp_service.h

src/google/protobuf/compiler/cpp/cpp_string_field.cc

src/google/protobuf/compiler/cpp/cpp_string_field.h

src/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto

src/google/protobuf/compiler/cpp/cpp_unittest.cc

src/google/protobuf/compiler/importer.cc

src/google/protobuf/compiler/importer.h

src/google/protobuf/compiler/importer_unittest.cc

src/google/protobuf/compiler/java/java_doc_comment.cc

src/google/protobuf/compiler/java/java_doc_comment_unittest.cc

src/google/protobuf/compiler/java/java_enum.cc

src/google/protobuf/compiler/java/java_enum.h

src/google/protobuf/compiler/java/java_enum_field.cc

src/google/protobuf/compiler/java/java_enum_field.h

src/google/protobuf/compiler/java/java_extension.cc

src/google/protobuf/compiler/java/java_extension.h

src/google/protobuf/compiler/java/java_field.cc

src/google/protobuf/compiler/java/java_field.h

src/google/protobuf/compiler/java/java_file.cc

src/google/protobuf/compiler/java/java_file.h

src/google/protobuf/compiler/java/java_generator.cc

src/google/protobuf/compiler/java/java_helpers.cc

src/google/protobuf/compiler/java/java_helpers.h

src/google/protobuf/compiler/java/java_message.cc

src/google/protobuf/compiler/java/java_message.h

src/google/protobuf/compiler/java/java_message_field.cc

src/google/protobuf/compiler/java/java_message_field.h

src/google/protobuf/compiler/java/java_plugin_unittest.cc

src/google/protobuf/compiler/java/java_primitive_field.cc

src/google/protobuf/compiler/java/java_primitive_field.h

src/google/protobuf/compiler/java/java_service.cc

src/google/protobuf/compiler/java/java_service.h

src/google/protobuf/compiler/java/java_string_field.cc

src/google/protobuf/compiler/java/java_string_field.h

src/google/protobuf/compiler/mock_code_generator.cc

src/google/protobuf/compiler/parser.cc

src/google/protobuf/compiler/parser.h

src/google/protobuf/compiler/parser_unittest.cc

src/google/protobuf/compiler/plugin.pb.cc

src/google/protobuf/compiler/plugin.pb.h

src/google/protobuf/compiler/python/python_generator.cc

src/google/protobuf/compiler/python/python_generator.h

src/google/protobuf/compiler/python/python_plugin_unittest.cc

src/google/protobuf/compiler/subprocess.cc

src/google/protobuf/descriptor.cc

src/google/protobuf/descriptor.h

src/google/protobuf/descriptor.pb.cc

src/google/protobuf/descriptor.pb.h

src/google/protobuf/descriptor.proto

src/google/protobuf/descriptor_database.cc

src/google/protobuf/descriptor_database.h

src/google/protobuf/descriptor_unittest.cc

src/google/protobuf/dynamic_message.cc

src/google/protobuf/dynamic_message.h

src/google/protobuf/dynamic_message_unittest.cc

src/google/protobuf/extension_set.cc

src/google/protobuf/extension_set.h

src/google/protobuf/extension_set_heavy.cc

src/google/protobuf/extension_set_unittest.cc

src/google/protobuf/generated_enum_reflection.h

src/google/protobuf/generated_message_reflection.cc

src/google/protobuf/generated_message_reflection.h

src/google/protobuf/generated_message_reflection_unittest.cc

src/google/protobuf/generated_message_util.cc

src/google/protobuf/generated_message_util.h

src/google/protobuf/io/coded_stream.cc

src/google/protobuf/io/coded_stream.h

src/google/protobuf/io/coded_stream_inl.h

src/google/protobuf/io/coded_stream_unittest.cc

src/google/protobuf/io/gzip_stream.h

src/google/protobuf/io/printer_unittest.cc

src/google/protobuf/io/tokenizer.cc

src/google/protobuf/io/tokenizer.h

src/google/protobuf/io/tokenizer_unittest.cc

src/google/protobuf/io/zero_copy_stream.cc

src/google/protobuf/io/zero_copy_stream.h

src/google/protobuf/io/zero_copy_stream_impl.cc

src/google/protobuf/io/zero_copy_stream_impl.h

src/google/protobuf/io/zero_copy_stream_impl_lite.cc

src/google/protobuf/io/zero_copy_stream_impl_lite.h

src/google/protobuf/io/zero_copy_stream_unittest.cc

src/google/protobuf/lite_unittest.cc

src/google/protobuf/message.cc

src/google/protobuf/message.h

src/google/protobuf/message_lite.cc

src/google/protobuf/message_lite.h

src/google/protobuf/message_unittest.cc

src/google/protobuf/reflection_ops.cc

src/google/protobuf/reflection_ops_unittest.cc

src/google/protobuf/repeated_field.h

src/google/protobuf/repeated_field_unittest.cc

src/google/protobuf/stubs/atomicops.h

src/google/protobuf/stubs/atomicops_internals_generic_gcc.h

src/google/protobuf/stubs/atomicops_internals_mips_gcc.h

src/google/protobuf/stubs/common.cc

src/google/protobuf/stubs/common.h

src/google/protobuf/stubs/once.h

src/google/protobuf/stubs/platform_macros.h

src/google/protobuf/stubs/strutil.cc

src/google/protobuf/stubs/strutil.h

src/google/protobuf/stubs/strutil_unittest.cc

src/google/protobuf/test_util.cc

src/google/protobuf/test_util.h

src/google/protobuf/test_util_lite.cc

src/google/protobuf/testdata/golden_message

src/google/protobuf/testdata/text_format_unittest_data.txt

src/google/protobuf/testdata/text_format_unittest_extensions_data.txt

src/google/protobuf/testing/file.cc

src/google/protobuf/testing/file.h

src/google/protobuf/text_format.cc

src/google/protobuf/text_format.h

src/google/protobuf/text_format_unittest.cc

src/google/protobuf/unittest.proto

src/google/protobuf/unittest_custom_options.proto

src/google/protobuf/unittest_lite.proto

src/google/protobuf/unittest_mset.proto

src/google/protobuf/unittest_no_generic_services.proto

src/google/protobuf/unittest_optimize_for.proto

src/google/protobuf/unknown_field_set.cc

src/google/protobuf/unknown_field_set.h

src/google/protobuf/unknown_field_set_unittest.cc

src/google/protobuf/wire_format.cc

src/google/protobuf/wire_format.h

src/google/protobuf/wire_format_lite.cc

src/google/protobuf/wire_format_lite.h

src/google/protobuf/wire_format_lite_inl.h

src/google/protobuf/wire_format_unittest.cc

vsprojects/extract_includes.bat

vsprojects/libprotobuf.vcproj

vsprojects/libprotoc.vcproj

Show diffs side-by-side

added added

removed removed

src/google/protobuf/io/zero_copy_stream_impl.cc

413

414

LimitingInputStream::LimitingInputStream(ZeroCopyInputStream* input,

415

int64 limit)

416

: input_(input), limit_(limit) {}

416

: input_(input), limit_(limit) {

417

prior_bytes_read_ = input_->ByteCount();

418

}

417

419

418

420

LimitingInputStream::~LimitingInputStream() {

419

421

// If we overshot the limit, back up.

457

459

458

460

int64 LimitingInputStream::ByteCount() const {

459

461

if (limit_ < 0) {

460

return input_->ByteCount() + limit_;

462

return input_->ByteCount() + limit_ - prior_bytes_read_;

461

463

} else {

462

return input_->ByteCount();

464

return input_->ByteCount() - prior_bytes_read_;

463

465

}

464

466

}

465

467

Older »