archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove dead codes

Browse source
This commit is contained in:
Xinchen Hui 2015-01-19 10:46:59 -05:00
parent da7d8f45b2
commit 1b53a99fbf
2 changed files with 5 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

20
ext/mysql/php_mysql.c
View file

@ -2008,15 +2008,7 @@ Q: String or long first?
RETURN_FALSE;
}
if (sql_row[field_offset]) {
#if PHP_API_VERSION < 20100412
if (PG(magic_quotes_runtime)) {
RETVAL_STR(php_addslashes(sql_row[field_offset], sql_row_lengths[field_offset], 0));
} else {
#endif
RETVAL_STRINGL(sql_row[field_offset], sql_row_lengths[field_offset]);
#if PHP_API_VERSION < 20100412
}
#endif
RETVAL_STRINGL(sql_row[field_offset], sql_row_lengths[field_offset]);
} else {
RETURN_NULL();
}
@ -2142,15 +2134,7 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, zend_long result_
if (mysql_row[i]) {
zval data;
#if PHP_API_VERSION < 20100412
if (PG(magic_quotes_runtime)) {
ZVAL_STR(&data, php_addslashes(mysql_row[i], mysql_row_lengths[i], 0));
} else {
#endif
ZVAL_STRINGL(&data, mysql_row[i], mysql_row_lengths[i]);
#if PHP_API_VERSION < 20100412
}
#endif
ZVAL_STRINGL(&data, mysql_row[i], mysql_row_lengths[i]);
if (result_type & MYSQL_NUM) {
add_index_zval(return_value, i, &data);

39
sapi/litespeed/lsapi_main.c
View file

@ -302,29 +302,6 @@ static void litespeed_php_import_environment_variables(zval *array_ptr)
}
}
#if ((PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4) || PHP_MAJOR_VERSION < 5)
static int add_variable_magic_quote( const char * pKey, int keyLen, const char * pValue, int valLen,
void * arg )
{
zval * gpc_element, **gpc_element_p;
HashTable * symtable1 = Z_ARRVAL_P((zval * )arg);
register char * pKey1 = (char *)pKey;
MAKE_STD_ZVAL(gpc_element);
Z_STRLEN_P( gpc_element ) = valLen;
Z_STRVAL_P( gpc_element ) = php_addslashes((char *)pValue, valLen, &Z_STRLEN_P( gpc_element ), 0 );
Z_TYPE_P( gpc_element ) = IS_STRING;
#if PHP_MAJOR_VERSION > 4
zend_symtable_update( symtable1, pKey1, keyLen + 1, &gpc_element, sizeof( zval *), (void **) &gpc_element_p );
#else
zend_hash_update( symtable1, pKey1, keyLen + 1, &gpc_element, sizeof( zval *), (void **) &gpc_element_p );
#endif
return 1;
}
#endif
/* {{{ sapi_lsapi_register_variables
*/
static void sapi_lsapi_register_variables(zval *track_vars_array)
@ -336,19 +313,9 @@ static void sapi_lsapi_register_variables(zval *track_vars_array)
litespeed_php_import_environment_variables(track_vars_array);
#if ((PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4) || PHP_MAJOR_VERSION < 5)
if (!PG(magic_quotes_gpc)) {
#endif
LSAPI_ForeachHeader( add_variable, track_vars_array );
LSAPI_ForeachEnv( add_variable, track_vars_array );
add_variable("PHP_SELF", 8, php_self, strlen( php_self ), track_vars_array );
#if ((PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4) || PHP_MAJOR_VERSION < 5)
} else {
LSAPI_ForeachHeader( add_variable_magic_quote, track_vars_array );
LSAPI_ForeachEnv( add_variable_magic_quote, track_vars_array );
add_variable_magic_quote("PHP_SELF", 8, php_self, strlen( php_self ), track_vars_array );
}
#endif
LSAPI_ForeachHeader( add_variable, track_vars_array );
LSAPI_ForeachEnv( add_variable, track_vars_array );
add_variable("PHP_SELF", 8, php_self, strlen( php_self ), track_vars_array );
} else {
php_import_environment_variables(track_vars_array);