@@ -183,7 +183,7 @@ static void spl_filesystem_object_free_storage(zend_object *object) /* {{{ */
183
183
- clone
184
184
- new
185
185
*/
186
- static zend_object * spl_filesystem_object_new_ex (zend_class_entry * class_type )
186
+ static zend_object * spl_filesystem_object_new (zend_class_entry * class_type )
187
187
{
188
188
spl_filesystem_object * intern ;
189
189
@@ -202,14 +202,6 @@ static zend_object *spl_filesystem_object_new_ex(zend_class_entry *class_type)
202
202
}
203
203
/* }}} */
204
204
205
- /* {{{ spl_filesystem_object_new */
206
- /* See spl_filesystem_object_new_ex */
207
- static zend_object * spl_filesystem_object_new (zend_class_entry * class_type )
208
- {
209
- return spl_filesystem_object_new_ex (class_type );
210
- }
211
- /* }}} */
212
-
213
205
PHPAPI zend_string * spl_filesystem_object_get_path (spl_filesystem_object * intern ) /* {{{ */
214
206
{
215
207
#ifdef HAVE_GLOB
@@ -385,7 +377,7 @@ static zend_result spl_filesystem_file_open(spl_filesystem_object *intern, bool
385
377
/* {{{ spl_filesystem_object_clone */
386
378
/* Local zend_object creation (on stack)
387
379
Load the 'other' object
388
- Create a new empty object (See spl_filesystem_object_new_ex )
380
+ Create a new empty object (See spl_filesystem_object_new )
389
381
Open the directory
390
382
Clone other members (properties)
391
383
*/
@@ -396,7 +388,7 @@ static zend_object *spl_filesystem_object_clone(zend_object *old_object)
396
388
spl_filesystem_object * source ;
397
389
398
390
source = spl_filesystem_from_obj (old_object );
399
- new_object = spl_filesystem_object_new_ex (old_object -> ce );
391
+ new_object = spl_filesystem_object_new (old_object -> ce );
400
392
intern = spl_filesystem_from_obj (new_object );
401
393
402
394
intern -> flags = source -> flags ;
@@ -481,7 +473,7 @@ static spl_filesystem_object *spl_filesystem_object_create_info(zend_string *fil
481
473
ZEND_ASSERT (file_path && ZSTR_LEN (file_path ) > 0 );
482
474
ZEND_ASSERT (ce != NULL );
483
475
484
- intern = spl_filesystem_from_obj (spl_filesystem_object_new_ex (ce ));
476
+ intern = spl_filesystem_from_obj (spl_filesystem_object_new (ce ));
485
477
RETVAL_OBJ (& intern -> std );
486
478
487
479
if (ce -> constructor -> common .scope != spl_ce_SplFileInfo ) {
@@ -517,7 +509,7 @@ static spl_filesystem_object *spl_filesystem_object_create_type(int num_args, sp
517
509
case SPL_FS_INFO :
518
510
ce = ce ? ce : source -> info_class ;
519
511
520
- intern = spl_filesystem_from_obj (spl_filesystem_object_new_ex (ce ));
512
+ intern = spl_filesystem_from_obj (spl_filesystem_object_new (ce ));
521
513
RETVAL_OBJ (& intern -> std );
522
514
523
515
if (spl_filesystem_object_get_file_name (source ) == FAILURE ) {
@@ -546,7 +538,7 @@ static spl_filesystem_object *spl_filesystem_object_create_type(int num_args, sp
546
538
return NULL ;
547
539
}
548
540
549
- intern = spl_filesystem_from_obj (spl_filesystem_object_new_ex (ce ));
541
+ intern = spl_filesystem_from_obj (spl_filesystem_object_new (ce ));
550
542
RETVAL_OBJ (& intern -> std );
551
543
552
544
if (spl_filesystem_object_get_file_name (source ) == FAILURE ) {
0 commit comments