summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ext/curl/interface.c24
-rw-r--r--ext/curl/multi.c24
-rw-r--r--ext/curl/share.c6
-rw-r--r--ext/dba/dba.c4
-rw-r--r--ext/fileinfo/fileinfo.c16
-rw-r--r--ext/ftp/php_ftp.c70
-rw-r--r--ext/gd/gd.c184
-rw-r--r--ext/shmop/shmop.c10
8 files changed, 169 insertions, 169 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 6a25359597..9657feab22 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -2108,7 +2108,7 @@ PHP_FUNCTION(curl_copy_handle)
ZEND_PARSE_PARAMETERS_END();
if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
- RETURN_FALSE;
+ return;
}
cp = curl_easy_duphandle(ch->cp);
@@ -3074,7 +3074,7 @@ PHP_FUNCTION(curl_setopt)
ZEND_PARSE_PARAMETERS_END();
if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (options <= 0 && options != CURLOPT_SAFE_UPLOAD) {
@@ -3105,7 +3105,7 @@ PHP_FUNCTION(curl_setopt_array)
ZEND_PARSE_PARAMETERS_END();
if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
- RETURN_FALSE;
+ return;
}
ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(arr), option, string_key, entry) {
@@ -3152,7 +3152,7 @@ PHP_FUNCTION(curl_exec)
ZEND_PARSE_PARAMETERS_END();
if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
- RETURN_FALSE;
+ return;
}
_php_curl_verify_handlers(ch, 1);
@@ -3211,7 +3211,7 @@ PHP_FUNCTION(curl_getinfo)
ZEND_PARSE_PARAMETERS_END();
if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (ZEND_NUM_ARGS() < 2) {
@@ -3475,7 +3475,7 @@ PHP_FUNCTION(curl_error)
ZEND_PARSE_PARAMETERS_END();
if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (ch->err.no) {
@@ -3499,7 +3499,7 @@ PHP_FUNCTION(curl_errno)
ZEND_PARSE_PARAMETERS_END();
if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
- RETURN_FALSE;
+ return;
}
RETURN_LONG(ch->err.no);
@@ -3518,7 +3518,7 @@ PHP_FUNCTION(curl_close)
ZEND_PARSE_PARAMETERS_END();
if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (ch->in_callback) {
@@ -3692,7 +3692,7 @@ PHP_FUNCTION(curl_reset)
ZEND_PARSE_PARAMETERS_END();
if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (ch->in_callback) {
@@ -3721,7 +3721,7 @@ PHP_FUNCTION(curl_escape)
ZEND_PARSE_PARAMETERS_END();
if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (ZEND_SIZE_T_INT_OVFL(ZSTR_LEN(str))) {
@@ -3753,7 +3753,7 @@ PHP_FUNCTION(curl_unescape)
ZEND_PARSE_PARAMETERS_END();
if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (ZEND_SIZE_T_INT_OVFL(ZSTR_LEN(str))) {
@@ -3784,7 +3784,7 @@ PHP_FUNCTION(curl_pause)
ZEND_PARSE_PARAMETERS_END();
if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
- RETURN_FALSE;
+ return;
}
RETURN_LONG(curl_easy_pause(ch->cp, bitmask));
diff --git a/ext/curl/multi.c b/ext/curl/multi.c
index 4ba165a09d..0998251c4c 100644
--- a/ext/curl/multi.c
+++ b/ext/curl/multi.c
@@ -85,11 +85,11 @@ PHP_FUNCTION(curl_multi_add_handle)
ZEND_PARSE_PARAMETERS_END();
if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) {
- RETURN_FALSE;
+ return;
}
if ((ch = (php_curl *)zend_fetch_resource(Z_RES_P(z_ch), le_curl_name, le_curl)) == NULL) {
- RETURN_FALSE;
+ return;
}
_php_curl_cleanup_handle(ch);
@@ -171,11 +171,11 @@ PHP_FUNCTION(curl_multi_remove_handle)
ZEND_PARSE_PARAMETERS_END();
if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) {
- RETURN_FALSE;
+ return;
}
if ((ch = (php_curl *)zend_fetch_resource(Z_RES_P(z_ch), le_curl_name, le_curl)) == NULL) {
- RETURN_FALSE;
+ return;
}
error = curl_multi_remove_handle(mh->multi, ch->cp);
@@ -224,7 +224,7 @@ PHP_FUNCTION(curl_multi_select)
ZEND_PARSE_PARAMETERS_END();
if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) {
- RETURN_FALSE;
+ return;
}
#if LIBCURL_VERSION_NUM >= 0x071c00 /* Available since 7.28.0 */
@@ -269,7 +269,7 @@ PHP_FUNCTION(curl_multi_exec)
ZEND_PARSE_PARAMETERS_END();
if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) {
- RETURN_FALSE;
+ return;
}
{
@@ -281,7 +281,7 @@ PHP_FUNCTION(curl_multi_exec)
pz_ch = (zval *)zend_llist_get_next_ex(&mh->easyh, &pos)) {
if ((ch = (php_curl *)zend_fetch_resource(Z_RES_P(pz_ch), le_curl_name, le_curl)) == NULL) {
- RETURN_FALSE;
+ return;
}
_php_curl_verify_handlers(ch, 1);
@@ -309,7 +309,7 @@ PHP_FUNCTION(curl_multi_getcontent)
ZEND_PARSE_PARAMETERS_END();
if ((ch = (php_curl *)zend_fetch_resource(Z_RES_P(z_ch), le_curl_name, le_curl)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (ch->handlers->write->method == PHP_CURL_RETURN) {
@@ -342,7 +342,7 @@ PHP_FUNCTION(curl_multi_info_read)
ZEND_PARSE_PARAMETERS_END();
if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) {
- RETURN_FALSE;
+ return;
}
tmp_msg = curl_multi_info_read(mh->multi, &queued_msgs);
@@ -396,7 +396,7 @@ PHP_FUNCTION(curl_multi_close)
ZEND_PARSE_PARAMETERS_END();
if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) {
- RETURN_FALSE;
+ return;
}
zend_list_close(Z_RES_P(z_mh));
@@ -448,7 +448,7 @@ PHP_FUNCTION(curl_multi_errno)
ZEND_PARSE_PARAMETERS_END();
if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) {
- RETURN_FALSE;
+ return;
}
RETURN_LONG(mh->err.no);
@@ -627,7 +627,7 @@ PHP_FUNCTION(curl_multi_setopt)
ZEND_PARSE_PARAMETERS_END();
if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (!_php_curl_multi_setopt(mh, options, zvalue, return_value)) {
diff --git a/ext/curl/share.c b/ext/curl/share.c
index 242cad09cd..4343e2ccc6 100644
--- a/ext/curl/share.c
+++ b/ext/curl/share.c
@@ -62,7 +62,7 @@ PHP_FUNCTION(curl_share_close)
ZEND_PARSE_PARAMETERS_END();
if ((sh = (php_curlsh *)zend_fetch_resource(Z_RES_P(z_sh), le_curl_share_handle_name, le_curl_share_handle)) == NULL) {
- RETURN_FALSE;
+ return;
}
zend_list_close(Z_RES_P(z_sh));
@@ -106,7 +106,7 @@ PHP_FUNCTION(curl_share_setopt)
ZEND_PARSE_PARAMETERS_END();
if ((sh = (php_curlsh *)zend_fetch_resource(Z_RES_P(zid), le_curl_share_handle_name, le_curl_share_handle)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (!_php_curl_share_setopt(sh, options, zvalue, return_value)) {
@@ -140,7 +140,7 @@ PHP_FUNCTION(curl_share_errno)
ZEND_PARSE_PARAMETERS_END();
if ((sh = (php_curlsh *)zend_fetch_resource(Z_RES_P(z_sh), le_curl_share_handle_name, le_curl_share_handle)) == NULL) {
- RETURN_FALSE;
+ return;
}
RETURN_LONG(sh->err.no);
diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index 952993582b..a211f190c9 100644
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -277,13 +277,13 @@ static size_t php_dba_make_key(zval *key, char **key_str, char **key_free)
#define DBA_FETCH_RESOURCE(info, id) \
if ((info = (dba_info *)zend_fetch_resource2(Z_RES_P(id), "DBA identifier", le_db, le_pdb)) == NULL) { \
- RETURN_FALSE; \
+ return; \
}
#define DBA_FETCH_RESOURCE_WITH_ID(info, id) \
if ((info = (dba_info *)zend_fetch_resource2(Z_RES_P(id), "DBA identifier", le_db, le_pdb)) == NULL) { \
DBA_ID_DONE; \
- RETURN_FALSE; \
+ return; \
}
#define DBA_ID_GET2 DBA_ID_PARS; DBA_GET2; DBA_FETCH_RESOURCE_WITH_ID(info, id)
diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c
index 6343b48aa9..621e82c75a 100644
--- a/ext/fileinfo/fileinfo.c
+++ b/ext/fileinfo/fileinfo.c
@@ -381,11 +381,11 @@ PHP_FUNCTION(finfo_close)
zval *zfinfo;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &zfinfo) == FAILURE) {
- RETURN_FALSE;
+ return;
}
if ((finfo = (php_fileinfo *)zend_fetch_resource(Z_RES_P(zfinfo), "file_info", le_fileinfo)) == NULL) {
- RETURN_FALSE;
+ return;
}
zend_list_close(Z_RES_P(zfinfo));
@@ -405,15 +405,15 @@ PHP_FUNCTION(finfo_set_flags)
if (object) {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &options) == FAILURE) {
- RETURN_FALSE;
+ return;
}
FILEINFO_FROM_OBJECT(finfo, object);
} else {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl", &zfinfo, &options) == FAILURE) {
- RETURN_FALSE;
+ return;
}
if ((finfo = (php_fileinfo *)zend_fetch_resource(Z_RES_P(zfinfo), "file_info", le_fileinfo)) == NULL) {
- RETURN_FALSE;
+ return;
}
}
@@ -471,16 +471,16 @@ static void _php_finfo_get_type(INTERNAL_FUNCTION_PARAMETERS, int mode, int mime
}
} else if (object) {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|lr", &buffer, &buffer_len, &options, &zcontext) == FAILURE) {
- RETURN_FALSE;
+ return;
}
FILEINFO_FROM_OBJECT(finfo, object);
magic = finfo->magic;
} else {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs|lr", &zfinfo, &buffer, &buffer_len, &options, &zcontext) == FAILURE) {
- RETURN_FALSE;
+ return;
}
if ((finfo = (php_fileinfo *)zend_fetch_resource(Z_RES_P(zfinfo), "file_info", le_fileinfo)) == NULL) {
- RETURN_FALSE;
+ return;
}
magic = finfo->magic;
}
diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c
index e3b425ef0f..7ac75917db 100644
--- a/ext/ftp/php_ftp.c
+++ b/ext/ftp/php_ftp.c
@@ -450,7 +450,7 @@ PHP_FUNCTION(ftp_login)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
/* log in */
@@ -476,7 +476,7 @@ PHP_FUNCTION(ftp_pwd)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (!(pwd = ftp_pwd(ftp))) {
@@ -500,7 +500,7 @@ PHP_FUNCTION(ftp_cdup)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (!ftp_cdup(ftp)) {
@@ -526,7 +526,7 @@ PHP_FUNCTION(ftp_chdir)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
/* change directories */
@@ -553,7 +553,7 @@ PHP_FUNCTION(ftp_exec)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
/* execute serverside command */
@@ -580,7 +580,7 @@ PHP_FUNCTION(ftp_raw)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
/* execute arbitrary ftp command */
@@ -603,7 +603,7 @@ PHP_FUNCTION(ftp_mkdir)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
/* create directory */
@@ -630,7 +630,7 @@ PHP_FUNCTION(ftp_rmdir)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
/* remove directorie */
@@ -654,11 +654,11 @@ PHP_FUNCTION(ftp_chmod)
zend_long mode;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rlp", &z_ftp, &mode, &filename, &filename_len) == FAILURE) {
- RETURN_FALSE;
+ return;
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (!ftp_chmod(ftp, mode, filename, filename_len)) {
@@ -680,11 +680,11 @@ PHP_FUNCTION(ftp_alloc)
zend_string *response = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl|z", &z_ftp, &size, &zresponse) == FAILURE) {
- RETURN_FALSE;
+ return;
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
ret = ftp_alloc(ftp, size, zresponse ? &response : NULL);
@@ -715,7 +715,7 @@ PHP_FUNCTION(ftp_nlist)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
/* get list of files */
@@ -746,7 +746,7 @@ PHP_FUNCTION(ftp_rawlist)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
/* get raw directory listing */
@@ -777,7 +777,7 @@ PHP_FUNCTION(ftp_mlsd)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
/* get raw directory listing */
@@ -812,7 +812,7 @@ PHP_FUNCTION(ftp_systype)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (NULL == (syst = ftp_syst(ftp))) {
@@ -841,7 +841,7 @@ PHP_FUNCTION(ftp_fget)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
php_stream_from_res(stream, Z_RES_P(z_file));
XTYPE(xtype, mode);
@@ -887,7 +887,7 @@ PHP_FUNCTION(ftp_nb_fget)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
php_stream_from_res(stream, Z_RES_P(z_file));
XTYPE(xtype, mode);
@@ -933,7 +933,7 @@ PHP_FUNCTION(ftp_pasv)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (!ftp_pasv(ftp, pasv ? 1 : 0)) {
@@ -961,7 +961,7 @@ PHP_FUNCTION(ftp_get)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
XTYPE(xtype, mode);
@@ -1027,7 +1027,7 @@ PHP_FUNCTION(ftp_nb_get)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
XTYPE(xtype, mode);
@@ -1095,7 +1095,7 @@ PHP_FUNCTION(ftp_nb_continue)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (!ftp->nb) {
@@ -1139,7 +1139,7 @@ PHP_FUNCTION(ftp_fput)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
php_stream_from_zval(stream, z_file);
XTYPE(xtype, mode);
@@ -1189,7 +1189,7 @@ PHP_FUNCTION(ftp_nb_fput)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
php_stream_from_res(stream, Z_RES_P(z_file));
XTYPE(xtype, mode);
@@ -1243,7 +1243,7 @@ PHP_FUNCTION(ftp_put)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
XTYPE(xtype, mode);
@@ -1297,7 +1297,7 @@ PHP_FUNCTION(ftp_append)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
XTYPE(xtype, mode);
@@ -1333,7 +1333,7 @@ PHP_FUNCTION(ftp_nb_put)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
XTYPE(xtype, mode);
@@ -1392,7 +1392,7 @@ PHP_FUNCTION(ftp_size)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
/* get file size */
@@ -1414,7 +1414,7 @@ PHP_FUNCTION(ftp_mdtm)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
/* get file mod time */
@@ -1436,7 +1436,7 @@ PHP_FUNCTION(ftp_rename)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
/* rename the file */
@@ -1463,7 +1463,7 @@ PHP_FUNCTION(ftp_delete)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
/* delete the file */
@@ -1490,7 +1490,7 @@ PHP_FUNCTION(ftp_site)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
/* send the site command */
@@ -1515,7 +1515,7 @@ PHP_FUNCTION(ftp_close)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
ftp_quit(ftp);
@@ -1537,7 +1537,7 @@ PHP_FUNCTION(ftp_set_option)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
switch (option) {
@@ -1593,7 +1593,7 @@ PHP_FUNCTION(ftp_get_option)
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ return;
}
switch (option) {
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 337cf7fd78..07fbe231b4 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -793,7 +793,7 @@ PHP_FUNCTION(imagesetstyle)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
num_styles = zend_hash_num_elements(Z_ARRVAL_P(styles));
@@ -855,7 +855,7 @@ PHP_FUNCTION(imageistruecolor)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
RETURN_BOOL(im->trueColor);
@@ -876,7 +876,7 @@ PHP_FUNCTION(imagetruecolortopalette)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (ncolors <= 0 || ZEND_LONG_INT_OVFL(ncolors)) {
@@ -904,7 +904,7 @@ PHP_FUNCTION(imagepalettetotruecolor)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (gdImagePaletteToTrueColor(im) == 0) {
@@ -928,10 +928,10 @@ PHP_FUNCTION(imagecolormatch)
}
if ((im1 = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM1), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if ((im2 = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM2), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
result = gdImageColorMatch(im1, im2);
@@ -971,7 +971,7 @@ PHP_FUNCTION(imagesetthickness)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
gdImageSetThickness(im, thick);
@@ -993,7 +993,7 @@ PHP_FUNCTION(imagefilledellipse)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
gdImageFilledEllipse(im, cx, cy, w, h, color);
@@ -1016,7 +1016,7 @@ PHP_FUNCTION(imagefilledarc)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
e = E;
@@ -1048,7 +1048,7 @@ PHP_FUNCTION(imagealphablending)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
gdImageAlphaBlending(im, blend);
@@ -1070,7 +1070,7 @@ PHP_FUNCTION(imagesavealpha)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
gdImageSaveAlpha(im, save);
@@ -1092,7 +1092,7 @@ PHP_FUNCTION(imagelayereffect)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
gdImageAlphaBlending(im, effect);
@@ -1117,11 +1117,11 @@ PHP_FUNCTION(imagecolorallocatealpha)
int ct = (-1);
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rllll", &IM, &red, &green, &blue, &alpha) == FAILURE) {
- RETURN_FALSE;
+ return;
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
CHECK_RGBA_RANGE(red, Red);
@@ -1150,7 +1150,7 @@ PHP_FUNCTION(imagecolorresolvealpha)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
CHECK_RGBA_RANGE(red, Red);
@@ -1175,7 +1175,7 @@ PHP_FUNCTION(imagecolorclosestalpha)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
CHECK_RGBA_RANGE(red, Red);
@@ -1200,7 +1200,7 @@ PHP_FUNCTION(imagecolorexactalpha)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
CHECK_RGBA_RANGE(red, Red);
@@ -1226,11 +1226,11 @@ PHP_FUNCTION(imagecopyresampled)
}
if ((im_dst = (gdImagePtr)zend_fetch_resource(Z_RES_P(DIM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if ((im_src = (gdImagePtr)zend_fetch_resource(Z_RES_P(SIM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
srcX = SX;
@@ -1388,11 +1388,11 @@ PHP_FUNCTION(imagerotate)
zend_long ignoretransparent = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rdl|l", &SIM, &degrees, &color, &ignoretransparent) == FAILURE) {
- RETURN_FALSE;
+ return;
}
if ((im_src = (gdImagePtr)zend_fetch_resource(Z_RES_P(SIM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
im_dst = gdImageRotateInterpolated(im_src, (const float)degrees, color);
@@ -1417,11 +1417,11 @@ PHP_FUNCTION(imagesettile)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if ((tile = (gdImagePtr)zend_fetch_resource(Z_RES_P(TILE), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
gdImageSetTile(im, tile);
@@ -1442,11 +1442,11 @@ PHP_FUNCTION(imagesetbrush)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if ((tile = (gdImagePtr)zend_fetch_resource(Z_RES_P(TILE), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
gdImageSetBrush(im, tile);
@@ -1929,7 +1929,7 @@ static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(imgind), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (argc > 1) {
@@ -2118,7 +2118,7 @@ PHP_FUNCTION(imagedestroy)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
zend_list_close(Z_RES_P(IM));
@@ -2141,7 +2141,7 @@ PHP_FUNCTION(imagecolorallocate)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
CHECK_RGBA_RANGE(red, Red);
@@ -2168,11 +2168,11 @@ PHP_FUNCTION(imagepalettecopy)
}
if ((dst = (gdImagePtr)zend_fetch_resource(Z_RES_P(dstim), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if ((src = (gdImagePtr)zend_fetch_resource(Z_RES_P(srcim), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
gdImagePaletteCopy(dst, src);
@@ -2194,7 +2194,7 @@ PHP_FUNCTION(imagecolorat)
ZEND_PARSE_PARAMETERS_END();
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (gdImageTrueColor(im)) {
@@ -2228,7 +2228,7 @@ PHP_FUNCTION(imagecolorclosest)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
CHECK_RGBA_RANGE(red, Red);
@@ -2252,7 +2252,7 @@ PHP_FUNCTION(imagecolorclosesthwb)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
CHECK_RGBA_RANGE(red, Red);
@@ -2277,7 +2277,7 @@ PHP_FUNCTION(imagecolordeallocate)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
/* We can return right away for a truecolor image as deallocating colours is meaningless here */
@@ -2310,7 +2310,7 @@ PHP_FUNCTION(imagecolorresolve)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
CHECK_RGBA_RANGE(red, Red);
@@ -2334,7 +2334,7 @@ PHP_FUNCTION(imagecolorexact)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
CHECK_RGBA_RANGE(red, Red);
@@ -2359,7 +2359,7 @@ PHP_FUNCTION(imagecolorset)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
CHECK_RGBA_RANGE(red, Red);
@@ -2394,7 +2394,7 @@ PHP_FUNCTION(imagecolorsforindex)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
col = index;
@@ -2434,7 +2434,7 @@ PHP_FUNCTION(imagegammacorrect)
gamma = input / output;
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (gdImageTrueColor(im)) {
@@ -2482,7 +2482,7 @@ PHP_FUNCTION(imagesetpixel)
ZEND_PARSE_PARAMETERS_END();
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
gdImageSetPixel(im, x, y, col);
@@ -2503,7 +2503,7 @@ PHP_FUNCTION(imageline)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (im->AA) {
@@ -2528,7 +2528,7 @@ PHP_FUNCTION(imagedashedline)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
gdImageDashedLine(im, x1, y1, x2, y2, col);
@@ -2549,7 +2549,7 @@ PHP_FUNCTION(imagerectangle)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
gdImageRectangle(im, x1, y1, x2, y2, col);
@@ -2570,7 +2570,7 @@ PHP_FUNCTION(imagefilledrectangle)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
gdImageFilledRectangle(im, x1, y1, x2, y2, col);
RETURN_TRUE;
@@ -2591,7 +2591,7 @@ PHP_FUNCTION(imagearc)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
e = E;
@@ -2622,7 +2622,7 @@ PHP_FUNCTION(imageellipse)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
gdImageEllipse(im, cx, cy, w, h, color);
@@ -2643,7 +2643,7 @@ PHP_FUNCTION(imagefilltoborder)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
gdImageFillToBorder(im, x, y, border, col);
@@ -2664,7 +2664,7 @@ PHP_FUNCTION(imagefill)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
gdImageFill(im, x, y, col);
@@ -2684,7 +2684,7 @@ PHP_FUNCTION(imagecolorstotal)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
RETURN_LONG(gdImageColorsTotal(im));
@@ -2705,7 +2705,7 @@ PHP_FUNCTION(imagecolortransparent)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (argc > 1) {
@@ -2730,7 +2730,7 @@ PHP_FUNCTION(imageinterlace)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (argc > 1) {
@@ -2760,7 +2760,7 @@ static void php_imagepolygon(INTERNAL_FUNCTION_PARAMETERS, int filled)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
npoints = NPOINTS;
@@ -2959,7 +2959,7 @@ static void php_imagechar(INTERNAL_FUNCTION_PARAMETERS, int mode)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
col = COL;
@@ -3052,11 +3052,11 @@ PHP_FUNCTION(imagecopy)
}
if ((im_dst = (gdImagePtr)zend_fetch_resource(Z_RES_P(DIM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if ((im_src = (gdImagePtr)zend_fetch_resource(Z_RES_P(SIM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
srcX = SX;
@@ -3085,11 +3085,11 @@ PHP_FUNCTION(imagecopymerge)
}
if ((im_dst = (gdImagePtr)zend_fetch_resource(Z_RES_P(DIM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if ((im_src = (gdImagePtr)zend_fetch_resource(Z_RES_P(SIM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
srcX = SX;
@@ -3119,11 +3119,11 @@ PHP_FUNCTION(imagecopymergegray)
}
if ((im_dst = (gdImagePtr)zend_fetch_resource(Z_RES_P(DIM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if ((im_src = (gdImagePtr)zend_fetch_resource(Z_RES_P(SIM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
srcX = SX;
@@ -3153,11 +3153,11 @@ PHP_FUNCTION(imagecopyresized)
}
if ((im_dst = (gdImagePtr)zend_fetch_resource(Z_RES_P(DIM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if ((im_src = (gdImagePtr)zend_fetch_resource(Z_RES_P(SIM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
srcX = SX;
@@ -3191,7 +3191,7 @@ PHP_FUNCTION(imagesx)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
RETURN_LONG(gdImageSX(im));
@@ -3210,7 +3210,7 @@ PHP_FUNCTION(imagesy)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
RETURN_LONG(gdImageSY(im));
@@ -3230,7 +3230,7 @@ PHP_FUNCTION(imagesetclip)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(im_zval), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
gdImageSetClip(im, x1, y1, x2, y2);
@@ -3251,7 +3251,7 @@ PHP_FUNCTION(imagegetclip)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(im_zval), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
gdImageGetClip(im, &x1, &y1, &x2, &y2);
@@ -3319,16 +3319,16 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int
if (argc < 4 || argc > ((extended) ? 5 : 4)) {
ZEND_WRONG_PARAM_COUNT();
} else if (zend_parse_parameters(argc, "ddss|a", &ptsize, &angle, &fontname, &fontname_len, &str, &str_len, &EXT) == FAILURE) {
- RETURN_FALSE;
+ return;
}
} else {
if (argc < 8 || argc > ((extended) ? 9 : 8)) {
ZEND_WRONG_PARAM_COUNT();
} else if (zend_parse_parameters(argc, "rddlllss|a", &IM, &ptsize, &angle, &x, &y, &col, &fontname, &fontname_len, &str, &str_len, &EXT) == FAILURE) {
- RETURN_FALSE;
+ return;
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
}
@@ -3389,10 +3389,10 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int
zval *SIM; \
gdImagePtr im_src; \
if (zend_parse_parameters(1, "r", &SIM) == FAILURE) { \
- RETURN_FALSE; \
+ return; \
} \
if ((im_src = (gdImagePtr)zend_fetch_resource(Z_RES_P(SIM), "Image", le_gd)) == NULL) { \
- RETURN_FALSE; \
+ return; \
}
static void php_image_filter_negate(INTERNAL_FUNCTION_PARAMETERS)
@@ -3424,11 +3424,11 @@ static void php_image_filter_brightness(INTERNAL_FUNCTION_PARAMETERS)
zend_long brightness, tmp;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "zll", &SIM, &tmp, &brightness) == FAILURE) {
- RETURN_FALSE;
+ return;
}
if ((im_src = (gdImagePtr)zend_fetch_resource(Z_RES_P(SIM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (gdImageBrightness(im_src, (int)brightness) == 1) {
@@ -3445,11 +3445,11 @@ static void php_image_filter_contrast(INTERNAL_FUNCTION_PARAMETERS)
zend_long contrast, tmp;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rll", &SIM, &tmp, &contrast) == FAILURE) {
- RETURN_FALSE;
+ return;
}
if ((im_src = (gdImagePtr)zend_fetch_resource(Z_RES_P(SIM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (gdImageContrast(im_src, (int)contrast) == 1) {
@@ -3467,11 +3467,11 @@ static void php_image_filter_colorize(INTERNAL_FUNCTION_PARAMETERS)
zend_long a = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rllll|l", &SIM, &tmp, &r, &g, &b, &a) == FAILURE) {
- RETURN_FALSE;
+ return;
}
if ((im_src = (gdImagePtr)zend_fetch_resource(Z_RES_P(SIM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (gdImageColor(im_src, (int) r, (int) g, (int) b, (int) a) == 1) {
@@ -3544,11 +3544,11 @@ static void php_image_filter_smooth(INTERNAL_FUNCTION_PARAMETERS)
double weight;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rld", &SIM, &tmp, &weight) == FAILURE) {
- RETURN_FALSE;
+ return;
}
if ((im_src = (gdImagePtr)zend_fetch_resource(Z_RES_P(SIM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (gdImageSmooth(im_src, (float)weight)==1) {
@@ -3566,11 +3566,11 @@ static void php_image_filter_pixelate(INTERNAL_FUNCTION_PARAMETERS)
zend_bool mode = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rll|b", &IM, &tmp, &blocksize, &mode) == FAILURE) {
- RETURN_FALSE;
+ return;
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (gdImagePixelate(im, (int) blocksize, (const unsigned int) mode)) {
@@ -3589,11 +3589,11 @@ static void php_image_filter_scatter(INTERNAL_FUNCTION_PARAMETERS)
zend_long scatter_sub, scatter_plus;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rlll|a", &IM, &tmp, &scatter_sub, &scatter_plus, &hash_colors) == FAILURE) {
- RETURN_FALSE;
+ return;
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (hash_colors) {
@@ -3669,11 +3669,11 @@ PHP_FUNCTION(imageconvolution)
float matrix[3][3] = {{0,0,0}, {0,0,0}, {0,0,0}};
if (zend_parse_parameters(ZEND_NUM_ARGS(), "radd", &SIM, &hash_matrix, &div, &offset) == FAILURE) {
- RETURN_FALSE;
+ return;
}
if ((im_src = (gdImagePtr)zend_fetch_resource(Z_RES_P(SIM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
nelem = zend_hash_num_elements(Z_ARRVAL_P(hash_matrix));
@@ -3723,7 +3723,7 @@ PHP_FUNCTION(imageflip)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
switch (mode) {
@@ -3761,7 +3761,7 @@ PHP_FUNCTION(imageantialias)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (im->trueColor) {
@@ -3788,7 +3788,7 @@ PHP_FUNCTION(imagecrop)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if ((tmp = zend_hash_str_find(Z_ARRVAL_P(z_rect), "x", sizeof("x") -1)) != NULL) {
@@ -3845,7 +3845,7 @@ PHP_FUNCTION(imagecropauto)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
switch (mode) {
@@ -3894,7 +3894,7 @@ PHP_FUNCTION(imagescale)
method = tmp_m;
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (tmp_h < 0 || tmp_w < 0) {
@@ -3955,7 +3955,7 @@ PHP_FUNCTION(imageaffine)
}
if ((src = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if ((nelems = zend_hash_num_elements(Z_ARRVAL_P(z_affine))) != 6) {
@@ -4192,7 +4192,7 @@ PHP_FUNCTION(imagesetinterpolation)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (method == -1) {
@@ -4215,7 +4215,7 @@ PHP_FUNCTION(imageresolution)
}
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
- RETURN_FALSE;
+ return;
}
switch (ZEND_NUM_ARGS()) {
diff --git a/ext/shmop/shmop.c b/ext/shmop/shmop.c
index 8a4c0b8763..06f72d29df 100644
--- a/ext/shmop/shmop.c
+++ b/ext/shmop/shmop.c
@@ -238,7 +238,7 @@ PHP_FUNCTION(shmop_read)
}
if ((shmop = (struct php_shmop *)zend_fetch_resource(Z_RES_P(shmid), "shmop", shm_type)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (start < 0 || start > shmop->size) {
@@ -273,7 +273,7 @@ PHP_FUNCTION(shmop_close)
if ((shmop = (struct php_shmop *)zend_fetch_resource(Z_RES_P(shmid), "shmop", shm_type)) == NULL) {
- RETURN_FALSE;
+ return;
}
zend_list_close(Z_RES_P(shmid));
@@ -292,7 +292,7 @@ PHP_FUNCTION(shmop_size)
}
if ((shmop = (struct php_shmop *)zend_fetch_resource(Z_RES_P(shmid), "shmop", shm_type)) == NULL) {
- RETURN_FALSE;
+ return;
}
RETURN_LONG(shmop->size);
@@ -314,7 +314,7 @@ PHP_FUNCTION(shmop_write)
}
if ((shmop = (struct php_shmop *)zend_fetch_resource(Z_RES_P(shmid), "shmop", shm_type)) == NULL) {
- RETURN_FALSE;
+ return;
}
if ((shmop->shmatflg & SHM_RDONLY) == SHM_RDONLY) {
@@ -346,7 +346,7 @@ PHP_FUNCTION(shmop_delete)
}
if ((shmop = (struct php_shmop *)zend_fetch_resource(Z_RES_P(shmid), "shmop", shm_type)) == NULL) {
- RETURN_FALSE;
+ return;
}
if (shmctl(shmop->shmid, IPC_RMID, NULL)) {
View Lorry Controller Status