upb_MiniTableExtension_Build() -> upb_MiniTableExtension_Init()

The upb convention is that "_Build()" means to also allocate, which this function does not do, so rename it as "_Init()" to free up the name for a future function that does allocate.

PiperOrigin-RevId: 510282736
pull/13171/head
Eric Salo 2 years ago committed by Copybara-Service
parent 9bd37b8413
commit e860867804
  1. 12
      upb/mini_table/decode.c
  2. 23
      upb/mini_table/decode.h
  3. 8
      upb/reflection/field_def.c
  4. 4
      upb/test/fuzz_util.cc

@ -975,12 +975,12 @@ static const char* upb_MtDecoder_BuildMiniTableExtension(
extendee, sub);
}
const char* _upb_MiniTableExtension_Build(const char* data, size_t len,
upb_MiniTableExtension* ext,
const upb_MiniTable* extendee,
upb_MiniTableSub sub,
upb_MiniTablePlatform platform,
upb_Status* status) {
const char* _upb_MiniTableExtension_Init(const char* data, size_t len,
upb_MiniTableExtension* ext,
const upb_MiniTable* extendee,
upb_MiniTableSub sub,
upb_MiniTablePlatform platform,
upb_Status* status) {
upb_MtDecoder decoder = {
.arena = NULL,
.status = status,

@ -79,18 +79,21 @@ UPB_API bool upb_MiniTable_SetSubEnum(upb_MiniTable* table,
upb_MiniTableField* field,
const upb_MiniTableEnum* sub);
const char* _upb_MiniTableExtension_Build(const char* data, size_t len,
upb_MiniTableExtension* ext,
const upb_MiniTable* extendee,
upb_MiniTableSub sub,
upb_MiniTablePlatform platform,
upb_Status* status);
UPB_API_INLINE const char* upb_MiniTableExtension_Build(
// Initializes a MiniTableExtension buffer that has already been allocated.
// This is needed (for example) by upb_FileDef, which allocates all of the
// extensions together in a single contiguous array.
const char* _upb_MiniTableExtension_Init(const char* data, size_t len,
upb_MiniTableExtension* ext,
const upb_MiniTable* extendee,
upb_MiniTableSub sub,
upb_MiniTablePlatform platform,
upb_Status* status);
UPB_API_INLINE const char* upb_MiniTableExtension_Init(
const char* data, size_t len, upb_MiniTableExtension* ext,
const upb_MiniTable* extendee, upb_MiniTableSub sub, upb_Status* status) {
return _upb_MiniTableExtension_Build(data, len, ext, extendee, sub,
kUpb_MiniTablePlatform_Native, status);
return _upb_MiniTableExtension_Init(data, len, ext, extendee, sub,
kUpb_MiniTablePlatform_Native, status);
}
UPB_API upb_MiniTableEnum* upb_MiniTableEnum_Build(const char* data, size_t len,

@ -593,7 +593,7 @@ static void _upb_FieldDef_Create(upb_DefBuilder* ctx, const char* prefix,
}
} else if (has_type_name) {
f->type_ =
UPB_FIELD_TYPE_UNSPECIFIED; // We'll fill this in in resolve_fielddef()
UPB_FIELD_TYPE_UNSPECIFIED; // We'll assign this in resolve_fielddef()
}
if (f->type_ < kUpb_FieldType_Double || f->type_ > kUpb_FieldType_SInt64) {
@ -877,9 +877,9 @@ void _upb_FieldDef_BuildMiniTableExtension(upb_DefBuilder* ctx,
} else if (_upb_FieldDef_IsClosedEnum(f)) {
sub.subenum = _upb_EnumDef_MiniTable(f->sub.enumdef);
}
bool ok2 = upb_MiniTableExtension_Build(desc.data, desc.size, mut_ext,
upb_MessageDef_MiniTable(f->msgdef),
sub, ctx->status);
bool ok2 = upb_MiniTableExtension_Init(desc.data, desc.size, mut_ext,
upb_MessageDef_MiniTable(f->msgdef),
sub, ctx->status);
if (!ok2) _upb_DefBuilder_Errf(ctx, "Could not build extension mini table");
}

@ -134,8 +134,8 @@ void Builder::BuildExtensions(upb_ExtensionRegistry** exts) {
upb_MiniTableSub sub;
const upb_MiniTable* extendee = NextMiniTable();
if (!extendee) break;
ptr = upb_MiniTableExtension_Build(ptr, end - ptr, ext, extendee, sub,
status.ptr());
ptr = upb_MiniTableExtension_Init(ptr, end - ptr, ext, extendee, sub,
status.ptr());
if (!ptr) break;
if (!LinkExtension(ext)) continue;
if (upb_ExtensionRegistry_Lookup(*exts, ext->extendee, ext->field.number))

Loading…
Cancel
Save