@@ -202,11 +202,7 @@ PHPAPI char* spl_filesystem_object_get_path(spl_filesystem_object *intern, size_
202
202
203
203
static inline int spl_filesystem_object_get_file_name (spl_filesystem_object * intern ) /* {{{ */
204
204
{
205
- /* On UNIX based systems '/' is identical to DEFAULT_SLASH */
206
- #pragma GCC diagnostic push
207
- #pragma GCC diagnostic ignored "-Wduplicated-branches"
208
205
char slash = SPL_HAS_FLAG (intern -> flags , SPL_FILE_DIR_UNIXPATHS ) ? '/' : DEFAULT_SLASH ;
209
- #pragma GCC diagnostic pop
210
206
211
207
switch (intern -> type ) {
212
208
case SPL_FS_INFO :
@@ -1485,11 +1481,7 @@ PHP_METHOD(RecursiveDirectoryIterator, getChildren)
1485
1481
zval zpath , zflags ;
1486
1482
spl_filesystem_object * intern = Z_SPLFILESYSTEM_P (ZEND_THIS );
1487
1483
spl_filesystem_object * subdir ;
1488
- /* On UNIX based systems '/' is identical to DEFAULT_SLASH */
1489
- #pragma GCC diagnostic push
1490
- #pragma GCC diagnostic ignored "-Wduplicated-branches"
1491
1484
char slash = SPL_HAS_FLAG (intern -> flags , SPL_FILE_DIR_UNIXPATHS ) ? '/' : DEFAULT_SLASH ;
1492
- #pragma GCC diagnostic pop
1493
1485
1494
1486
if (zend_parse_parameters_none () == FAILURE ) {
1495
1487
RETURN_THROWS ();
@@ -1540,11 +1532,7 @@ PHP_METHOD(RecursiveDirectoryIterator, getSubPath)
1540
1532
PHP_METHOD (RecursiveDirectoryIterator , getSubPathname )
1541
1533
{
1542
1534
spl_filesystem_object * intern = Z_SPLFILESYSTEM_P (ZEND_THIS );
1543
- /* On UNIX based systems '/' is identical to DEFAULT_SLASH */
1544
- #pragma GCC diagnostic push
1545
- #pragma GCC diagnostic ignored "-Wduplicated-branches"
1546
1535
char slash = SPL_HAS_FLAG (intern -> flags , SPL_FILE_DIR_UNIXPATHS ) ? '/' : DEFAULT_SLASH ;
1547
- #pragma GCC diagnostic pop
1548
1536
1549
1537
if (zend_parse_parameters_none () == FAILURE ) {
1550
1538
RETURN_THROWS ();
0 commit comments