From b796c1b31729e3e8f2501c30c0b8856f773b555c Mon Sep 17 00:00:00 2001 From: Josh Haberman Date: Sun, 20 Mar 2011 13:49:16 -0700 Subject: Update copyright to be Google Inc. This doesn't reflect any material change in how I will be working on upb, and I have no problem making this change. It's still open source under the BSD license, and I'll still be working on it well beyond the hours that constitute a normal job. --- src/upb.c | 4 ++-- src/upb.h | 3 ++- src/upb_atomic.h | 3 ++- src/upb_decoder.c | 3 ++- src/upb_decoder.h | 5 +++-- src/upb_def.c | 3 ++- src/upb_def.h | 3 ++- src/upb_encoder.c | 3 ++- src/upb_encoder.h | 8 +++++--- src/upb_glue.c | 3 ++- src/upb_glue.h | 5 +++-- src/upb_msg.c | 3 ++- src/upb_msg.h | 3 ++- src/upb_stdio.c | 3 ++- src/upb_stdio.h | 5 +++-- src/upb_stream.c | 3 ++- src/upb_stream.h | 6 +++--- src/upb_string.c | 3 ++- src/upb_string.h | 3 ++- src/upb_strstream.c | 3 ++- src/upb_strstream.h | 5 +++-- src/upb_table.c | 4 +++- src/upb_table.h | 3 ++- src/upb_textprinter.c | 3 ++- src/upb_textprinter.h | 3 ++- src/upb_varint_decoder.h | 5 +++-- src/upbc.c | 9 +++++---- 27 files changed, 67 insertions(+), 40 deletions(-) (limited to 'src') diff --git a/src/upb.c b/src/upb.c index fdf5c07..b80de29 100644 --- a/src/upb.c +++ b/src/upb.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 */ #include diff --git a/src/upb.h b/src/upb.h index 01de8cf..5dfd65e 100644 --- a/src/upb.h +++ b/src/upb.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 * * 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 * * 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 */ #include 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 + * * 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 */ #include 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 * * 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 */ #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 + * + * 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 */ #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 + * * 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 * * 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 * * 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 */ #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 + * * This file provides upb_bytesrc and upb_bytesink implementations for * ANSI C stdio. - * - * Copyright (c) 2010 Joshua Haberman. See LICENSE for details. */ #include 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 */ #include 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 + * * 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 */ #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 * * 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 */ #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 + * * 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 + * * 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 * * 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 */ #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 */ #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 + * * 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_ diff --git a/src/upbc.c b/src/upbc.c index 4fa8a71..956a1b2 100644 --- a/src/upbc.c +++ b/src/upbc.c @@ -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 * - * 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 -- cgit v1.2.3