Fixed compiler warnings.

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index b48d0909d642ad7ef73409e4ab26c7edec659cd4..d465bcee10454abea4ed88d0268270cacb207b92 100644 (file)
--- 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 d733279119d53eaefc352e36c0b78cdad8dace3e..69e223a0b701993edce6a9a210a757b15d9ef879 100644 (file)
--- 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);