summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2003-08-17 19:14:30 +0000
committerMarcus Boerger <helly@php.net>2003-08-17 19:14:30 +0000
commit744dd20520aafa93fbca986403d900698cc2c57a (patch)
tree82940a699cb8743cff896c0e4af68c887a3b57e7
parent717b5afe1d11fabe0081453abe275f352a0e9b24 (diff)
downloadphp-git-744dd20520aafa93fbca986403d900698cc2c57a.tar.gz
Fix warnings
-rw-r--r--Zend/zend_builtin_functions.c3
-rw-r--r--Zend/zend_object_handlers.c2
-rw-r--r--Zend/zend_operators.c2
-rw-r--r--sapi/cli/php_cli.c4
4 files changed, 2 insertions, 9 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 3e35fdca2e..63c755fe0d 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -850,7 +850,7 @@ ZEND_FUNCTION(function_exists)
{
zval **function_name;
zend_function *func;
- char *lcname, *func_name_end;
+ char *lcname;
zend_bool retval;
if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &function_name)==FAILURE) {
@@ -859,7 +859,6 @@ ZEND_FUNCTION(function_exists)
convert_to_string_ex(function_name);
lcname = zend_str_tolower_dup((*function_name)->value.str.val, (*function_name)->value.str.len);
- func_name_end = lcname + (*function_name)->value.str.len;
retval = (zend_hash_find(EG(function_table), lcname, (*function_name)->value.str.len+1, (void **)&func) == SUCCESS);
efree(lcname);
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 521efa9cea..25d10aaf54 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -705,7 +705,6 @@ zend_function *zend_std_get_static_method(zend_class_entry *ce, char *function_n
zval **zend_std_get_static_property(zend_class_entry *ce, char *property_name, int property_name_len, zend_bool silent TSRMLS_DC)
{
- HashTable *statics_table;
zval **retval = NULL;
zend_class_entry *tmp_ce = ce;
zend_property_info *property_info;
@@ -729,7 +728,6 @@ zval **zend_std_get_static_property(zend_class_entry *ce, char *property_name, i
while (tmp_ce) {
if (zend_hash_quick_find(tmp_ce->static_members, property_info->name, property_info->name_length+1, property_info->h, (void **) &retval)==SUCCESS) {
- statics_table = tmp_ce->static_members;
break;
}
tmp_ce = tmp_ce->parent;
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 9f7bf6209b..63412b624f 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -1611,7 +1611,7 @@ ZEND_API int zval_is_true(zval *op)
ZEND_API char *zend_str_tolower_copy(char *dest, const char *source, unsigned int length)
{
register unsigned char *str = (unsigned char*)source;
- register unsigned char *result = dest;
+ register unsigned char *result = (unsigned char*)dest;
register unsigned char *end = str + length;
while (str < end) {
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 152029d093..6230209b43 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -418,7 +418,6 @@ static void php_register_command_line_global_vars(char **arg TSRMLS_DC)
efree(*arg);
}
-static php_stream_context *sc_in_process = NULL;
static php_stream *s_in_process = NULL;
static void cli_register_file_handles(TSRMLS_D)
@@ -440,7 +439,6 @@ static void cli_register_file_handles(TSRMLS_D)
return;
}
- sc_in_process = sc_in;
s_in_process = s_in;
php_stream_to_zval(s_in, zin);
@@ -525,7 +523,6 @@ int main(int argc, char *argv[])
int lineno = 0;
char *exec_direct=NULL, *exec_run=NULL, *exec_begin=NULL, *exec_end=NULL;
const char *param_error=NULL;
- int scan_input = 0;
int hide_argv = 0;
/* end of temporary locals */
#ifdef ZTS
@@ -801,7 +798,6 @@ int main(int argc, char *argv[])
param_error = param_mode_conflict;
break;
}
- scan_input = 1;
behavior=PHP_MODE_PROCESS_STDIN;
exec_end=optarg;
break;