Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove add_proto_enumdesc and get_proto_enumdesc #6931

Merged
merged 1 commit into from
Nov 22, 2019
Merged

Remove add_proto_enumdesc and get_proto_enumdesc #6931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion php/ext/google/protobuf/def.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -965,7 +965,6 @@ void register_class(void *desc, bool is_enum TSRMLS_DC) {
if (is_enum) {
EnumDescriptorInternal* enumdesc = desc;
add_ce_enumdesc(ret, desc);
add_proto_enumdesc(fullname, desc);
enumdesc->klass = ret;
} else {
DescriptorInternal* msgdesc = desc;
Expand Down
21 changes: 0 additions & 21 deletions php/ext/google/protobuf/protobuf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ static upb_inttable ce_to_enumdesc_map_persistent;
// Global map from message/enum's proto fully-qualified name to corresponding
// wrapper Descriptor/EnumDescriptor instances.
static upb_strtable proto_to_desc_map_persistent;
static upb_strtable proto_to_enumdesc_map_persistent;
static upb_strtable class_to_desc_map_persistent;

upb_strtable reserved_names;
Expand Down Expand Up @@ -215,24 +214,6 @@ DescriptorInternal* get_proto_desc(const char* proto) {
}
}

void add_proto_enumdesc(const char* proto, EnumDescriptorInternal* desc) {
upb_strtable_insert2(&proto_to_enumdesc_map_persistent, proto,
strlen(proto), upb_value_ptr(desc));
}

EnumDescriptorInternal* get_proto_enumdesc(const char* proto) {
upb_value v;
#ifndef NDEBUG
v.ctype = UPB_CTYPE_PTR;
#endif
if (!upb_strtable_lookupptr(&proto_to_enumdesc_map_persistent,
proto, strlen(proto), &v)) {
return NULL;
} else {
return upb_value_getptr(v);
}
}

void add_class_desc(const char* klass, DescriptorInternal* desc) {
upb_strtable_insert(&class_to_desc_map_persistent, klass,
upb_value_ptr(desc));
Expand Down Expand Up @@ -378,7 +359,6 @@ static initialize_persistent_descriptor_pool(TSRMLS_D) {
upb_inttable_init(&ce_to_desc_map_persistent, UPB_CTYPE_PTR);
upb_inttable_init(&ce_to_enumdesc_map_persistent, UPB_CTYPE_PTR);
upb_strtable_init(&proto_to_desc_map_persistent, UPB_CTYPE_PTR);
upb_strtable_init(&proto_to_enumdesc_map_persistent, UPB_CTYPE_PTR);
upb_strtable_init(&class_to_desc_map_persistent, UPB_CTYPE_PTR);

internal_descriptor_pool_impl_init(&generated_pool_impl TSRMLS_CC);
Expand Down Expand Up @@ -459,7 +439,6 @@ static cleanup_persistent_descriptor_pool(TSRMLS_D) {
upb_inttable_uninit(&ce_to_desc_map_persistent);
upb_inttable_uninit(&ce_to_enumdesc_map_persistent);
upb_strtable_uninit(&proto_to_desc_map_persistent);
upb_strtable_uninit(&proto_to_enumdesc_map_persistent);
upb_strtable_uninit(&class_to_desc_map_persistent);
}

Expand Down
2 changes: 0 additions & 2 deletions php/ext/google/protobuf/protobuf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,8 +777,6 @@ EnumDescriptorInternal* get_ce_enumdesc(const zend_class_entry* ce);
// wrapper Descriptor/EnumDescriptor instances.
void add_proto_desc(const char* proto, DescriptorInternal* desc);
DescriptorInternal* get_proto_desc(const char* proto);
void add_proto_enumdesc(const char* proto, EnumDescriptorInternal* desc);
EnumDescriptorInternal* get_proto_enumdesc(const char* proto);
void add_class_desc(const char* klass, DescriptorInternal* desc);
DescriptorInternal* get_class_desc(const char* klass);
void add_class_enumdesc(const char* klass, EnumDescriptorInternal* desc);
Expand Down