Skip to content

Commit abf1ce5

Browse files
GirgiasGirgias
authored
ext/phar: add const qualifiers (#21907)
1 parent 0366899 commit abf1ce5

8 files changed

Lines changed: 29 additions & 29 deletions

File tree

‎ext/phar/dirstream.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ php_stream *phar_wrapper_open_dir(php_stream_wrapper *wrapper, const char *path,
300300

301301
const char *internal_file = ZSTR_VAL(resource->path) + 1; /* strip leading "/" */
302302
size_t internal_file_len = ZSTR_LEN(resource->path) - 1;
303-
phar_entry_info *entry = zend_hash_str_find_ptr(&phar->manifest, internal_file, internal_file_len);
303+
const phar_entry_info *entry = zend_hash_str_find_ptr(&phar->manifest, internal_file, internal_file_len);
304304
php_stream *ret;
305305

306306
if (NULL != entry && !entry->is_dir) {

‎ext/phar/phar.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ ZEND_ATTRIBUTE_NONNULL void phar_entry_remove(phar_entry_data *idata, char **err
484484
/**
485485
* Open an already loaded phar
486486
*/
487-
static zend_result phar_open_parsed_phar(char *fname, size_t fname_len, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error) /* {{{ */
487+
static zend_result phar_open_parsed_phar(char *fname, size_t fname_len, const char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error) /* {{{ */
488488
{
489489
#ifdef PHP_WIN32
490490
char *save_fname;
@@ -720,7 +720,7 @@ void phar_parse_metadata_lazy(const char *buffer, phar_metadata_tracker *tracker
720720
* This is used by phar_open_from_filename to process the manifest, but can be called
721721
* directly.
722722
*/
723-
static zend_result phar_parse_pharfile(php_stream *fp, char *fname, size_t fname_len, char *alias, size_t alias_len, zend_long halt_offset, phar_archive_data** pphar, uint32_t compression, char **error) /* {{{ */
723+
static zend_result phar_parse_pharfile(php_stream *fp, const char *fname, size_t fname_len, const char *alias, size_t alias_len, zend_long halt_offset, phar_archive_data** pphar, uint32_t compression, char **error) /* {{{ */
724724
{
725725
char b32[4], *buffer, *endbuffer, *savebuf;
726726
phar_archive_data *mydata = NULL;
@@ -1302,7 +1302,7 @@ static zend_result phar_parse_pharfile(php_stream *fp, char *fname, size_t fname
13021302
/**
13031303
* Create or open a phar for writing
13041304
*/
1305-
ZEND_ATTRIBUTE_NONNULL_ARGS(1, 6, 7) zend_result phar_open_or_create_filename(zend_string *fname, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error) /* {{{ */
1305+
ZEND_ATTRIBUTE_NONNULL_ARGS(1, 6, 7) zend_result phar_open_or_create_filename(zend_string *fname, const char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error) /* {{{ */
13061306
{
13071307
const char *ext_str, *z;
13081308
char *my_error;
@@ -1366,9 +1366,9 @@ ZEND_ATTRIBUTE_NONNULL_ARGS(1, 6, 7) zend_result phar_open_or_create_filename(ze
13661366
}
13671367
/* }}} */
13681368

1369-
static zend_result phar_open_from_fp(php_stream* fp, char *fname, size_t fname_len, char *alias, size_t alias_len, uint32_t options, phar_archive_data** pphar, char **error);
1369+
static zend_result phar_open_from_fp(php_stream* fp, const char *fname, size_t fname_len, const char *alias, size_t alias_len, uint32_t options, phar_archive_data** pphar, char **error);
13701370

1371-
ZEND_ATTRIBUTE_NONNULL_ARGS(1, 6, 7) zend_result phar_create_or_parse_filename(zend_string *fname, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error) /* {{{ */
1371+
ZEND_ATTRIBUTE_NONNULL_ARGS(1, 6, 7) zend_result phar_create_or_parse_filename(zend_string *fname, const char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error) /* {{{ */
13721372
{
13731373
php_stream *fp;
13741374
zend_string *actual = NULL;
@@ -1507,7 +1507,7 @@ ZEND_ATTRIBUTE_NONNULL_ARGS(1, 6, 7) zend_result phar_create_or_parse_filename(z
15071507
* that the manifest is proper, then pass it to phar_parse_pharfile(). SUCCESS
15081508
* or FAILURE is returned and pphar is set to a pointer to the phar's manifest
15091509
*/
1510-
zend_result phar_open_from_filename(char *fname, size_t fname_len, char *alias, size_t alias_len, uint32_t options, phar_archive_data** pphar, char **error) /* {{{ */
1510+
zend_result phar_open_from_filename(char *fname, size_t fname_len, const char *alias, size_t alias_len, uint32_t options, phar_archive_data** pphar, char **error) /* {{{ */
15111511
{
15121512
php_stream *fp;
15131513
zend_string *actual;
@@ -1564,7 +1564,7 @@ zend_result phar_open_from_filename(char *fname, size_t fname_len, char *alias,
15641564
* that the manifest is proper, then pass it to phar_parse_pharfile(). SUCCESS
15651565
* or FAILURE is returned and pphar is set to a pointer to the phar's manifest
15661566
*/
1567-
static zend_result phar_open_from_fp(php_stream* fp, char *fname, size_t fname_len, char *alias, size_t alias_len, uint32_t options, phar_archive_data** pphar, char **error) /* {{{ */
1567+
static zend_result phar_open_from_fp(php_stream* fp, const char *fname, size_t fname_len, const char *alias, size_t alias_len, uint32_t options, phar_archive_data** pphar, char **error) /* {{{ */
15681568
{
15691569
static const char token[] = "__HALT_COMPILER();";
15701570
static const char zip_magic[] = "PK\x03\x04";
@@ -2252,7 +2252,7 @@ zend_string* phar_split_fname(const char *filename, size_t filename_len, zend_st
22522252
* Invoked when a user calls Phar::mapPhar() from within an executing .phar
22532253
* to set up its manifest directly
22542254
*/
2255-
ZEND_ATTRIBUTE_NONNULL_ARGS(3) zend_result phar_open_executed_filename(char *alias, size_t alias_len, char **error) /* {{{ */
2255+
ZEND_ATTRIBUTE_NONNULL_ARGS(3) zend_result phar_open_executed_filename(const char *alias, size_t alias_len, char **error) /* {{{ */
22562256
{
22572257
*error = NULL;
22582258

‎ext/phar/phar_internal.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -406,10 +406,10 @@ void phar_object_init(void);
406406
void phar_destroy_phar_data(phar_archive_data *phar);
407407

408408
ZEND_ATTRIBUTE_NONNULL zend_result phar_postprocess_file(phar_entry_data *idata, uint32_t crc32, char **error, int process_zip);
409-
zend_result phar_open_from_filename(char *fname, size_t fname_len, char *alias, size_t alias_len, uint32_t options, phar_archive_data** pphar, char **error);
410-
ZEND_ATTRIBUTE_NONNULL_ARGS(1, 6, 7) zend_result phar_open_or_create_filename(zend_string *fname, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error);
411-
ZEND_ATTRIBUTE_NONNULL_ARGS(1, 6, 7) zend_result phar_create_or_parse_filename(zend_string *fname, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error);
412-
ZEND_ATTRIBUTE_NONNULL_ARGS(3) zend_result phar_open_executed_filename(char *alias, size_t alias_len, char **error);
409+
zend_result phar_open_from_filename(char *fname, size_t fname_len, const char *alias, size_t alias_len, uint32_t options, phar_archive_data** pphar, char **error);
410+
ZEND_ATTRIBUTE_NONNULL_ARGS(1, 6, 7) zend_result phar_open_or_create_filename(zend_string *fname, const char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error);
411+
ZEND_ATTRIBUTE_NONNULL_ARGS(1, 6, 7) zend_result phar_create_or_parse_filename(zend_string *fname, const char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error);
412+
ZEND_ATTRIBUTE_NONNULL_ARGS(3) zend_result phar_open_executed_filename(const char *alias, size_t alias_len, char **error);
413413
zend_result phar_free_alias(const phar_archive_data *phar);
414414
phar_archive_data* phar_get_archive(const char *fname, size_t fname_len, const char *alias, size_t alias_len, char **error);
415415
zend_result phar_verify_signature(php_stream *fp, size_t end_of_phar, uint32_t sig_type, const char *sig, size_t sig_len, const char *fname, char **signature, size_t *signature_len, char **error);
@@ -423,7 +423,7 @@ const char *phar_compress_filter(const phar_entry_info *entry, bool return_unkno
423423
/* void phar_remove_virtual_dirs(phar_archive_data *phar, char *filename, size_t filename_len); */
424424
void phar_add_virtual_dirs(phar_archive_data *phar, const char *filename, size_t filename_len);
425425
zend_result phar_mount_entry(phar_archive_data *phar, const char *filename, size_t filename_len, char *path, size_t path_len);
426-
zend_string *phar_find_in_include_path(zend_string *file, phar_archive_data **pphar);
426+
zend_string *phar_find_in_include_path(const zend_string *file, phar_archive_data **pphar);
427427
zend_string* phar_fix_filepath(const char *path, size_t path_length, bool use_cwd);
428428
ZEND_ATTRIBUTE_NONNULL phar_entry_info * phar_open_jit(const phar_archive_data *phar, phar_entry_info *entry, char **error);
429429
void phar_parse_metadata_lazy(const char *buffer, phar_metadata_tracker *tracker, uint32_t zip_metadata_len, bool persistent);
@@ -446,12 +446,12 @@ zend_result phar_copy_on_write(phar_archive_data **pphar);
446446
/* tar functions in tar.c */
447447
bool phar_is_tar(const char *buf, const char *fname);
448448
zend_result phar_parse_tarfile(php_stream* fp, const char *fname, size_t fname_len, const char *alias, size_t alias_len, phar_archive_data** pphar, uint32_t compression, char **error);
449-
ZEND_ATTRIBUTE_NONNULL_ARGS(1, 6, 7) zend_result phar_open_or_create_tar(zend_string *fname, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error);
449+
ZEND_ATTRIBUTE_NONNULL_ARGS(1, 6, 7) zend_result phar_open_or_create_tar(zend_string *fname, const char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error);
450450
ZEND_ATTRIBUTE_NONNULL_ARGS(1, 4) int phar_tar_flush(phar_archive_data *phar, zend_string *user_stub, bool is_default_stub, char **error);
451451

452452
/* zip functions in zip.c */
453453
zend_result phar_parse_zipfile(php_stream *fp, const char *fname, size_t fname_len, const char *alias, size_t alias_len, phar_archive_data** pphar, char **error);
454-
ZEND_ATTRIBUTE_NONNULL_ARGS(1, 6, 7) zend_result phar_open_or_create_zip(zend_string *fname, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error);
454+
ZEND_ATTRIBUTE_NONNULL_ARGS(1, 6, 7) zend_result phar_open_or_create_zip(zend_string *fname, const char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error);
455455
ZEND_ATTRIBUTE_NONNULL_ARGS(1, 4) int phar_zip_flush(phar_archive_data *archive, zend_string *user_stub, bool is_default_stub, char **error);
456456

457457
#ifdef PHAR_MAIN

‎ext/phar/phar_object.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,9 +349,10 @@ static void phar_do_404(phar_archive_data *phar, char *fname, size_t fname_len,
349349
/* post-process REQUEST_URI and retrieve the actual request URI. This is for
350350
cases like http://localhost/blah.phar/path/to/file.php/extra/stuff
351351
which calls "blah.phar" file "path/to/file.php" with PATH_INFO "/extra/stuff" */
352-
static void phar_postprocess_ru_web(const char *fname, size_t fname_len, char *entry, size_t *entry_len, char **ru, size_t *ru_len) /* {{{ */
352+
static void phar_postprocess_ru_web(const char *fname, size_t fname_len, const char *entry, size_t *entry_len, char **ru, size_t *ru_len) /* {{{ */
353353
{
354-
char *e = entry + 1, *u1 = NULL, *u = NULL, *saveu = NULL;
354+
const char *e = entry + 1;
355+
char *u1 = NULL, *u = NULL, *saveu = NULL;
355356
size_t e_len = *entry_len - 1, u_len = 0;
356357
phar_archive_data *pphar;
357358

‎ext/phar/stream.c‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ static ssize_t phar_stream_read(php_stream *stream, char *buf, size_t count) /*
364364
{
365365
phar_entry_data *data = (phar_entry_data *)stream->abstract;
366366
ssize_t got;
367-
phar_entry_info *entry;
367+
const phar_entry_info *entry;
368368

369369
if (data->internal_file->symlink) {
370370
entry = phar_get_link_source(data->internal_file);
@@ -394,7 +394,7 @@ static ssize_t phar_stream_read(php_stream *stream, char *buf, size_t count) /*
394394
static int phar_stream_seek(php_stream *stream, zend_off_t offset, int whence, zend_off_t *newoffset) /* {{{ */
395395
{
396396
phar_entry_data *data = (phar_entry_data *)stream->abstract;
397-
phar_entry_info *entry;
397+
const phar_entry_info *entry;
398398
int res;
399399
zend_ulong temp;
400400

@@ -462,7 +462,7 @@ static int phar_stream_flush(php_stream *stream) /* {{{ */
462462
{
463463
char *error;
464464
int ret;
465-
phar_entry_data *data = (phar_entry_data *) stream->abstract;
465+
const phar_entry_data *data = stream->abstract;
466466

467467
if (data->internal_file->is_modified) {
468468
data->internal_file->timestamp = time(0);
@@ -536,7 +536,7 @@ void phar_dostat(phar_archive_data *phar, phar_entry_info *data, php_stream_stat
536536
*/
537537
static int phar_stream_stat(php_stream *stream, php_stream_statbuf *ssb) /* {{{ */
538538
{
539-
phar_entry_data *data = (phar_entry_data *)stream->abstract;
539+
const phar_entry_data *data = stream->abstract;
540540

541541
/* If ssb is NULL then someone is misbehaving */
542542
if (!ssb) {
@@ -659,7 +659,6 @@ static int phar_wrapper_unlink(php_stream_wrapper *wrapper, const char *url, int
659659
char *internal_file, *error;
660660
size_t internal_file_len;
661661
phar_entry_data *idata;
662-
phar_archive_data *pphar;
663662

664663
php_url *resource = phar_parse_url(wrapper, url, "rb", options);
665664
if (!resource) {
@@ -682,7 +681,7 @@ static int phar_wrapper_unlink(php_stream_wrapper *wrapper, const char *url, int
682681

683682
phar_request_initialize();
684683

685-
pphar = zend_hash_find_ptr(&(PHAR_G(phar_fname_map)), resource->host);
684+
const phar_archive_data *pphar = zend_hash_find_ptr(&(PHAR_G(phar_fname_map)), resource->host);
686685
if (PHAR_G(readonly) && (!pphar || !pphar->is_data)) {
687686
php_url_free(resource);
688687
php_stream_wrapper_log_error(wrapper, options, "phar error: write operations disabled by the php.ini setting phar.readonly");

‎ext/phar/tar.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ bool phar_is_tar(const char *buf, const char *fname) /* {{{ */
126126
}
127127
/* }}} */
128128

129-
ZEND_ATTRIBUTE_NONNULL_ARGS(1, 6, 7) zend_result phar_open_or_create_tar(zend_string *fname, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error) /* {{{ */
129+
ZEND_ATTRIBUTE_NONNULL_ARGS(1, 6, 7) zend_result phar_open_or_create_tar(zend_string *fname, const char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error) /* {{{ */
130130
{
131131
phar_archive_data *phar;
132132
zend_result ret = phar_create_or_parse_filename(fname, alias, alias_len, is_data, options, &phar, error);
@@ -802,7 +802,7 @@ static int phar_tar_writeheaders_int(phar_entry_info *entry, void *argument) /*
802802
/* write header */
803803
entry->header_offset = php_stream_tell(fp->new);
804804

805-
if (sizeof(header) != php_stream_write(fp->new, (char *) &header, sizeof(header))) {
805+
if (sizeof(header) != php_stream_write(fp->new, (const char *) &header, sizeof(header))) {
806806
if (fp->error) {
807807
spprintf(fp->error, 4096, "tar-based phar \"%s\" cannot be created, header for file \"%s\" could not be written", ZSTR_VAL(entry->phar->fname), ZSTR_VAL(entry->filename));
808808
}
@@ -906,7 +906,7 @@ ZEND_ATTRIBUTE_NONNULL static int phar_tar_setmetadata(const phar_metadata_track
906906

907907
ZEND_ATTRIBUTE_NONNULL static int phar_tar_setupmetadata(zval *zv, void *argument) /* {{{ */
908908
{
909-
struct _phar_pass_tar_info *i = (struct _phar_pass_tar_info *)argument;
909+
const struct _phar_pass_tar_info *i = (struct _phar_pass_tar_info *)argument;
910910
char **error = i->error;
911911
phar_entry_info *entry = (phar_entry_info *)Z_PTR_P(zv), newentry = {0};
912912

‎ext/phar/util.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ zend_result phar_mount_entry(phar_archive_data *phar, const char *filename, size
264264
}
265265
/* }}} */
266266

267-
zend_string *phar_find_in_include_path(zend_string *filename, phar_archive_data **pphar) /* {{{ */
267+
zend_string *phar_find_in_include_path(const zend_string *filename, phar_archive_data **pphar) /* {{{ */
268268
{
269269
zend_string *ret;
270270
char *path;

‎ext/phar/zip.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,7 @@ zend_result phar_parse_zipfile(php_stream *fp, const char *fname, size_t fname_l
794794
/**
795795
* Create or open a zip-based phar for writing
796796
*/
797-
ZEND_ATTRIBUTE_NONNULL_ARGS(1, 6, 7) zend_result phar_open_or_create_zip(zend_string *fname, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error) /* {{{ */
797+
ZEND_ATTRIBUTE_NONNULL_ARGS(1, 6, 7) zend_result phar_open_or_create_zip(zend_string *fname, const char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error) /* {{{ */
798798
{
799799
phar_archive_data *phar;
800800
zend_result ret = phar_create_or_parse_filename(fname, alias, alias_len, is_data, options, &phar, error);

0 commit comments

Comments
 (0)