Permalink
Browse files

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.
  • Loading branch information...
1 parent 8ef6873 commit b796c1b31729e3e8f2501c30c0b8856f773b555c @haberman committed Mar 20, 2011
View
25 LICENSE
@@ -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.
View
3 README
@@ -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.
-
View
@@ -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.
*/
View
@@ -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"
View
@@ -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_
@@ -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
@@ -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
View
@@ -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
View
@@ -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>
View
@@ -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.
*/
View
@@ -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.
View
@@ -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>
View
@@ -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_
View
@@ -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>
View
@@ -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
View
@@ -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"
View
@@ -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_
View
@@ -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"
View
@@ -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
View
@@ -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.
*/
View
@@ -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
View
@@ -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"
View
@@ -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>
View
@@ -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>
View
@@ -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
View
@@ -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"
View
@@ -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.
View
@@ -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"
View
@@ -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
View
@@ -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"
View
@@ -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
View
@@ -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"
Oops, something went wrong.

0 comments on commit b796c1b

Please sign in to comment.