From 80abd49293bfb34f71f96214d615b1bfbc148928 Mon Sep 17 00:00:00 2001 From: Stefan Esser Date: Wed, 12 Feb 2014 19:54:50 +0100 Subject: Silence all compiler warnings --- ex_imp.c | 2 +- execute.c | 14 +++++++------- header.c | 4 ++-- log.c | 6 +++--- rfc1867_new.c | 2 +- session.c | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ex_imp.c b/ex_imp.c index a6397da..3325e43 100644 --- a/ex_imp.c +++ b/ex_imp.c @@ -463,7 +463,7 @@ static int copy_request_variable(void *pDest TSRMLS_DC, int num_args, va_list ar } if (hash_key->nKeyLength) { - php_prefix_varname(&new_key, prefix, hash_key->arKey, hash_key->nKeyLength - 1, 0 TSRMLS_CC); + php_prefix_varname(&new_key, prefix, (char *)hash_key->arKey, hash_key->nKeyLength - 1, 0 TSRMLS_CC); } else { zval num; diff --git a/execute.c b/execute.c index f6381e3..f778a01 100644 --- a/execute.c +++ b/execute.c @@ -316,7 +316,7 @@ static int suhosin_detect_codetype(zend_op_array *op_array TSRMLS_DC) char *s; int r; - s = op_array->filename; + s = (char *)op_array->filename; /* eval, assert, create_function, preg_replace */ if (op_array->type == ZEND_EVAL_CODE) { @@ -498,7 +498,7 @@ static void suhosin_execute_ex(zend_op_array *op_array, int zo, long dummy TSRML suhosin_bailout(TSRMLS_C); } - fn = op_array->filename; + fn = (char *)op_array->filename; len = strlen(fn); orig_code_type = SUHOSIN_G(in_code_type); @@ -683,11 +683,11 @@ int ih_preg_replace(IH_HANDLER_PARAMS) zval **regex, **replace, **subject, - **limit; + **limit, **zcount; - if (ZEND_NUM_ARGS() < 3 || zend_get_parameters_ex(3, ®ex, &replace, &subject, &limit) == FAILURE) { - return (0); - } + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ZZZ|ZZ", ®ex, &replace, &subject, &limit, &zcount) == FAILURE) { + return(0); + } if (Z_TYPE_PP(regex) == IS_ARRAY) { zval **regex_entry; @@ -1625,7 +1625,7 @@ static void suhosin_execute_internal(zend_execute_data *execute_data_ptr, int re #ifdef ZEND_ENGINE_2 ce = ((zend_internal_function *) execute_data_ptr->function_state.function)->scope; #endif - lcname = ((zend_internal_function *) execute_data_ptr->function_state.function)->function_name; + lcname = (char *)((zend_internal_function *) execute_data_ptr->function_state.function)->function_name; function_name_strlen = strlen(lcname); /* handle methodcalls correctly */ diff --git a/header.c b/header.c index 302f237..ddb1296 100644 --- a/header.c +++ b/header.c @@ -211,7 +211,7 @@ int suhosin_header_handler(sapi_header_struct *sapi_header, sapi_headers_struct for (i=0; iheader_len; i++, tmp++) { if (tmp[0] == 0) { - char *fname = get_active_function_name(TSRMLS_C); + char *fname = (char *)get_active_function_name(TSRMLS_C); if (!fname) { fname = "unknown"; @@ -226,7 +226,7 @@ int suhosin_header_handler(sapi_header_struct *sapi_header, sapi_headers_struct continue; } else if ((tmp[0] == '\r' && (tmp[1] != '\n' || i == 0)) || (tmp[0] == '\n' && (i == sapi_header->header_len-1 || i == 0 || (tmp[1] != ' ' && tmp[1] != '\t')))) { - char *fname = get_active_function_name(TSRMLS_C); + char *fname = (char *)get_active_function_name(TSRMLS_C); if (!fname) { fname = "unknown"; diff --git a/log.c b/log.c index 8b23063..32bd7e5 100644 --- a/log.c +++ b/log.c @@ -162,14 +162,14 @@ PHP_SUHOSIN_API void suhosin_log(int loglevel, char *fmt, ...) if (exdata) { if (getcaller && exdata->prev_execute_data) { lineno = exdata->prev_execute_data->opline->lineno; - fname = exdata->prev_execute_data->op_array->filename; + fname = (char *)exdata->prev_execute_data->op_array->filename; } else { lineno = exdata->opline->lineno; - fname = exdata->op_array->filename; + fname = (char *)exdata->op_array->filename; } } else { lineno = zend_get_executed_lineno(TSRMLS_C); - fname = zend_get_executed_filename(TSRMLS_C); + fname = (char *)zend_get_executed_filename(TSRMLS_C); } ap_php_snprintf(buf, sizeof(buf), "%s - %s (attacker '%s', file '%s', line %u)", alertstring, error, ip_address, fname, lineno); } else { diff --git a/rfc1867_new.c b/rfc1867_new.c index a069aa9..b6bbcdb 100644 --- a/rfc1867_new.c +++ b/rfc1867_new.c @@ -403,7 +403,7 @@ static int multipart_buffer_headers(multipart_buffer *self, zend_llist *header T char *value = NULL; if (php_rfc1867_encoding_translation(TSRMLS_C)) { - self->input_encoding = zend_multibyte_encoding_detector(line, strlen(line), self->detect_order, self->detect_order_size TSRMLS_CC); + self->input_encoding = zend_multibyte_encoding_detector((const unsigned char *)line, strlen(line), self->detect_order, self->detect_order_size TSRMLS_CC); } /* space in the beginning means same header */ diff --git a/session.c b/session.c index cd06073..b435c4d 100644 --- a/session.c +++ b/session.c @@ -1035,7 +1035,7 @@ void suhosin_hook_session(TSRMLS_D) /* Protect the PHP serializer from ! attacks */ # if PHP_MAJOR_VERSION > 5 || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 2) - serializer = SESSION_G(serializer); + serializer = (ps_serializer *) SESSION_G(serializer); if (serializer != NULL && strcmp(serializer->name, "php")==0) { serializer->encode = suhosin_session_encode; } -- cgit v1.3