diff options
Diffstat (limited to 'third_party/upb/upb/message/accessors.c')
-rw-r--r-- | third_party/upb/upb/message/accessors.c | 41 |
1 files changed, 10 insertions, 31 deletions
diff --git a/third_party/upb/upb/message/accessors.c b/third_party/upb/upb/message/accessors.c index 9cd8e6de4a..25c0f9e5ef 100644 --- a/third_party/upb/upb/message/accessors.c +++ b/third_party/upb/upb/message/accessors.c @@ -1,38 +1,17 @@ -/* - * Copyright (c) 2009-2021, Google LLC - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * 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 Google LLC nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 LLC 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. - */ +// Protocol Buffers - Google's data interchange format +// Copyright 2023 Google LLC. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "upb/message/accessors.h" -#include "upb/collections/array.h" -#include "upb/collections/array_internal.h" -#include "upb/collections/map.h" +#include "upb/message/array.h" +#include "upb/message/internal/array.h" +#include "upb/message/map.h" #include "upb/message/message.h" #include "upb/mini_table/field.h" -#include "upb/wire/common.h" #include "upb/wire/decode.h" #include "upb/wire/encode.h" #include "upb/wire/eps_copy_input_stream.h" @@ -81,7 +60,7 @@ bool upb_Message_IsExactlyEqual(const upb_Message* m1, const upb_Message* m2, upb_EncodeStatus status2 = upb_Encode(m2, layout, opts, a, &data2, &size2); if (status1 != kUpb_EncodeStatus_Ok || status2 != kUpb_EncodeStatus_Ok) { - // TODO(salo): How should we fail here? (In Ruby we throw an exception.) + // TODO: How should we fail here? (In Ruby we throw an exception.) upb_Arena_Free(a); return false; } |