- Constify

diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index 8f584defb1b3bef8c6d3e7bf56ea9a2b7747e86a..0304c509bf76271e3770fe980442f5224ce92cc7 100644 (file)
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -978,7 +978,7 @@ int phar_open_file(php_stream *fp, char *fname, int fname_len, char *alias, int
  */
 int phar_open_or_create_filename(char *fname, int fname_len, char *alias, int alias_len, char *objname, int options, phar_archive_data** pphar, char **error TSRMLS_DC) /* {{{ */
 {
-       char *ext_str;
+       const char *ext_str;
        int ext_len, is_data = 0, zip = 0, tar = 0;
 
        if (error) {
@@ -1354,7 +1354,7 @@ static int phar_open_fp(php_stream* fp, char *fname, int fname_len, char *alias,
 }
 /* }}} */
 
-int phar_detect_phar_fname_ext(const char *filename, int check_length, char **ext_str, int *ext_len) /* {{{ */
+int phar_detect_phar_fname_ext(const char *filename, int check_length, const char **ext_str, int *ext_len) /* {{{ */
 {
        char end;
        char *pos_t = strstr(filename, ".tar");
@@ -1591,7 +1591,7 @@ char *phar_fix_filepath(char *path, int *new_len, int use_cwd TSRMLS_DC) /* {{{
  */
 int phar_split_fname(char *filename, int filename_len, char **arch, int *arch_len, char **entry, int *entry_len TSRMLS_DC) /* {{{ */
 {
-       char *ext_str;
+       const char *ext_str;
        int ext_len;
 
        if (!strncasecmp(filename, "phar://", 7)) {

diff --git a/ext/phar/phar_internal.h b/ext/phar/phar_internal.h
index 2eca75f7ea01c647e5717737f247c0afdb556ad6..9efc8d6d1cdb2cf29a26a2ecd06cec02dc484b7c 100755 (executable)
--- a/ext/phar/phar_internal.h
+++ b/ext/phar/phar_internal.h
@@ -419,7 +419,7 @@ phar_entry_info *phar_get_entry_info_dir(phar_archive_data *phar, char *path, in
 phar_entry_data *phar_get_or_create_entry_data(char *fname, int fname_len, char *path, int path_len, char *mode, char allow_dir, char **error TSRMLS_DC);
 int phar_get_entry_data(phar_entry_data **ret, char *fname, int fname_len, char *path, int path_len, char *mode, char allow_dir, char **error TSRMLS_DC);
 int phar_flush(phar_archive_data *archive, char *user_stub, long len, int convert, char **error TSRMLS_DC);
-int phar_detect_phar_fname_ext(const char *filename, int check_length, char **ext_str, int *ext_len);
+int phar_detect_phar_fname_ext(const char *filename, int check_length, const char **ext_str, int *ext_len);
 int phar_split_fname(char *filename, int filename_len, char **arch, int *arch_len, char **entry, int *entry_len TSRMLS_DC);
 
 typedef enum {

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 355bd0910792844b8697748b47f2e7fd7dff27d4..1503d8a4608c7d97a5ad6fc626337bdd1e065796 100755 (executable)
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -1063,7 +1063,8 @@ PHP_METHOD(Phar, canWrite)
  * Returns whether the given filename is a valid phar filename */
 PHP_METHOD(Phar, isValidPharFilename)
 {
-       char *fname, *ext_str;
+       char *fname;
+       const char *ext_str;
        int fname_len, ext_len;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &fname, &fname_len) == FAILURE) {