From 23c618aa7dfa20853d4be7ef2da897e7dc931e03 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Tue, 23 Jan 2024 03:38:18 +0000 Subject: [PATCH] Auto-generate files after cl/600639423 --- php/ext/google/protobuf/php-upb.c | 4 ++-- php/ext/google/protobuf/php-upb.h | 9 +++++---- ruby/ext/google/protobuf_c/ruby-upb.c | 4 ++-- ruby/ext/google/protobuf_c/ruby-upb.h | 9 +++++---- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/php/ext/google/protobuf/php-upb.c b/php/ext/google/protobuf/php-upb.c index 58d8c28f64..1f3ca81d30 100644 --- a/php/ext/google/protobuf/php-upb.c +++ b/php/ext/google/protobuf/php-upb.c @@ -11091,7 +11091,7 @@ int upb_Unicode_ToUTF8(uint32_t cp, char* out) { // Must be last. -const struct upb_Extension* _upb_Message_Getext( +const struct upb_Extension* UPB_PRIVATE(_upb_Message_Getext)( const struct upb_Message* msg, const upb_MiniTableExtension* e) { size_t n; const struct upb_Extension* ext = UPB_PRIVATE(_upb_Message_Getexts)(msg, &n); @@ -11123,7 +11123,7 @@ const struct upb_Extension* UPB_PRIVATE(_upb_Message_Getexts)( struct upb_Extension* _upb_Message_GetOrCreateExtension( struct upb_Message* msg, const upb_MiniTableExtension* e, upb_Arena* a) { struct upb_Extension* ext = - (struct upb_Extension*)_upb_Message_Getext(msg, e); + (struct upb_Extension*)UPB_PRIVATE(_upb_Message_Getext)(msg, e); if (ext) return ext; if (!UPB_PRIVATE(_upb_Message_Realloc)(msg, sizeof(struct upb_Extension), a)) return NULL; diff --git a/php/ext/google/protobuf/php-upb.h b/php/ext/google/protobuf/php-upb.h index 267919ed01..12e282154a 100644 --- a/php/ext/google/protobuf/php-upb.h +++ b/php/ext/google/protobuf/php-upb.h @@ -2011,7 +2011,7 @@ const struct upb_Extension* UPB_PRIVATE(_upb_Message_Getexts)( // Returns an extension for a message with a given mini table, // or NULL if no extension exists with this mini table. -const struct upb_Extension* _upb_Message_Getext( +const struct upb_Extension* UPB_PRIVATE(_upb_Message_Getext)( const struct upb_Message* msg, const upb_MiniTableExtension* ext); #ifdef __cplusplus @@ -2739,7 +2739,7 @@ UPB_INLINE bool UPB_PRIVATE(_upb_Message_HasBaseField)( UPB_INLINE bool UPB_PRIVATE(_upb_Message_HasExtension)( const struct upb_Message* msg, const upb_MiniTableExtension* ext) { UPB_ASSERT(upb_MiniTableField_HasPresence(&ext->UPB_PRIVATE(field))); - return _upb_Message_Getext(msg, ext) != NULL; + return UPB_PRIVATE(_upb_Message_Getext)(msg, ext) != NULL; } static UPB_FORCEINLINE void _upb_Message_GetNonExtensionField( @@ -2759,7 +2759,8 @@ static UPB_FORCEINLINE void _upb_Message_GetNonExtensionField( UPB_INLINE void _upb_Message_GetExtensionField( const struct upb_Message* msg, const upb_MiniTableExtension* mt_ext, const void* default_val, void* val) { - const struct upb_Extension* ext = _upb_Message_Getext(msg, mt_ext); + const struct upb_Extension* ext = + UPB_PRIVATE(_upb_Message_Getext)(msg, mt_ext); const upb_MiniTableField* f = &mt_ext->UPB_PRIVATE(field); UPB_ASSUME(upb_MiniTableField_IsExtension(f)); @@ -2815,7 +2816,7 @@ UPB_INLINE void UPB_PRIVATE(_upb_Message_ClearExtension)( const struct upb_Extension* base = UPB_PTR_AT(in, in->ext_begin, struct upb_Extension); struct upb_Extension* ext = - (struct upb_Extension*)_upb_Message_Getext(msg, e); + (struct upb_Extension*)UPB_PRIVATE(_upb_Message_Getext)(msg, e); if (ext) { *ext = *base; in->ext_begin += sizeof(struct upb_Extension); diff --git a/ruby/ext/google/protobuf_c/ruby-upb.c b/ruby/ext/google/protobuf_c/ruby-upb.c index ac276c516c..f6d6698118 100644 --- a/ruby/ext/google/protobuf_c/ruby-upb.c +++ b/ruby/ext/google/protobuf_c/ruby-upb.c @@ -10605,7 +10605,7 @@ int upb_Unicode_ToUTF8(uint32_t cp, char* out) { // Must be last. -const struct upb_Extension* _upb_Message_Getext( +const struct upb_Extension* UPB_PRIVATE(_upb_Message_Getext)( const struct upb_Message* msg, const upb_MiniTableExtension* e) { size_t n; const struct upb_Extension* ext = UPB_PRIVATE(_upb_Message_Getexts)(msg, &n); @@ -10637,7 +10637,7 @@ const struct upb_Extension* UPB_PRIVATE(_upb_Message_Getexts)( struct upb_Extension* _upb_Message_GetOrCreateExtension( struct upb_Message* msg, const upb_MiniTableExtension* e, upb_Arena* a) { struct upb_Extension* ext = - (struct upb_Extension*)_upb_Message_Getext(msg, e); + (struct upb_Extension*)UPB_PRIVATE(_upb_Message_Getext)(msg, e); if (ext) return ext; if (!UPB_PRIVATE(_upb_Message_Realloc)(msg, sizeof(struct upb_Extension), a)) return NULL; diff --git a/ruby/ext/google/protobuf_c/ruby-upb.h b/ruby/ext/google/protobuf_c/ruby-upb.h index dda8b34484..49e0dbc085 100755 --- a/ruby/ext/google/protobuf_c/ruby-upb.h +++ b/ruby/ext/google/protobuf_c/ruby-upb.h @@ -2013,7 +2013,7 @@ const struct upb_Extension* UPB_PRIVATE(_upb_Message_Getexts)( // Returns an extension for a message with a given mini table, // or NULL if no extension exists with this mini table. -const struct upb_Extension* _upb_Message_Getext( +const struct upb_Extension* UPB_PRIVATE(_upb_Message_Getext)( const struct upb_Message* msg, const upb_MiniTableExtension* ext); #ifdef __cplusplus @@ -2741,7 +2741,7 @@ UPB_INLINE bool UPB_PRIVATE(_upb_Message_HasBaseField)( UPB_INLINE bool UPB_PRIVATE(_upb_Message_HasExtension)( const struct upb_Message* msg, const upb_MiniTableExtension* ext) { UPB_ASSERT(upb_MiniTableField_HasPresence(&ext->UPB_PRIVATE(field))); - return _upb_Message_Getext(msg, ext) != NULL; + return UPB_PRIVATE(_upb_Message_Getext)(msg, ext) != NULL; } static UPB_FORCEINLINE void _upb_Message_GetNonExtensionField( @@ -2761,7 +2761,8 @@ static UPB_FORCEINLINE void _upb_Message_GetNonExtensionField( UPB_INLINE void _upb_Message_GetExtensionField( const struct upb_Message* msg, const upb_MiniTableExtension* mt_ext, const void* default_val, void* val) { - const struct upb_Extension* ext = _upb_Message_Getext(msg, mt_ext); + const struct upb_Extension* ext = + UPB_PRIVATE(_upb_Message_Getext)(msg, mt_ext); const upb_MiniTableField* f = &mt_ext->UPB_PRIVATE(field); UPB_ASSUME(upb_MiniTableField_IsExtension(f)); @@ -2817,7 +2818,7 @@ UPB_INLINE void UPB_PRIVATE(_upb_Message_ClearExtension)( const struct upb_Extension* base = UPB_PTR_AT(in, in->ext_begin, struct upb_Extension); struct upb_Extension* ext = - (struct upb_Extension*)_upb_Message_Getext(msg, e); + (struct upb_Extension*)UPB_PRIVATE(_upb_Message_Getext)(msg, e); if (ext) { *ext = *base; in->ext_begin += sizeof(struct upb_Extension);