Skip to content

Commit bf3b284

Browse files
zeriyoshizeriyoshi
committed
fix: remove unnecessary zend_object
1 parent 01fc380 commit bf3b284

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

‎ext/standard/php_random_class.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ static inline php_random_class *random_class_from_obj(zend_object *obj) {
5151
PHPAPI int php_random_class_algo_register(const php_random_class_algo *algo);
5252
PHPAPI void php_random_class_algo_unregister(const char *ident);
5353
PHPAPI const php_random_class_algo* php_random_class_algo_find(const zend_string *ident);
54-
PHPAPI uint64_t php_random_class_next(php_random_class *random_class, zend_object *obj);
55-
PHPAPI zend_long php_random_class_range(php_random_class *random_class, zend_object *obj, zend_long min, zend_long max);
56-
PHPAPI void php_random_class_array_data_shuffle(php_random_class *random_class, zend_object *obj, zval *array);
57-
PHPAPI void php_random_class_string_shuffle(php_random_class *random_class, zend_object *obj, char *str, zend_long len);
54+
PHPAPI uint64_t php_random_class_next(php_random_class *random_class);
55+
PHPAPI zend_long php_random_class_range(php_random_class *random_class, zend_long min, zend_long max);
56+
PHPAPI void php_random_class_array_data_shuffle(php_random_class *random_class, zval *array);
57+
PHPAPI void php_random_class_string_shuffle(php_random_class *random_class, char *str, zend_long len);
5858

5959
#endif

‎ext/standard/random_class.c

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ static zend_array php_random_class_algos;
2929
static zend_class_entry *php_random_class_ce;
3030
static zend_object_handlers php_random_class_object_handlers;
3131

32-
static uint32_t range32(php_random_class *random_class, zend_object *obj, uint32_t umax) {
32+
static uint32_t range32(php_random_class *random_class, uint32_t umax) {
3333
uint32_t result, limit;
3434

35-
result = php_random_class_next(random_class, obj);
35+
result = php_random_class_next(random_class);
3636

3737
/* Special case where no modulus is required */
3838
if (UNEXPECTED(umax == UINT32_MAX)) {
@@ -52,19 +52,19 @@ static uint32_t range32(php_random_class *random_class, zend_object *obj, uint32
5252

5353
/* Discard numbers over the limit to avoid modulo bias */
5454
while (UNEXPECTED(result > limit)) {
55-
result = php_random_class_next(random_class, obj);
55+
result = php_random_class_next(random_class);
5656
}
5757

5858
return result % umax;
5959
}
6060

6161
#if ZEND_ULONG_MAX > UINT32_MAX
62-
static uint64_t range64(php_random_class *random_class, zend_object *obj, uint64_t umax) {
62+
static uint64_t range64(php_random_class *random_class, uint64_t umax) {
6363
uint64_t result, limit;
6464

65-
result = php_random_class_next(random_class, obj);
65+
result = php_random_class_next(random_class);
6666
if (random_class->algo && random_class->algo->bytes == 32) {
67-
result = (result << 32) | php_random_class_next(random_class, obj);
67+
result = (result << 32) | php_random_class_next(random_class);
6868
}
6969

7070
/* Special case where no modulus is required */
@@ -85,9 +85,9 @@ static uint64_t range64(php_random_class *random_class, zend_object *obj, uint64
8585

8686
/* Discard numbers over the limit to avoid modulo bias */
8787
while (UNEXPECTED(result > limit)) {
88-
result = php_random_class_next(random_class, obj);
88+
result = php_random_class_next(random_class);
8989
if (random_class->algo && random_class->algo->bytes == 32) {
90-
result = (result << 32) | php_random_class_next(random_class, obj);
90+
result = (result << 32) | php_random_class_next(random_class);
9191
}
9292
}
9393

@@ -133,7 +133,7 @@ const php_random_class_algo* php_random_class_algo_find(const zend_string *ident
133133
/* }}} */
134134

135135
/* {{{ */
136-
uint64_t php_random_class_next(php_random_class *random_class, zend_object *obj)
136+
uint64_t php_random_class_next(php_random_class *random_class)
137137
{
138138
zend_long ret;
139139
zend_function *function;
@@ -145,33 +145,33 @@ uint64_t php_random_class_next(php_random_class *random_class, zend_object *obj)
145145

146146
/* call user implementation. */
147147
ZVAL_STRING(&function_name, "next");
148-
function = zend_hash_find_ptr(&obj->ce->function_table, Z_STR(function_name));
148+
function = zend_hash_find_ptr(&random_class->std.ce->function_table, Z_STR(function_name));
149149
zval_ptr_dtor(&function_name);
150150

151-
zend_call_known_instance_method_with_0_params(function, obj, &retval);
151+
zend_call_known_instance_method_with_0_params(function, &random_class->std, &retval);
152152
ret = Z_LVAL(retval);
153153

154154
return (uint64_t) ret;
155155
}
156156
/* }}} */
157157

158158
/* {{{ */
159-
zend_long php_random_class_range(php_random_class *random_class, zend_object *obj, zend_long min, zend_long max)
159+
zend_long php_random_class_range(php_random_class *random_class, zend_long min, zend_long max)
160160
{
161161
zend_ulong umax = max - min;
162162

163163
#if ZEND_ULONG_MAX > UINT32_MAX
164164
if (umax > UINT32_MAX) {
165-
return (zend_long) (range64(random_class, obj, umax) + min);
165+
return (zend_long) (range64(random_class, umax) + min);
166166
}
167167
#endif
168168

169-
return (zend_long) (range32(random_class, obj, umax) + min);
169+
return (zend_long) (range32(random_class, umax) + min);
170170
}
171171
/* }}} */
172172

173173
/* {{{ */
174-
void php_random_class_array_data_shuffle(php_random_class *random_class, zend_object *obj, zval *array)
174+
void php_random_class_array_data_shuffle(php_random_class *random_class, zval *array)
175175
{
176176
uint32_t idx, j, n_elems;
177177
Bucket *p, temp;
@@ -200,7 +200,7 @@ void php_random_class_array_data_shuffle(php_random_class *random_class, zend_ob
200200
}
201201
}
202202
while (--n_left) {
203-
rnd_idx = php_random_class_range(random_class, obj, 0, n_left);
203+
rnd_idx = php_random_class_range(random_class, 0, n_left);
204204
if (rnd_idx != n_left) {
205205
temp = hash->arData[n_left];
206206
hash->arData[n_left] = hash->arData[rnd_idx];
@@ -225,7 +225,7 @@ void php_random_class_array_data_shuffle(php_random_class *random_class, zend_ob
225225
}
226226
}
227227
while (--n_left) {
228-
rnd_idx = php_random_class_range(random_class, obj, 0, n_left);
228+
rnd_idx = php_random_class_range(random_class, 0, n_left);
229229
if (rnd_idx != n_left) {
230230
temp = hash->arData[n_left];
231231
hash->arData[n_left] = hash->arData[rnd_idx];
@@ -253,7 +253,7 @@ void php_random_class_array_data_shuffle(php_random_class *random_class, zend_ob
253253
/* }}} */
254254

255255
/* {{{ */
256-
void php_random_class_string_shuffle(php_random_class *random_class, zend_object *obj, char *str, zend_long len)
256+
void php_random_class_string_shuffle(php_random_class *random_class, char *str, zend_long len)
257257
{
258258
zend_long n_elems, rnd_idx, n_left;
259259
char temp;
@@ -266,7 +266,7 @@ void php_random_class_string_shuffle(php_random_class *random_class, zend_object
266266
n_left = n_elems;
267267

268268
while (--n_left) {
269-
rnd_idx = php_random_class_range(random_class, obj, 0, n_left);
269+
rnd_idx = php_random_class_range(random_class, 0, n_left);
270270
if (rnd_idx != n_left) {
271271
temp = str[n_left];
272272
str[n_left] = str[rnd_idx];
@@ -633,7 +633,7 @@ PHP_METHOD(Random, nextInt)
633633

634634
ZEND_PARSE_PARAMETERS_NONE();
635635

636-
ret = php_random_class_next(random_class, Z_OBJ_P(ZEND_THIS));
636+
ret = php_random_class_next(random_class);
637637
if (random_class->algo) {
638638
if (random_class->algo->bytes > sizeof(zend_long)) {
639639
if (PG(random_class_ignore_generated_size_exceeded)) {
@@ -667,7 +667,7 @@ PHP_METHOD(Random, getInt)
667667
RETURN_THROWS();
668668
}
669669

670-
RETURN_LONG(php_random_class_range(random_class, Z_OBJ_P(ZEND_THIS), min, max));
670+
RETURN_LONG(php_random_class_range(random_class, min, max));
671671
}
672672
/* }}} */
673673

@@ -694,9 +694,9 @@ PHP_METHOD(Random, getBytes)
694694
ret = zend_string_alloc(size, 0);
695695

696696
while (generated_bytes <= size) {
697-
buf = php_random_class_next(random_class, Z_OBJ_P(ZEND_THIS));
697+
buf = php_random_class_next(random_class);
698698
if (random_class->algo && random_class->algo->bytes == sizeof(uint32_t)) {
699-
buf = (buf << 32) | php_random_class_next(random_class, Z_OBJ_P(ZEND_THIS));
699+
buf = (buf << 32) | php_random_class_next(random_class);
700700
}
701701
bytes = (uint8_t *) &buf;
702702
for (i = 0; i < (sizeof(uint64_t) / sizeof(uint8_t)); i ++) {
@@ -724,7 +724,7 @@ PHP_METHOD(Random, shuffleArray)
724724

725725
ZVAL_DUP(return_value, array);
726726

727-
php_random_class_array_data_shuffle(random_class, Z_OBJ_P(ZEND_THIS), return_value);
727+
php_random_class_array_data_shuffle(random_class, return_value);
728728
}
729729
/* }}} */
730730

@@ -740,7 +740,7 @@ PHP_METHOD(Random, shuffleString)
740740

741741
RETVAL_STRINGL(ZSTR_VAL(string), ZSTR_LEN(string));
742742
if (Z_STRLEN_P(return_value) > 1) {
743-
php_random_class_string_shuffle(random_class, Z_OBJ_P(ZEND_THIS), Z_STRVAL_P(return_value), (zend_long) Z_STRLEN_P(return_value));
743+
php_random_class_string_shuffle(random_class, Z_STRVAL_P(return_value), (zend_long) Z_STRLEN_P(return_value));
744744
}
745745
}
746746
/* }}} */

0 commit comments

Comments
 (0)