@@ -605,23 +605,21 @@ static bool php_phongo_bson_visit_symbol(const bson_iter_t* iter, const char* ke
605
605
return false;
606
606
} /* }}} */
607
607
608
- static void php_phongo_bson_new_javascript_from_javascript_and_scope (int init , zval * object , const char * code , size_t code_len , const bson_t * scope TSRMLS_DC ) /* {{{ */
608
+ static void php_phongo_bson_new_javascript_from_javascript_and_scope (zval * object , const char * code , size_t code_len , const bson_t * scope TSRMLS_DC ) /* {{{ */
609
609
{
610
610
php_phongo_javascript_t * intern ;
611
611
612
- if (init ) {
613
- object_init_ex (object , php_phongo_javascript_ce );
614
- }
612
+ object_init_ex (object , php_phongo_javascript_ce );
615
613
616
614
intern = Z_JAVASCRIPT_OBJ_P (object );
617
615
intern -> code = estrndup (code , code_len );
618
616
intern -> code_len = code_len ;
619
617
intern -> scope = scope ? bson_copy (scope ) : NULL ;
620
618
} /* }}} */
621
619
622
- static void php_phongo_bson_new_javascript_from_javascript (int init , zval * object , const char * code , size_t code_len TSRMLS_DC ) /* {{{ */
620
+ static void php_phongo_bson_new_javascript_from_javascript (zval * object , const char * code , size_t code_len TSRMLS_DC ) /* {{{ */
623
621
{
624
- php_phongo_bson_new_javascript_from_javascript_and_scope (init , object , code , code_len , NULL TSRMLS_CC );
622
+ php_phongo_bson_new_javascript_from_javascript_and_scope (object , code , code_len , NULL TSRMLS_CC );
625
623
} /* }}} */
626
624
627
625
static bool php_phongo_bson_visit_code (const bson_iter_t * iter ARG_UNUSED , const char * key , size_t v_code_len , const char * v_code , void * data ) /* {{{ */
@@ -631,7 +629,7 @@ static bool php_phongo_bson_visit_code(const bson_iter_t* iter ARG_UNUSED, const
631
629
#if PHP_VERSION_ID >= 70000
632
630
zval zchild ;
633
631
634
- php_phongo_bson_new_javascript_from_javascript (1 , & zchild , v_code , v_code_len TSRMLS_CC );
632
+ php_phongo_bson_new_javascript_from_javascript (& zchild , v_code , v_code_len TSRMLS_CC );
635
633
636
634
if (state -> is_visiting_array ) {
637
635
add_next_index_zval (retval , & zchild );
@@ -643,7 +641,7 @@ static bool php_phongo_bson_visit_code(const bson_iter_t* iter ARG_UNUSED, const
643
641
TSRMLS_FETCH ();
644
642
645
643
MAKE_STD_ZVAL (zchild );
646
- php_phongo_bson_new_javascript_from_javascript (1 , zchild , v_code , v_code_len TSRMLS_CC );
644
+ php_phongo_bson_new_javascript_from_javascript (zchild , v_code , v_code_len TSRMLS_CC );
647
645
648
646
if (state -> is_visiting_array ) {
649
647
add_next_index_zval (retval , zchild );
@@ -709,7 +707,7 @@ static bool php_phongo_bson_visit_codewscope(const bson_iter_t* iter ARG_UNUSED,
709
707
#if PHP_VERSION_ID >= 70000
710
708
zval zchild ;
711
709
712
- php_phongo_bson_new_javascript_from_javascript_and_scope (1 , & zchild , v_code , v_code_len , v_scope TSRMLS_CC );
710
+ php_phongo_bson_new_javascript_from_javascript_and_scope (& zchild , v_code , v_code_len , v_scope TSRMLS_CC );
713
711
714
712
if (state -> is_visiting_array ) {
715
713
add_next_index_zval (retval , & zchild );
@@ -721,7 +719,7 @@ static bool php_phongo_bson_visit_codewscope(const bson_iter_t* iter ARG_UNUSED,
721
719
TSRMLS_FETCH ();
722
720
723
721
MAKE_STD_ZVAL (zchild );
724
- php_phongo_bson_new_javascript_from_javascript_and_scope (1 , zchild , v_code , v_code_len , v_scope TSRMLS_CC );
722
+ php_phongo_bson_new_javascript_from_javascript_and_scope (zchild , v_code , v_code_len , v_scope TSRMLS_CC );
725
723
726
724
if (state -> is_visiting_array ) {
727
725
add_next_index_zval (retval , zchild );
0 commit comments