Skip to content

Commit ed54233

Browse files
zsuraskizsuraski
committed
Get rid of some inlines
1 parent ff4dfc5 commit ed54233

File tree

4 files changed

+50
-60
lines changed

4 files changed

+50
-60
lines changed

‎Zend/zend_API.c

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ ZEND_API inline int _array_init(zval *arg ZEND_FILE_LINE_DC)
590590
}
591591

592592

593-
ZEND_API inline int _object_init_ex(zval *arg, zend_class_entry *class_type ZEND_FILE_LINE_DC)
593+
ZEND_API int _object_init_ex(zval *arg, zend_class_entry *class_type ZEND_FILE_LINE_DC)
594594
{
595595
zval *tmp;
596596

@@ -608,20 +608,20 @@ ZEND_API inline int _object_init_ex(zval *arg, zend_class_entry *class_type ZEND
608608
}
609609

610610

611-
ZEND_API inline int _object_init(zval *arg ZEND_FILE_LINE_DC)
611+
ZEND_API int _object_init(zval *arg ZEND_FILE_LINE_DC)
612612
{
613613
return _object_init_ex(arg, &zend_standard_class_def ZEND_FILE_LINE_CC);
614614
}
615615

616616

617-
ZEND_API inline int add_assoc_function(zval *arg, char *key,void (*function_ptr)(INTERNAL_FUNCTION_PARAMETERS))
617+
ZEND_API int add_assoc_function(zval *arg, char *key,void (*function_ptr)(INTERNAL_FUNCTION_PARAMETERS))
618618
{
619619
zend_error(E_WARNING, "add_assoc_function() is no longer supported");
620620
return FAILURE;
621621
}
622622

623623

624-
ZEND_API inline int add_assoc_long_ex(zval *arg, char *key, uint key_len, long n)
624+
ZEND_API int add_assoc_long_ex(zval *arg, char *key, uint key_len, long n)
625625
{
626626
zval *tmp;
627627

@@ -631,7 +631,7 @@ ZEND_API inline int add_assoc_long_ex(zval *arg, char *key, uint key_len, long n
631631
return zend_hash_update(Z_ARRVAL_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL);
632632
}
633633

634-
ZEND_API inline int add_assoc_null_ex(zval *arg, char *key, uint key_len)
634+
ZEND_API int add_assoc_null_ex(zval *arg, char *key, uint key_len)
635635
{
636636
zval *tmp;
637637

@@ -641,7 +641,7 @@ ZEND_API inline int add_assoc_null_ex(zval *arg, char *key, uint key_len)
641641
return zend_hash_update(Z_ARRVAL_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL);
642642
}
643643

644-
ZEND_API inline int add_assoc_bool_ex(zval *arg, char *key, uint key_len, int b)
644+
ZEND_API int add_assoc_bool_ex(zval *arg, char *key, uint key_len, int b)
645645
{
646646
zval *tmp;
647647

@@ -651,7 +651,7 @@ ZEND_API inline int add_assoc_bool_ex(zval *arg, char *key, uint key_len, int b)
651651
return zend_hash_update(Z_ARRVAL_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL);
652652
}
653653

654-
ZEND_API inline int add_assoc_resource_ex(zval *arg, char *key, uint key_len, int r)
654+
ZEND_API int add_assoc_resource_ex(zval *arg, char *key, uint key_len, int r)
655655
{
656656
zval *tmp;
657657

@@ -662,7 +662,7 @@ ZEND_API inline int add_assoc_resource_ex(zval *arg, char *key, uint key_len, in
662662
}
663663

664664

665-
ZEND_API inline int add_assoc_double_ex(zval *arg, char *key, uint key_len, double d)
665+
ZEND_API int add_assoc_double_ex(zval *arg, char *key, uint key_len, double d)
666666
{
667667
zval *tmp;
668668

@@ -673,7 +673,7 @@ ZEND_API inline int add_assoc_double_ex(zval *arg, char *key, uint key_len, doub
673673
}
674674

675675

676-
ZEND_API inline int add_assoc_string_ex(zval *arg, char *key, uint key_len, char *str, int duplicate)
676+
ZEND_API int add_assoc_string_ex(zval *arg, char *key, uint key_len, char *str, int duplicate)
677677
{
678678
zval *tmp;
679679

@@ -684,7 +684,7 @@ ZEND_API inline int add_assoc_string_ex(zval *arg, char *key, uint key_len, char
684684
}
685685

686686

687-
ZEND_API inline int add_assoc_stringl_ex(zval *arg, char *key, uint key_len, char *str, uint length, int duplicate)
687+
ZEND_API int add_assoc_stringl_ex(zval *arg, char *key, uint key_len, char *str, uint length, int duplicate)
688688
{
689689
zval *tmp;
690690

@@ -694,13 +694,13 @@ ZEND_API inline int add_assoc_stringl_ex(zval *arg, char *key, uint key_len, cha
694694
return zend_hash_update(Z_ARRVAL_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL);
695695
}
696696

697-
ZEND_API inline int add_assoc_zval_ex(zval *arg, char *key, uint key_len, zval *value)
697+
ZEND_API int add_assoc_zval_ex(zval *arg, char *key, uint key_len, zval *value)
698698
{
699699
return zend_hash_update(Z_ARRVAL_P(arg), key, key_len, (void *) &value, sizeof(zval *), NULL);
700700
}
701701

702702

703-
ZEND_API inline int add_index_long(zval *arg, uint index, long n)
703+
ZEND_API int add_index_long(zval *arg, uint index, long n)
704704
{
705705
zval *tmp;
706706

@@ -711,7 +711,7 @@ ZEND_API inline int add_index_long(zval *arg, uint index, long n)
711711
}
712712

713713

714-
ZEND_API inline int add_index_null(zval *arg, uint index)
714+
ZEND_API int add_index_null(zval *arg, uint index)
715715
{
716716
zval *tmp;
717717

@@ -721,7 +721,7 @@ ZEND_API inline int add_index_null(zval *arg, uint index)
721721
return zend_hash_index_update(Z_ARRVAL_P(arg), index, (void *) &tmp, sizeof(zval *), NULL);
722722
}
723723

724-
ZEND_API inline int add_index_bool(zval *arg, uint index, int b)
724+
ZEND_API int add_index_bool(zval *arg, uint index, int b)
725725
{
726726
zval *tmp;
727727

@@ -732,7 +732,7 @@ ZEND_API inline int add_index_bool(zval *arg, uint index, int b)
732732
}
733733

734734

735-
ZEND_API inline int add_index_resource(zval *arg, uint index, int r)
735+
ZEND_API int add_index_resource(zval *arg, uint index, int r)
736736
{
737737
zval *tmp;
738738

@@ -743,7 +743,7 @@ ZEND_API inline int add_index_resource(zval *arg, uint index, int r)
743743
}
744744

745745

746-
ZEND_API inline int add_index_double(zval *arg, uint index, double d)
746+
ZEND_API int add_index_double(zval *arg, uint index, double d)
747747
{
748748
zval *tmp;
749749

@@ -754,7 +754,7 @@ ZEND_API inline int add_index_double(zval *arg, uint index, double d)
754754
}
755755

756756

757-
ZEND_API inline int add_index_string(zval *arg, uint index, char *str, int duplicate)
757+
ZEND_API int add_index_string(zval *arg, uint index, char *str, int duplicate)
758758
{
759759
zval *tmp;
760760

@@ -765,7 +765,7 @@ ZEND_API inline int add_index_string(zval *arg, uint index, char *str, int dupli
765765
}
766766

767767

768-
ZEND_API inline int add_index_stringl(zval *arg, uint index, char *str, uint length, int duplicate)
768+
ZEND_API int add_index_stringl(zval *arg, uint index, char *str, uint length, int duplicate)
769769
{
770770
zval *tmp;
771771

@@ -776,13 +776,13 @@ ZEND_API inline int add_index_stringl(zval *arg, uint index, char *str, uint len
776776
}
777777

778778

779-
ZEND_API inline int add_index_zval(zval *arg, uint index, zval *value)
779+
ZEND_API int add_index_zval(zval *arg, uint index, zval *value)
780780
{
781781
return zend_hash_index_update(Z_ARRVAL_P(arg), index, (void *) &value, sizeof(zval *), NULL);
782782
}
783783

784784

785-
ZEND_API inline int add_next_index_long(zval *arg, long n)
785+
ZEND_API int add_next_index_long(zval *arg, long n)
786786
{
787787
zval *tmp;
788788

@@ -793,7 +793,7 @@ ZEND_API inline int add_next_index_long(zval *arg, long n)
793793
}
794794

795795

796-
ZEND_API inline int add_next_index_null(zval *arg)
796+
ZEND_API int add_next_index_null(zval *arg)
797797
{
798798
zval *tmp;
799799

@@ -804,7 +804,7 @@ ZEND_API inline int add_next_index_null(zval *arg)
804804
}
805805

806806

807-
ZEND_API inline int add_next_index_bool(zval *arg, int b)
807+
ZEND_API int add_next_index_bool(zval *arg, int b)
808808
{
809809
zval *tmp;
810810

@@ -815,7 +815,7 @@ ZEND_API inline int add_next_index_bool(zval *arg, int b)
815815
}
816816

817817

818-
ZEND_API inline int add_next_index_resource(zval *arg, int r)
818+
ZEND_API int add_next_index_resource(zval *arg, int r)
819819
{
820820
zval *tmp;
821821

@@ -826,7 +826,7 @@ ZEND_API inline int add_next_index_resource(zval *arg, int r)
826826
}
827827

828828

829-
ZEND_API inline int add_next_index_double(zval *arg, double d)
829+
ZEND_API int add_next_index_double(zval *arg, double d)
830830
{
831831
zval *tmp;
832832

@@ -837,7 +837,7 @@ ZEND_API inline int add_next_index_double(zval *arg, double d)
837837
}
838838

839839

840-
ZEND_API inline int add_next_index_string(zval *arg, char *str, int duplicate)
840+
ZEND_API int add_next_index_string(zval *arg, char *str, int duplicate)
841841
{
842842
zval *tmp;
843843

@@ -848,7 +848,7 @@ ZEND_API inline int add_next_index_string(zval *arg, char *str, int duplicate)
848848
}
849849

850850

851-
ZEND_API inline int add_next_index_stringl(zval *arg, char *str, uint length, int duplicate)
851+
ZEND_API int add_next_index_stringl(zval *arg, char *str, uint length, int duplicate)
852852
{
853853
zval *tmp;
854854

@@ -859,13 +859,13 @@ ZEND_API inline int add_next_index_stringl(zval *arg, char *str, uint length, in
859859
}
860860

861861

862-
ZEND_API inline int add_next_index_zval(zval *arg, zval *value)
862+
ZEND_API int add_next_index_zval(zval *arg, zval *value)
863863
{
864864
return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &value, sizeof(zval *), NULL);
865865
}
866866

867867

868-
ZEND_API inline int add_get_assoc_string_ex(zval *arg, char *key, uint key_len, char *str, void **dest, int duplicate)
868+
ZEND_API int add_get_assoc_string_ex(zval *arg, char *key, uint key_len, char *str, void **dest, int duplicate)
869869
{
870870
zval *tmp;
871871

@@ -876,7 +876,7 @@ ZEND_API inline int add_get_assoc_string_ex(zval *arg, char *key, uint key_len,
876876
}
877877

878878

879-
ZEND_API inline int add_get_assoc_stringl_ex(zval *arg, char *key, uint key_len, char *str, uint length, void **dest, int duplicate)
879+
ZEND_API int add_get_assoc_stringl_ex(zval *arg, char *key, uint key_len, char *str, uint length, void **dest, int duplicate)
880880
{
881881
zval *tmp;
882882

@@ -887,7 +887,7 @@ ZEND_API inline int add_get_assoc_stringl_ex(zval *arg, char *key, uint key_len,
887887
}
888888

889889

890-
ZEND_API inline int add_get_index_long(zval *arg, uint index, long l, void **dest)
890+
ZEND_API int add_get_index_long(zval *arg, uint index, long l, void **dest)
891891
{
892892
zval *tmp;
893893

@@ -898,7 +898,7 @@ ZEND_API inline int add_get_index_long(zval *arg, uint index, long l, void **des
898898
}
899899

900900

901-
ZEND_API inline int add_get_index_double(zval *arg, uint index, double d, void **dest)
901+
ZEND_API int add_get_index_double(zval *arg, uint index, double d, void **dest)
902902
{
903903
zval *tmp;
904904

@@ -909,7 +909,7 @@ ZEND_API inline int add_get_index_double(zval *arg, uint index, double d, void *
909909
}
910910

911911

912-
ZEND_API inline int add_get_index_string(zval *arg, uint index, char *str, void **dest, int duplicate)
912+
ZEND_API int add_get_index_string(zval *arg, uint index, char *str, void **dest, int duplicate)
913913
{
914914
zval *tmp;
915915

@@ -920,7 +920,7 @@ ZEND_API inline int add_get_index_string(zval *arg, uint index, char *str, void
920920
}
921921

922922

923-
ZEND_API inline int add_get_index_stringl(zval *arg, uint index, char *str, uint length, void **dest, int duplicate)
923+
ZEND_API int add_get_index_stringl(zval *arg, uint index, char *str, uint length, void **dest, int duplicate)
924924
{
925925
zval *tmp;
926926

@@ -931,7 +931,7 @@ ZEND_API inline int add_get_index_stringl(zval *arg, uint index, char *str, uint
931931
}
932932

933933

934-
ZEND_API inline int add_property_long_ex(zval *arg, char *key, uint key_len, long n)
934+
ZEND_API int add_property_long_ex(zval *arg, char *key, uint key_len, long n)
935935
{
936936
zval *tmp;
937937

@@ -941,7 +941,7 @@ ZEND_API inline int add_property_long_ex(zval *arg, char *key, uint key_len, lon
941941
return zend_hash_update(Z_OBJPROP_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL);
942942
}
943943

944-
ZEND_API inline int add_property_bool_ex(zval *arg, char *key, uint key_len, int b)
944+
ZEND_API int add_property_bool_ex(zval *arg, char *key, uint key_len, int b)
945945
{
946946
zval *tmp;
947947

@@ -951,7 +951,7 @@ ZEND_API inline int add_property_bool_ex(zval *arg, char *key, uint key_len, int
951951
return zend_hash_update(Z_OBJPROP_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL);
952952
}
953953

954-
ZEND_API inline int add_property_null_ex(zval *arg, char *key, uint key_len)
954+
ZEND_API int add_property_null_ex(zval *arg, char *key, uint key_len)
955955
{
956956
zval *tmp;
957957

@@ -961,7 +961,7 @@ ZEND_API inline int add_property_null_ex(zval *arg, char *key, uint key_len)
961961
return zend_hash_update(Z_OBJPROP_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL);
962962
}
963963

964-
ZEND_API inline int add_property_resource_ex(zval *arg, char *key, uint key_len, long n)
964+
ZEND_API int add_property_resource_ex(zval *arg, char *key, uint key_len, long n)
965965
{
966966
zval *tmp;
967967

@@ -972,7 +972,7 @@ ZEND_API inline int add_property_resource_ex(zval *arg, char *key, uint key_len,
972972
}
973973

974974

975-
ZEND_API inline int add_property_double_ex(zval *arg, char *key, uint key_len, double d)
975+
ZEND_API int add_property_double_ex(zval *arg, char *key, uint key_len, double d)
976976
{
977977
zval *tmp;
978978

@@ -983,7 +983,7 @@ ZEND_API inline int add_property_double_ex(zval *arg, char *key, uint key_len, d
983983
}
984984

985985

986-
ZEND_API inline int add_property_string_ex(zval *arg, char *key, uint key_len, char *str, int duplicate)
986+
ZEND_API int add_property_string_ex(zval *arg, char *key, uint key_len, char *str, int duplicate)
987987
{
988988
zval *tmp;
989989

@@ -993,7 +993,7 @@ ZEND_API inline int add_property_string_ex(zval *arg, char *key, uint key_len, c
993993
return zend_hash_update(Z_OBJPROP_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL);
994994
}
995995

996-
ZEND_API inline int add_property_stringl_ex(zval *arg, char *key, uint key_len, char *str, uint length, int duplicate)
996+
ZEND_API int add_property_stringl_ex(zval *arg, char *key, uint key_len, char *str, uint length, int duplicate)
997997
{
998998
zval *tmp;
999999

@@ -1003,7 +1003,7 @@ ZEND_API inline int add_property_stringl_ex(zval *arg, char *key, uint key_len,
10031003
return zend_hash_update(Z_OBJPROP_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL);
10041004
}
10051005

1006-
ZEND_API inline int add_property_zval_ex(zval *arg, char *key, uint key_len, zval *value)
1006+
ZEND_API int add_property_zval_ex(zval *arg, char *key, uint key_len, zval *value)
10071007
{
10081008
return zend_hash_update(Z_OBJPROP_P(arg), key, key_len, (void *) &value, sizeof(zval *), NULL);
10091009
}

0 commit comments

Comments
 (0)