diff options
38 files changed, 95 insertions, 66 deletions
@@ -1,6 +1,5 @@ -Copyright (c) 2009-2010, Joshua Haberman -Copyright (c) 2009-2010, Google Inc. +Copyright (c) 2009-2011, Google Inc. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -11,17 +10,17 @@ modification, are permitted provided that the following conditions are met: * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Joshua Haberman nor the names of any other + * Neither the name of Google Inc. nor the names of any other contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY JOSHUA HABERMAN ``AS IS'' AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL JOSHUA HABERMAN BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +EVENT SHALL GOOGLE INC. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. @@ -36,6 +36,5 @@ the major things that are broken or not yet implemented yet: CONTACT ======= -Author: Joshua Haberman (jhaberman@gmail.com, haberman@google.com) +Author: Josh Haberman (jhaberman@gmail.com, haberman@google.com) See LICENSE for copyright information. - diff --git a/lang_ext/lua/upb.c b/lang_ext/lua/upb.c index aa5f4a1..cc21922 100644 --- a/lang_ext/lua/upb.c +++ b/lang_ext/lua/upb.c @@ -1,7 +1,8 @@ /* * upb - a minimalist implementation of protocol buffers. * - * Copyright (c) 2009 Joshua Haberman. See LICENSE for details. + * Copyright (c) 2009 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> * * A Lua extension for upb. */ diff --git a/lang_ext/python/cext.c b/lang_ext/python/cext.c index c2199c4..59e8346 100644 --- a/lang_ext/python/cext.c +++ b/lang_ext/python/cext.c @@ -1,8 +1,8 @@ /* * upb - a minimalist implementation of protocol buffers. * - * Copyright (c) 2009 Joshua Haberman. See LICENSE for details. - * + * Copyright (c) 2009 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> */ #include "cext.h" diff --git a/lang_ext/python/cext.h b/lang_ext/python/cext.h index e0e7832..f53e6e7 100644 --- a/lang_ext/python/cext.h +++ b/lang_ext/python/cext.h @@ -2,7 +2,7 @@ * upb - a minimalist implementation of protocol buffers. * * Copyright (c) 2009 Joshua Haberman. See LICENSE for details. - * + * Author: Josh Haberman <jhaberman@gmail.com> */ #ifndef UPB_PYTHON_CEXT_H_ diff --git a/lang_ext/python/definition.c b/lang_ext/python/definition.c index cc1089d..8e8b852 100644 --- a/lang_ext/python/definition.c +++ b/lang_ext/python/definition.c @@ -1,7 +1,8 @@ /* * upb - a minimalist implementation of protocol buffers. * - * Copyright (c) 2009 Joshua Haberman. See LICENSE for details. + * Copyright (c) 2009 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> * * This file defines the Python module upb.definition. This module * defines the following Python classes, which wrap upb's internal diff --git a/lang_ext/python/definition.h b/lang_ext/python/definition.h index 040019d..f7162cf 100644 --- a/lang_ext/python/definition.h +++ b/lang_ext/python/definition.h @@ -1,7 +1,8 @@ /* * upb - a minimalist implementation of protocol buffers. * - * Copyright (c) 2009 Joshua Haberman. See LICENSE for details. + * Copyright (c) 2009 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> * * See def.h for a general description. These definitions * must be shared so that specific Python message types (for the diff --git a/lang_ext/python/pb.c b/lang_ext/python/pb.c index 0e04a6b..70d32d7 100644 --- a/lang_ext/python/pb.c +++ b/lang_ext/python/pb.c @@ -1,7 +1,8 @@ /* * upb - a minimalist implementation of protocol buffers. * - * Copyright (c) 2009 Joshua Haberman. See LICENSE for details. + * Copyright (c) 2009 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> * * This file implements an interface to Python that is compatible * (as much as possible) with proto1 (the first implementation of @@ -1,8 +1,8 @@ /* * upb - a minimalist implementation of protocol buffers. * - * Copyright (c) 2009 Joshua Haberman. See LICENSE for details. - * + * Copyright (c) 2009 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> */ #include <stdarg.h> @@ -1,7 +1,8 @@ /* * upb - a minimalist implementation of protocol buffers. * - * Copyright (c) 2009 Joshua Haberman. See LICENSE for details. + * Copyright (c) 2009 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> * * This file contains shared definitions that are widely used across upb. */ diff --git a/src/upb_atomic.h b/src/upb_atomic.h index 87d06fe..b1ba60d 100644 --- a/src/upb_atomic.h +++ b/src/upb_atomic.h @@ -1,7 +1,8 @@ /* * upb - a minimalist implementation of protocol buffers. * - * Copyright (c) 2009 Joshua Haberman. See LICENSE for details. + * Copyright (c) 2009 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> * * Only a very small part of upb is thread-safe. Notably, individual * messages, arrays, and strings are *not* thread safe for mutating. diff --git a/src/upb_decoder.c b/src/upb_decoder.c index 6fa37b4..a3d00bb 100644 --- a/src/upb_decoder.c +++ b/src/upb_decoder.c @@ -1,7 +1,8 @@ /* * upb - a minimalist implementation of protocol buffers. * - * Copyright (c) 2008-2011 Joshua Haberman. See LICENSE for details. + * Copyright (c) 2008-2011 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> */ #include <inttypes.h> diff --git a/src/upb_decoder.h b/src/upb_decoder.h index af2124c..32a989a 100644 --- a/src/upb_decoder.h +++ b/src/upb_decoder.h @@ -1,6 +1,9 @@ /* * upb - a minimalist implementation of protocol buffers. * + * Copyright (c) 2009-2010 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> + * * upb_decoder implements a high performance, streaming decoder for protobuf * data that works by implementing upb_src and getting its data from a * upb_bytesrc. @@ -9,8 +12,6 @@ * if the bytesrc returns UPB_STATUS_TRYAGAIN it is not possible to resume the * decoder when data becomes available again. Support for this could be added, * but it would add complexity and perhaps cost efficiency also. - * - * Copyright (c) 2009-2010 Joshua Haberman. See LICENSE for details. */ #ifndef UPB_DECODER_H_ diff --git a/src/upb_def.c b/src/upb_def.c index 08e5a8c..059edd6 100644 --- a/src/upb_def.c +++ b/src/upb_def.c @@ -1,7 +1,8 @@ /* * upb - a minimalist implementation of protocol buffers. * - * Copyright (c) 2008-2009 Joshua Haberman. See LICENSE for details. + * Copyright (c) 2008-2009 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> */ #include <stdlib.h> diff --git a/src/upb_def.h b/src/upb_def.h index 9950c86..e19aeba 100644 --- a/src/upb_def.h +++ b/src/upb_def.h @@ -1,7 +1,8 @@ /* * upb - a minimalist implementation of protocol buffers. * - * Copyright (c) 2009-2011 Joshua Haberman. See LICENSE for details. + * Copyright (c) 2009-2011 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> * * Provides a mechanism for loading proto definitions from descriptors, and * data structures to represent those definitions. These form the protobuf diff --git a/src/upb_encoder.c b/src/upb_encoder.c index 304a423..139dc88 100644 --- a/src/upb_encoder.c +++ b/src/upb_encoder.c @@ -1,7 +1,8 @@ /* * upb - a minimalist implementation of protocol buffers. * - * Copyright (c) 2009 Joshua Haberman. See LICENSE for details. + * Copyright (c) 2009 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> */ #include "upb_encoder.h" diff --git a/src/upb_encoder.h b/src/upb_encoder.h index d8d4b4f..64c5047 100644 --- a/src/upb_encoder.h +++ b/src/upb_encoder.h @@ -1,13 +1,15 @@ /* * upb - a minimalist implementation of protocol buffers. * - * Implements a upb_sink that writes protobuf data to the binary wire format. + * Copyright (c) 2009-2010 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> + * + * Implements a set of upb_handlers that write protobuf data to the binary wire + * format. * * For messages that have any submessages, the encoder needs a buffer * containing the submessage sizes, so they can be properly written at the * front of each message. Note that groups do *not* have this requirement. - * - * Copyright (c) 2009-2010 Joshua Haberman. See LICENSE for details. */ #ifndef UPB_ENCODER_H_ diff --git a/src/upb_glue.c b/src/upb_glue.c index 8194d4a..41f974b 100644 --- a/src/upb_glue.c +++ b/src/upb_glue.c @@ -1,7 +1,8 @@ /* * upb - a minimalist implementation of protocol buffers. * - * Copyright (c) 2010 Joshua Haberman. See LICENSE for details. + * Copyright (c) 2010 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> */ #include "upb_glue.h" diff --git a/src/upb_glue.h b/src/upb_glue.h index afb7b59..d1a26d1 100644 --- a/src/upb_glue.h +++ b/src/upb_glue.h @@ -1,6 +1,9 @@ /* * upb - a minimalist implementation of protocol buffers. * + * Copyright (c) 2011 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> + * * upb's core components like upb_decoder and upb_msg are carefully designed to * avoid depending on each other for maximum orthogonality. In other words, * you can use a upb_decoder to decode into *any* kind of structure; upb_msg is @@ -18,8 +21,6 @@ * time these functions are called. For this reason, if you are parsing lots * of data and efficiency is an issue, these may not be the best functions to * use (though they are useful for prototyping, before optimizing). - * - * Copyright (c) 2011 Joshua Haberman. See LICENSE for details. */ #ifndef UPB_GLUE_H diff --git a/src/upb_msg.c b/src/upb_msg.c index a9167e8..1705b35 100644 --- a/src/upb_msg.c +++ b/src/upb_msg.c @@ -1,7 +1,8 @@ /* * upb - a minimalist implementation of protocol buffers. * - * Copyright (c) 2010 Joshua Haberman. See LICENSE for details. + * Copyright (c) 2010 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> * * Data structure for storing a message of protobuf data. */ diff --git a/src/upb_msg.h b/src/upb_msg.h index 4895c4b..6785131 100644 --- a/src/upb_msg.h +++ b/src/upb_msg.h @@ -1,7 +1,8 @@ /* * upb - a minimalist implementation of protocol buffers. * - * Copyright (c) 2010-2011 Joshua Haberman. See LICENSE for details. + * Copyright (c) 2010-2011 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> * * Data structure for storing a message of protobuf data. Unlike Google's * protobuf, upb_msg and upb_array are reference counted instead of having diff --git a/src/upb_stdio.c b/src/upb_stdio.c index b4f2fce..c84d52a 100644 --- a/src/upb_stdio.c +++ b/src/upb_stdio.c @@ -1,7 +1,8 @@ /* * upb - a minimalist implementation of protocol buffers. * - * Copyright (c) 2010 Joshua Haberman. See LICENSE for details. + * Copyright (c) 2010 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> */ #include "upb_stdio.h" diff --git a/src/upb_stdio.h b/src/upb_stdio.h index fd71fdd..ba5fe1a 100644 --- a/src/upb_stdio.h +++ b/src/upb_stdio.h @@ -1,10 +1,11 @@ /* * upb - a minimalist implementation of protocol buffers. * + * Copyright (c) 2010 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> + * * This file provides upb_bytesrc and upb_bytesink implementations for * ANSI C stdio. - * - * Copyright (c) 2010 Joshua Haberman. See LICENSE for details. */ #include <stdio.h> diff --git a/src/upb_stream.c b/src/upb_stream.c index 3634d5d..af266dc 100644 --- a/src/upb_stream.c +++ b/src/upb_stream.c @@ -1,7 +1,8 @@ /* * upb - a minimalist implementation of protocol buffers. * - * Copyright (c) 2011 Joshua Haberman. See LICENSE for details. + * Copyright (c) 2011 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> */ #include <stdlib.h> diff --git a/src/upb_stream.h b/src/upb_stream.h index 9221a6b..f2ae11c 100644 --- a/src/upb_stream.h +++ b/src/upb_stream.h @@ -1,6 +1,9 @@ /* * upb - a minimalist implementation of protocol buffers. * + * Copyright (c) 2010-2011 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> + * * This file defines general-purpose streaming data interfaces: * * - upb_handlers: represents a set of callbacks, very much like in XML's SAX @@ -20,9 +23,6 @@ * with input that came from protobuf binary format, protobuf text format, or * even an in-memory upb_msg -- the pretty printer will not know the * difference. - * - * Copyright (c) 2010-2011 Joshua Haberman. See LICENSE for details. - * */ #ifndef UPB_STREAM_H diff --git a/src/upb_string.c b/src/upb_string.c index cbc3414..de633bc 100644 --- a/src/upb_string.c +++ b/src/upb_string.c @@ -1,7 +1,8 @@ /* * upb - a minimalist implementation of protocol buffers. * - * Copyright (c) 2010 Joshua Haberman. See LICENSE for details. + * Copyright (c) 2010 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> */ #include "upb_string.h" diff --git a/src/upb_string.h b/src/upb_string.h index 38c3d55..88a513f 100644 --- a/src/upb_string.h +++ b/src/upb_string.h @@ -1,7 +1,8 @@ /* * upb - a minimalist implementation of protocol buffers. * - * Copyright (c) 2010 Joshua Haberman. See LICENSE for details. + * Copyright (c) 2010 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> * * This file defines a simple string type which is length-delimited instead * of NULL-terminated, and which has useful sharing semantics. diff --git a/src/upb_strstream.c b/src/upb_strstream.c index 8ef9884..37b5179 100644 --- a/src/upb_strstream.c +++ b/src/upb_strstream.c @@ -1,7 +1,8 @@ /* * upb - a minimalist implementation of protocol buffers. * - * Copyright (c) 2010 Joshua Haberman. See LICENSE for details. + * Copyright (c) 2010 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> */ #include "upb_strstream.h" diff --git a/src/upb_strstream.h b/src/upb_strstream.h index cd8ff01..8da5393 100644 --- a/src/upb_strstream.h +++ b/src/upb_strstream.h @@ -1,10 +1,11 @@ /* * upb - a minimalist implementation of protocol buffers. * + * Copyright (c) 2009-2010 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> + * * This file contains upb_bytesrc and upb_bytesink implementations for * upb_string. - * - * Copyright (c) 2009-2010 Joshua Haberman. See LICENSE for details. */ #ifndef UPB_STRSTREAM_H diff --git a/src/upb_table.c b/src/upb_table.c index 54af32d..b9b9824 100644 --- a/src/upb_table.c +++ b/src/upb_table.c @@ -1,9 +1,11 @@ /* * upb - a minimalist implementation of protocol buffers. * + * Copyright (c) 2009 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> + * * There are a few printf's strewn throughout this file, uncommenting them * can be useful for debugging. - * Copyright (c) 2009 Joshua Haberman. See LICENSE for details. */ #include "upb_table.h" diff --git a/src/upb_table.h b/src/upb_table.h index a799653..9b53a37 100644 --- a/src/upb_table.h +++ b/src/upb_table.h @@ -1,7 +1,8 @@ /* * upb - a minimalist implementation of protocol buffers. * - * Copyright (c) 2009 Joshua Haberman. See LICENSE for details. + * Copyright (c) 2009 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> * * This file defines very fast int->struct (inttable) and string->struct * (strtable) hash tables. The struct can be of any size, and it is stored diff --git a/src/upb_textprinter.c b/src/upb_textprinter.c index 6f123d6..948d28c 100644 --- a/src/upb_textprinter.c +++ b/src/upb_textprinter.c @@ -1,7 +1,8 @@ /* * upb - a minimalist implementation of protocol buffers. * - * Copyright (c) 2009 Joshua Haberman. See LICENSE for details. + * Copyright (c) 2009 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> */ #include "upb_textprinter.h" diff --git a/src/upb_textprinter.h b/src/upb_textprinter.h index 40f392b..aa9febb 100644 --- a/src/upb_textprinter.h +++ b/src/upb_textprinter.h @@ -1,7 +1,8 @@ /* * upb - a minimalist implementation of protocol buffers. * - * Copyright (c) 2009 Joshua Haberman. See LICENSE for details. + * Copyright (c) 2009 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> */ #ifndef UPB_TEXT_H_ diff --git a/src/upb_varint_decoder.h b/src/upb_varint_decoder.h index 8619596..6d88022 100644 --- a/src/upb_varint_decoder.h +++ b/src/upb_varint_decoder.h @@ -1,13 +1,14 @@ /* * upb - a minimalist implementation of protocol buffers. * + * Copyright (c) 2011 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> + * * A number of routines for varint decoding (we keep them all around to have * multiple approaches available for benchmarking). All of these functions * require the buffer to have at least 10 bytes available; if we don't know * for sure that there are 10 bytes, then there is only one viable option * (branching on every byte). - * - * Copyright (c) 2011 Joshua Haberman. See LICENSE for details. */ #ifndef UPB_VARINT_DECODER_H_ @@ -1,11 +1,12 @@ /* * upb - a minimalist implementation of protocol buffers. * - * upbc is the upb compiler. This is some deep code that I wish could be - * easier to understand, but by its nature it is doing some very "meta" - * kinds of things. + * Copyright (c) 2009 Google Inc. See LICENSE for details. + * Author: Josh Haberman <jhaberman@gmail.com> * - * Copyright (c) 2009 Joshua Haberman. See LICENSE for details. + * upbc is the upb compiler, which at the moment simply takes a + * protocol descriptor and outputs a header file containing the + * names and types of the fields. */ #include <ctype.h> diff --git a/tests/test_varint.c b/tests/test_varint.c index 0150c06..ef74fa6 100644 --- a/tests/test_varint.c +++ b/tests/test_varint.c @@ -1,7 +1,7 @@ /* * upb - a minimalist implementation of protocol buffers. * - * Copyright (c) 2011 Joshua Haberman. See LICENSE for details. + * Copyright (c) 2011 Google Inc. See LICENSE for details. */ #include "upb_varint_decoder.h" diff --git a/tests/test_vs_proto2.cc b/tests/test_vs_proto2.cc index f3c54b4..86d21d2 100644 --- a/tests/test_vs_proto2.cc +++ b/tests/test_vs_proto2.cc @@ -1,10 +1,10 @@ /* * upb - a minimalist implementation of protocol buffers. * + * Copyright (c) 2011 Google Inc. See LICENSE for details. + * * A test that verifies that our results are identical to proto2 for a * given proto type and input protobuf. - * - * Copyright (c) 2011 Joshua Haberman. See LICENSE for details. */ #include <assert.h> diff --git a/tests/upb_test.h b/tests/upb_test.h index 0e307c5..3009a40 100644 --- a/tests/upb_test.h +++ b/tests/upb_test.h @@ -1,7 +1,7 @@ /* * upb - a minimalist implementation of protocol buffers. * - * Copyright (c) 2011 Joshua Haberman. See LICENSE for details. + * Copyright (c) 2011 Google Inc. See LICENSE for details. */ #ifndef UPB_TEST_H_ |