Kill some more constness warnings in com_dotnet/phar/standard

diff --git a/ext/com_dotnet/com_handlers.c b/ext/com_dotnet/com_handlers.c
index af3a981865319f5d3d26204147bff1cd8a03c81b..4c89c09e0f16ee50b9d657dffdc232e2ad34afd8 100644 (file)
--- a/ext/com_dotnet/com_handlers.c
+++ b/ext/com_dotnet/com_handlers.c
@@ -409,7 +409,7 @@ static union _zend_function *com_constructor_get(zval *object TSRMLS_DC)
 
 #define POPULATE_CTOR(f, fn)   \
        f.type = ZEND_INTERNAL_FUNCTION; \
-       f.function_name = obj->ce->name; \
+       f.function_name = (char *) obj->ce->name; \
        f.scope = obj->ce; \
        f.arg_info = NULL; \
        f.num_args = 0; \

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 1c1ad0c58091637e47d02cabbb1f2cd972181a58..054411a094c3fbf837c2244fe09f016a6dcb4f52 100755 (executable)
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -257,7 +257,8 @@ static void phar_mung_server_vars(char *fname, char *entry, int entry_len, char
 
 static int phar_file_action(phar_archive_data *phar, phar_entry_info *info, char *mime_type, int code, char *entry, int entry_len, char *arch, char *basename, char *ru, int ru_len TSRMLS_DC) /* {{{ */
 {
-       char *name = NULL, buf[8192], *cwd;
+       char *name = NULL, buf[8192];
+       const char *cwd;
        zend_syntax_highlighter_ini syntax_highlighter_ini;
        sapi_header_line ctr = {0};
        size_t got;
@@ -658,7 +659,8 @@ PHP_METHOD(Phar, webPhar)
        zval *mimeoverride = NULL, *rewrite = NULL;
        char *alias = NULL, *error, *index_php = NULL, *f404 = NULL, *ru = NULL;
        int alias_len = 0, ret, f404_len = 0, free_pathinfo = 0, ru_len = 0;
-       char *fname, *basename, *path_info, *mime_type = NULL, *entry, *pt;
+       char *fname, *path_info, *mime_type = NULL, *entry, *pt;
+       const char *basename;
        int fname_len, entry_len, code, index_php_len = 0, not_cgi;
        phar_archive_data *phar = NULL;
        phar_entry_info *info;
@@ -934,7 +936,7 @@ PHP_METHOD(Phar, webPhar)
        }
 
        if (mimeoverride && zend_hash_num_elements(Z_ARRVAL_P(mimeoverride))) {
-               char *ext = zend_memrchr(entry, '.', entry_len);
+               const char *ext = zend_memrchr(entry, '.', entry_len);
                zval **val;
 
                if (ext) {
@@ -2164,7 +2166,8 @@ static int phar_copy_file_contents(phar_entry_info *entry, php_stream *fp TSRMLS
 
 static zval *phar_rename_archive(phar_archive_data *phar, char *ext, zend_bool compress TSRMLS_DC) /* {{{ */
 {
-       char *oldname = NULL, *oldpath = NULL;
+       const char *oldname = NULL;
+       char *oldpath = NULL;
        char *basename = NULL, *basepath = NULL;
        char *newname = NULL, *newpath = NULL;
        zval *ret, arg1;
@@ -4204,7 +4207,8 @@ static int phar_extract_file(zend_bool overwrite, phar_entry_info *entry, char *
        php_stream_statbuf ssb;
        int len;
        php_stream *fp;
-       char *fullpath, *slash;
+       char *fullpath;
+       const char *slash;
        mode_t mode;
 
        if (entry->is_mounted) {

diff --git a/ext/phar/util.c b/ext/phar/util.c
index 985d9ac5413add1a0c01bfd55d16ce394f176fa7..f0a42420a53469e5076c61624e51d2b1092738e7 100644 (file)
--- a/ext/phar/util.c
+++ b/ext/phar/util.c
@@ -2213,7 +2213,7 @@ int phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signat
 
 void phar_add_virtual_dirs(phar_archive_data *phar, char *filename, int filename_len TSRMLS_DC) /* {{{ */
 {
-       char *s;
+       const char *s;
 
        while ((s = zend_memrchr(filename, '/', filename_len))) {
                filename_len = s - filename;

diff --git a/ext/standard/head.c b/ext/standard/head.c
index a9ae420900650b1e3cf43bc695ab785235b336a8..c0aa8aeac3fc6c33cd6d4de1a2bb7bd7ab80744e 100644 (file)
--- a/ext/standard/head.c
+++ b/ext/standard/head.c
@@ -123,7 +123,7 @@ PHPAPI int php_setcookie(char *name, int name_len, char *value, int value_len, t
        } else {
                snprintf(cookie, len + 100, "Set-Cookie: %s=%s", name, value ? encoded_value : "");
                if (expires > 0) {
-                       char *p;
+                       const char *p;
                        strlcat(cookie, "; expires=", len + 100);
                        dt = php_format_date("D, d-M-Y H:i:s T", sizeof("D, d-M-Y H:i:s T")-1, expires, 0 TSRMLS_CC);
                        /* check to make sure that the year does not exceed 4 digits in length */

diff --git a/ext/standard/string.c b/ext/standard/string.c
index e39b0cb6ece5c3a1a636c7d1b36941d211bb491c..ce0aea46fb4579f84ad13b668ebdb13d3de4f403 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -1489,7 +1489,7 @@ PHP_FUNCTION(pathinfo)
        }
        
        if ((opt & PHP_PATHINFO_EXTENSION) == PHP_PATHINFO_EXTENSION) {
-               char *p;
+               const char *p;
                int idx;
 
                if (!have_basename) {
@@ -1505,7 +1505,7 @@ PHP_FUNCTION(pathinfo)
        }
        
        if ((opt & PHP_PATHINFO_FILENAME) == PHP_PATHINFO_FILENAME) {
-               char *p;
+               const char *p;
                int idx;
 
                /* Have we alrady looked up the basename? */
@@ -2018,7 +2018,7 @@ PHP_FUNCTION(strrchr)
 {
        zval *needle;
        char *haystack;
-       char *found = NULL;
+       const char *found = NULL;
        long found_offset;
        int  haystack_len;
        

diff --git a/ext/standard/type.c b/ext/standard/type.c
index af2049f13ca54b23ac4eb8557ca877962a36ad5f..a44201272b8c9723c7135be70048a2c5a2361435 100644 (file)
--- a/ext/standard/type.c
+++ b/ext/standard/type.c
@@ -72,8 +72,8 @@ PHP_FUNCTION(gettype)
 
                case IS_RESOURCE:
                        {
-                               char *type_name;
-                               type_name = zend_rsrc_list_get_rsrc_type(Z_LVAL_PP(arg) TSRMLS_CC);
+                               const char *type_name = zend_rsrc_list_get_rsrc_type(Z_LVAL_PP(arg) TSRMLS_CC);
+
                                if (type_name) {
                                        RETVAL_STRING("resource", 1);
                                        break;
@@ -219,8 +219,7 @@ static void php_is_type(INTERNAL_FUNCTION_PARAMETERS, int type)
                        }
                }
                if (type == IS_RESOURCE) {
-                       char *type_name;
-                       type_name = zend_rsrc_list_get_rsrc_type(Z_LVAL_PP(arg) TSRMLS_CC);
+                       const char *type_name = zend_rsrc_list_get_rsrc_type(Z_LVAL_PP(arg) TSRMLS_CC);
                        if (!type_name) {
                                RETURN_FALSE;
                        }

diff --git a/ext/standard/var.c b/ext/standard/var.c
index c2bdcbb52eb240cf8d45d074053a5cfd5c271373..84cdecaa7bc485344d6d3ed7e5b2786a359b626a 100644 (file)
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -156,9 +156,7 @@ head_done:
                PUTS("}\n");
                break;
        case IS_RESOURCE: {
-               char *type_name;
-
-               type_name = zend_rsrc_list_get_rsrc_type(Z_LVAL_PP(struc) TSRMLS_CC);
+               const char *type_name = zend_rsrc_list_get_rsrc_type(Z_LVAL_PP(struc) TSRMLS_CC);
                php_printf("%sresource(%ld) of type (%s)\n", COMMON, Z_LVAL_PP(struc), type_name ? type_name : "Unknown");
                break;
        }
@@ -306,9 +304,7 @@ head_done:
                PUTS("}\n");
                break;
        case IS_RESOURCE: {
-               char *type_name;
-
-               type_name = zend_rsrc_list_get_rsrc_type(Z_LVAL_PP(struc) TSRMLS_CC);
+               const char *type_name = zend_rsrc_list_get_rsrc_type(Z_LVAL_PP(struc) TSRMLS_CC);
                php_printf("%sresource(%ld) of type (%s) refcount(%u)\n", COMMON, Z_LVAL_PP(struc), type_name ? type_name : "Unknown", Z_REFCOUNT_PP(struc));
                break;
        }