Skip to content

Commit 304f19b

Browse files
authored
Remove unused fields from phar_entry_data() (#14144)
These fields are only ever written to, but never read.
1 parent e218ca2 commit 304f19b

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

ext/phar/phar_internal.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -458,9 +458,6 @@ typedef struct _phar_entry_data {
458458
zend_off_t position;
459459
/* for copies of the phar fp, defines where 0 is */
460460
zend_off_t zero;
461-
uint32_t for_write:1;
462-
uint32_t is_zip:1;
463-
uint32_t is_tar:1;
464461
phar_entry_info *internal_file;
465462
} phar_entry_data;
466463

ext/phar/util.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -438,10 +438,7 @@ int phar_get_entry_data(phar_entry_data **ret, char *fname, size_t fname_len, ch
438438
(*ret)->position = 0;
439439
(*ret)->fp = NULL;
440440
(*ret)->phar = phar;
441-
(*ret)->for_write = for_write;
442441
(*ret)->internal_file = entry;
443-
(*ret)->is_zip = entry->is_zip;
444-
(*ret)->is_tar = entry->is_tar;
445442

446443
if (!phar->is_persistent) {
447444
++(entry->phar->refcount);
@@ -486,10 +483,7 @@ int phar_get_entry_data(phar_entry_data **ret, char *fname, size_t fname_len, ch
486483
*ret = (phar_entry_data *) emalloc(sizeof(phar_entry_data));
487484
(*ret)->position = 0;
488485
(*ret)->phar = phar;
489-
(*ret)->for_write = for_write;
490486
(*ret)->internal_file = entry;
491-
(*ret)->is_zip = entry->is_zip;
492-
(*ret)->is_tar = entry->is_tar;
493487
(*ret)->fp = phar_get_efp(entry, 1);
494488
if (entry->link) {
495489
phar_entry_info *link = phar_get_link_source(entry);
@@ -616,9 +610,6 @@ phar_entry_data *phar_get_or_create_entry_data(char *fname, size_t fname_len, ch
616610
ret->phar = phar;
617611
ret->fp = entry->fp;
618612
ret->position = ret->zero = 0;
619-
ret->for_write = 1;
620-
ret->is_zip = entry->is_zip;
621-
ret->is_tar = entry->is_tar;
622613
ret->internal_file = entry;
623614

624615
return ret;

0 commit comments

Comments
 (0)