Skip to content

Removing leftover semicolons #10236

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

Closed
wants to merge 14 commits into from
Closed

Removing leftover semicolons #10236

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
91227c5
chore: unnecessary parentheses.
marcosmarcolin Dec 16, 2022
009945f
Merge branch 'php:master' into master
marcosmarcolin Dec 17, 2022
ba36a49
Merge branch 'php:master' into master
marcosmarcolin Dec 19, 2022
0386041
Merge branch 'php:master' into master
marcosmarcolin Dec 20, 2022
d6e7c73
Merge branch 'php:master' into master
marcosmarcolin Dec 21, 2022
d47eca9
Merge branch 'php:master' into master
marcosmarcolin Dec 23, 2022
b131d30
Merge branch 'php:master' into master
marcosmarcolin Dec 26, 2022
b84c549
Merge branch 'php:master' into master
marcosmarcolin Dec 26, 2022
64a9793
Merge branch 'php:master' into master
marcosmarcolin Dec 29, 2022
1afee9a
Merge branch 'php:master' into master
marcosmarcolin Jan 2, 2023
072c44e
Merge branch 'php:master' into master
marcosmarcolin Jan 3, 2023
fa8ace8
Merge branch 'php:master' into master
marcosmarcolin Jan 5, 2023
b57245e
chore: remove semicolon left over.
marcosmarcolin Jan 5, 2023
b81a3e8
Revert "chore: unnecessary parentheses."
marcosmarcolin Jan 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ext/ffi/ffi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1107,7 +1107,7 @@ static zval *zend_ffi_cdata_get(zend_object *obj, zend_string *member, int read_

if (UNEXPECTED(!zend_string_equals_literal(member, "cdata"))) {
zend_throw_error(zend_ffi_exception_ce, "Only 'cdata' property may be read");
return &EG(uninitialized_zval);;
return &EG(uninitialized_zval);
}

zend_ffi_cdata_to_zval(cdata, cdata->ptr, type, BP_VAR_R, rv, 0, 0, 0);
Expand All @@ -1123,13 +1123,13 @@ static zval *zend_ffi_cdata_set(zend_object *obj, zend_string *member, zval *val
#if 0
if (UNEXPECTED(!cdata->ptr)) {
zend_throw_error(zend_ffi_exception_ce, "NULL pointer dereference");
return &EG(uninitialized_zval);;
return &EG(uninitialized_zval);
}
#endif

if (UNEXPECTED(!zend_string_equals_literal(member, "cdata"))) {
zend_throw_error(zend_ffi_exception_ce, "Only 'cdata' property may be set");
return &EG(uninitialized_zval);;
return &EG(uninitialized_zval);
}

zend_ffi_zval_to_cdata(cdata->ptr, type, value);
Expand Down Expand Up @@ -2648,7 +2648,7 @@ static zend_result zend_ffi_pass_arg(zval *arg, zend_ffi_type *type, ffi_type **
zend_ffi_cdata *cdata = (zend_ffi_cdata*)Z_OBJ_P(arg);

if (zend_ffi_is_compatible_type(type, ZEND_FFI_TYPE(cdata->type))) {
*pass_type = zend_ffi_make_fake_struct_type(type);;
*pass_type = zend_ffi_make_fake_struct_type(type);
arg_values[n] = cdata->ptr;
break;
}
Expand Down Expand Up @@ -5770,7 +5770,7 @@ void zend_ffi_resolve_typedef(const char *name, size_t name_len, zend_ffi_dcl *d
if (FFI_G(symbols)) {
sym = zend_hash_str_find_ptr(FFI_G(symbols), name, name_len);
if (sym && sym->kind == ZEND_FFI_SYM_TYPE) {
dcl->type = ZEND_FFI_TYPE(sym->type);;
dcl->type = ZEND_FFI_TYPE(sym->type);
if (sym->is_const) {
dcl->attr |= ZEND_FFI_ATTR_CONST;
}
Expand Down