diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2003-02-28 17:26:28 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2003-02-28 17:26:28 +0000 |
| commit | 14bf872003ff96b60960d5b822a0bb846bff176f (patch) | |
| tree | 6bf18e4f09746b63b1a9cd17da3de1ef2c523b16 | |
| parent | 58103931422b686d20d54831e218b22af30bc6b4 (diff) | |
| download | php-git-14bf872003ff96b60960d5b822a0bb846bff176f.tar.gz | |
Fixed compiler warnings.
| -rw-r--r-- | ext/openssl/openssl.c | 6 | ||||
| -rw-r--r-- | ext/standard/php_fopen_wrapper.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index b48d0909d6..d465bcee10 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -1922,7 +1922,7 @@ PHP_FUNCTION(openssl_pkey_export_to_file) long key_resource = -1; EVP_PKEY * key; BIO * bio_out = NULL; - EVP_CIPHER * cipher; + const EVP_CIPHER * cipher; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zs|s!a!", &zpkey, &filename, &filename_len, &passphrase, &passphrase_len, &args) == FAILURE) { return; @@ -1977,7 +1977,7 @@ PHP_FUNCTION(openssl_pkey_export) long key_resource = -1; EVP_PKEY * key; BIO * bio_out = NULL; - EVP_CIPHER * cipher; + const EVP_CIPHER * cipher; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz|s!a!", &zpkey, &out, &passphrase, &passphrase_len, &args) == FAILURE) { return; @@ -2191,7 +2191,7 @@ PHP_FUNCTION(openssl_pkcs7_encrypt) HashPosition hpos; zval ** zcertval; X509 * cert; - EVP_CIPHER *cipher = NULL; + const EVP_CIPHER *cipher = NULL; long cipherid = PHP_OPENSSL_CIPHER_DEFAULT; uint strindexlen; ulong intindex; diff --git a/ext/standard/php_fopen_wrapper.c b/ext/standard/php_fopen_wrapper.c index d733279119..69e223a0b7 100644 --- a/ext/standard/php_fopen_wrapper.c +++ b/ext/standard/php_fopen_wrapper.c @@ -129,14 +129,14 @@ static void php_stream_apply_filter_list(php_stream *stream, char *filterlist, i p = php_strtok_r(filterlist, "|", &token); while (p) { if (read_chain) { - if (temp_filter = php_stream_filter_create(p, "", 0, php_stream_is_persistent(stream) TSRMLS_CC)) { + if ((temp_filter = php_stream_filter_create(p, "", 0, php_stream_is_persistent(stream) TSRMLS_CC))) { php_stream_filter_append(&stream->readfilters, temp_filter); } else { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to create filter (%s)\n", p); } } if (write_chain) { - if (temp_filter = php_stream_filter_create(p, "", 0, php_stream_is_persistent(stream) TSRMLS_CC)) { + if ((temp_filter = php_stream_filter_create(p, "", 0, php_stream_is_persistent(stream) TSRMLS_CC))) { php_stream_filter_append(&stream->writefilters, temp_filter); } else { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to create filter (%s)\n", p); |