@@ -119,58 +119,48 @@ void zend_shutdown_constants(void)
119
119
ZEND_API void zend_register_null_constant (const char * name , size_t name_len , int flags , int module_number )
120
120
{
121
121
zend_constant c ;
122
- zend_string * name_str ;
123
122
124
123
ZVAL_NULL (& c .value );
125
124
ZEND_CONSTANT_SET_FLAGS (& c , flags , module_number );
126
- name_str = zend_string_init_interned (name , name_len , flags & CONST_PERSISTENT );
127
- zend_register_constant (name_str , & c );
125
+ zend_register_internal_constant (name , name_len , & c );
128
126
}
129
127
130
128
ZEND_API void zend_register_bool_constant (const char * name , size_t name_len , bool bval , int flags , int module_number )
131
129
{
132
130
zend_constant c ;
133
- zend_string * name_str ;
134
131
135
132
ZVAL_BOOL (& c .value , bval );
136
133
ZEND_CONSTANT_SET_FLAGS (& c , flags , module_number );
137
- name_str = zend_string_init_interned (name , name_len , flags & CONST_PERSISTENT );
138
- zend_register_constant (name_str , & c );
134
+ zend_register_internal_constant (name , name_len , & c );
139
135
}
140
136
141
137
ZEND_API void zend_register_long_constant (const char * name , size_t name_len , zend_long lval , int flags , int module_number )
142
138
{
143
139
zend_constant c ;
144
- zend_string * name_str ;
145
140
146
141
ZVAL_LONG (& c .value , lval );
147
142
ZEND_CONSTANT_SET_FLAGS (& c , flags , module_number );
148
- name_str = zend_string_init_interned (name , name_len , flags & CONST_PERSISTENT );
149
- zend_register_constant (name_str , & c );
143
+ zend_register_internal_constant (name , name_len , & c );
150
144
}
151
145
152
146
153
147
ZEND_API void zend_register_double_constant (const char * name , size_t name_len , double dval , int flags , int module_number )
154
148
{
155
149
zend_constant c ;
156
- zend_string * name_str ;
157
150
158
151
ZVAL_DOUBLE (& c .value , dval );
159
152
ZEND_CONSTANT_SET_FLAGS (& c , flags , module_number );
160
- name_str = zend_string_init_interned (name , name_len , flags & CONST_PERSISTENT );
161
- zend_register_constant (name_str , & c );
153
+ zend_register_internal_constant (name , name_len , & c );
162
154
}
163
155
164
156
165
157
ZEND_API void zend_register_stringl_constant (const char * name , size_t name_len , const char * strval , size_t strlen , int flags , int module_number )
166
158
{
167
159
zend_constant c ;
168
- zend_string * name_str ;
169
160
170
161
ZVAL_STR (& c .value , zend_string_init_interned (strval , strlen , flags & CONST_PERSISTENT ));
171
162
ZEND_CONSTANT_SET_FLAGS (& c , flags , module_number );
172
- name_str = zend_string_init_interned (name , name_len , flags & CONST_PERSISTENT );
173
- zend_register_constant (name_str , & c );
163
+ zend_register_internal_constant (name , name_len , & c );
174
164
}
175
165
176
166
@@ -577,3 +567,9 @@ ZEND_API zend_result zend_register_constant(zend_string *name, zend_constant *c)
577
567
}
578
568
return ret ;
579
569
}
570
+
571
+ ZEND_API zend_result zend_register_internal_constant (const char * name , size_t name_len , zend_constant * c ) {
572
+ zend_string * name_str = zend_string_init_interned (name , name_len , ZEND_CONSTANT_FLAGS (c ) & CONST_PERSISTENT );
573
+
574
+ return zend_register_constant (name_str , c );
575
+ }
0 commit comments