AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Fix Implicit Return Types (#3363)

Browse Source 
Both native_slot_merge and native_slot_merge_by_array have no return
type declared. GCC implicitly uses int as return type in such cases,
however, these functions are actually void.
This commit is contained in:
Richard Fussenegger 2017-07-17 18:13:12 +02:00 committed by Paul Yang
parent c78dbd7c89
commit 29ff49f534
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
php/ext/google/protobuf/storage.c
View File

@ -762,7 +762,7 @@ void layout_set(MessageLayout* layout, MessageHeader* header,
}
}
static native_slot_merge(const upb_fielddef* field, const void* from_memory,
static void native_slot_merge(const upb_fielddef* field, const void* from_memory,
void* to_memory PHP_PROTO_TSRMLS_DC) {
upb_fieldtype_t type = upb_fielddef_type(field);
zend_class_entry* ce = NULL;
@ -819,7 +819,7 @@ static native_slot_merge(const upb_fielddef* field, const void* from_memory,
}
}
static native_slot_merge_by_array(const upb_fielddef* field, const void* from_memory,
static void native_slot_merge_by_array(const upb_fielddef* field, const void* from_memory,
void* to_memory PHP_PROTO_TSRMLS_DC) {
upb_fieldtype_t type = upb_fielddef_type(field);
switch (type) {