Commit af87ade

authored

Cleanup php_posix_group_to_array() (#18497)

This function can be static, and the error checks are pointless: 1. It's guaranteed that the return value is an array by now, as it is always preceded by array_init(return_value). 2. The null check for g is pointless as every callee already handles that in a better way.

1 parent 1fa076e commit af87adeCopy full SHA for af87ade

File tree

1 file changed

-17

lines changed

ext/posix
- posix.c

1 file changed

-17

lines changed

`‎ext/posix/posix.c‎`

Lines changed: 4 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -659,16 +659,12 @@ PHP_FUNCTION(posix_mknod)`
`659`	`659`
`660`	`660`	`/* Takes a pointer to posix group and a pointer to an already initialized ZVAL`
`661`	`661`	`* array container and fills the array with the posix group member data. */`
`662`		`-int php_posix_group_to_array(struct group g, zval array_group) /* {{{ */`
	`662`	`+staticvoid php_posix_group_to_array(struct group g, zval array_group) /* {{{ */`
`663`	`663`	`{`
`664`	`664`	`zval array_members;`
`665`	`665`	`int count;`
`666`	`666`
`667`		`- if (NULL == g)`
`668`		`- return 0;`
`669`		`-`
`670`		`- if (array_group == NULL \|\| Z_TYPE_P(array_group) != IS_ARRAY)`
`671`		`- return 0;`
	`667`	`+ ZEND_ASSERT(Z_TYPE_P(array_group) == IS_ARRAY);`
`672`	`668`
`673`	`669`	`array_init(&array_members);`
`674`	`670`	`zend_hash_real_init_packed(Z_ARRVAL(array_members));`
`@@ -691,7 +687,6 @@ int php_posix_group_to_array(struct group g, zval array_group) /* {{{ */`
`691`	`687`	`}`
`692`	`688`	`zend_hash_str_update(Z_ARRVAL_P(array_group), "members", sizeof("members")-1, &array_members);`
`693`	`689`	`add_assoc_long(array_group, "gid", g->gr_gid);`
`694`		`- return 1;`
`695`	`690`	`}`
`696`	`691`	`/* }}} */`
`697`	`692`
`@@ -833,11 +828,7 @@ PHP_FUNCTION(posix_getgrnam)`
`833`	`828`	`#endif`
`834`	`829`	`array_init(return_value);`
`835`	`830`
`836`		`- if (!php_posix_group_to_array(g, return_value)) {`
`837`		`- zend_array_destroy(Z_ARR_P(return_value));`
`838`		`- php_error_docref(NULL, E_WARNING, "Unable to convert posix group to array");`
`839`		`- RETVAL_FALSE;`
`840`		`- }`
	`831`	`+ php_posix_group_to_array(g, return_value);`
`841`	`832`	`#if defined(ZTS) && defined(HAVE_GETGRNAM_R) && defined(_SC_GETGR_R_SIZE_MAX)`
`842`	`833`	`efree(buf);`
`843`	`834`	`#endif`
`@@ -895,11 +886,7 @@ PHP_FUNCTION(posix_getgrgid)`
`895`	`886`	`#endif`
`896`	`887`	`array_init(return_value);`
`897`	`888`
`898`		`- if (!php_posix_group_to_array(g, return_value)) {`
`899`		`- zend_array_destroy(Z_ARR_P(return_value));`
`900`		`- php_error_docref(NULL, E_WARNING, "Unable to convert posix group struct to array");`
`901`		`- RETVAL_FALSE;`
`902`		`- }`
	`889`	`+ php_posix_group_to_array(g, return_value);`
`903`	`890`	`#if defined(ZTS) && defined(HAVE_GETGRGID_R) && defined(_SC_GETGR_R_SIZE_MAX)`
`904`	`891`	`efree(grbuf);`
`905`	`892`	`#endif`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit af87ade

File tree

1 file changed

1 file changed

`‎ext/posix/posix.c‎`

0 commit comments