Skip to content

Commit ce27a10

Browse files
laruencelaruence
committed
Use new ZSTR_* macros
1 parent ac29067 commit ce27a10

File tree

5 files changed

+26
-27
lines changed

5 files changed

+26
-27
lines changed

‎msgpack.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,10 +279,10 @@ static ZEND_FUNCTION(msgpack_unserialize) /* {{{ */ {
279279
}
280280

281281
if (object == NULL) {
282-
php_msgpack_unserialize(return_value, str->val, str->len);
282+
php_msgpack_unserialize(return_value, ZSTR_VAL(str), ZSTR_LEN(str));
283283
} else {
284284
zval zv;
285-
php_msgpack_unserialize(&zv, str->val, str->len);
285+
php_msgpack_unserialize(&zv, ZSTR_VAL(str), ZSTR_LEN(str));
286286

287287
if (msgpack_convert_template(return_value, object, &zv) != SUCCESS) {
288288
RETVAL_NULL();

‎msgpack_class.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -253,10 +253,10 @@ static ZEND_METHOD(msgpack, unpack) /* {{{ */ {
253253
MSGPACK_G(php_only) = base->php_only;
254254

255255
if (object == NULL) {
256-
php_msgpack_unserialize(return_value, str->val, str->len);
256+
php_msgpack_unserialize(return_value, ZSTR_VAL(str), ZSTR_LEN(str));
257257
} else {
258258
zval zv;
259-
php_msgpack_unserialize(&zv, str->val, str->len);
259+
php_msgpack_unserialize(&zv, ZSTR_VAL(str), ZSTR_LEN(str));
260260

261261
if (msgpack_convert_template(return_value, object, &zv) != SUCCESS) {
262262
RETVAL_NULL();
@@ -352,7 +352,7 @@ static ZEND_METHOD(msgpack_unpacker, feed) /* {{{ */ {
352352
RETURN_FALSE;
353353
}
354354

355-
smart_str_appendl(&unpacker->buffer, str->val, str->len);
355+
smart_str_appendl(&unpacker->buffer, ZSTR_VAL(str), ZSTR_LEN(str));
356356

357357
RETURN_TRUE;
358358
}
@@ -371,16 +371,16 @@ static ZEND_METHOD(msgpack_unpacker, execute) /* {{{ */ {
371371
}
372372

373373
if (str) {
374-
data = str->val;
375-
len = str->len;
374+
data = ZSTR_VAL(str);
375+
len = ZSTR_LEN(str);
376376
if (offset != NULL && (Z_TYPE_P(offset) == IS_LONG || Z_TYPE_P(offset) == IS_DOUBLE)) {
377377
off = Z_LVAL_P(offset);
378378
} else {
379379
off = 0;
380380
}
381381
} else if (unpacker->buffer.s) {
382-
data = unpacker->buffer.s->val;
383-
len = unpacker->buffer.s->len;
382+
data = ZSTR_VAL(unpacker->buffer.s);
383+
len = ZSTR_LEN(unpacker->buffer.s);
384384
off = unpacker->offset;
385385
} else {
386386
data = NULL;
@@ -463,9 +463,9 @@ static ZEND_METHOD(msgpack_unpacker, reset) /* {{{ */ {
463463
smart_str buffer = {0};
464464
php_msgpack_unpacker_t *unpacker = Z_MSGPACK_UNPACKER_P(getThis());
465465

466-
if (unpacker->buffer.s && unpacker->buffer.s->len > unpacker->offset) {
467-
smart_str_appendl(&buffer, unpacker->buffer.s->val + unpacker->offset,
468-
unpacker->buffer.s->len - unpacker->offset);
466+
if (unpacker->buffer.s && ZSTR_LEN(unpacker->buffer.s) > unpacker->offset) {
467+
smart_str_appendl(&buffer, ZSTR_VAL(unpacker->buffer.s) + unpacker->offset,
468+
ZSTR_LEN(unpacker->buffer.s) - unpacker->offset);
469469
}
470470

471471
smart_str_free(&unpacker->buffer);
@@ -476,7 +476,7 @@ static ZEND_METHOD(msgpack_unpacker, reset) /* {{{ */ {
476476
unpacker->finished = 0;
477477

478478
if (buffer.s) {
479-
smart_str_appendl(&unpacker->buffer, buffer.s->val, buffer.s->len);
479+
smart_str_appendl(&unpacker->buffer, ZSTR_VAL(buffer.s), ZSTR_LEN(buffer.s));
480480
}
481481

482482
smart_str_free(&buffer);

‎msgpack_convert.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ static inline int msgpack_convert_string_to_properties(zval *object, zend_string
7777
int return_code;
7878

7979
ZVAL_STR(&pub_name, key);
80-
priv_name = zend_mangle_property_name(ce->name->val, ce->name->len, key->val, key->len, 1);
81-
prot_name = zend_mangle_property_name("*", 1, key->val, key->len, 1);
80+
priv_name = zend_mangle_property_name(ZSTR_VAL(ce->name), ZSTR_LEN(ce->name), ZSTR_VAL(key), ZSTR_LEN(key), 1);
81+
prot_name = zend_mangle_property_name("*", 1, ZSTR_VAL(key), ZSTR_LEN(key), 1);
8282

8383
if (zend_hash_find(propers, priv_name) != NULL) {
8484
zend_update_property_ex(ce, object, key, val);

‎msgpack_pack.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ static inline void msgpack_serialize_class(smart_str *buf, zval *val, zval *retv
133133
msgpack_serialize_string(buf, class_name, name_len);
134134

135135
ZEND_HASH_FOREACH_STR_KEY_VAL(ht, key_str, value) {
136-
if (incomplete_class && strcmp(key_str->val, MAGIC_MEMBER) == 0) {
136+
if (incomplete_class && strcmp(ZSTR_VAL(key_str), MAGIC_MEMBER) == 0) {
137137
continue;
138138
}
139139

@@ -158,11 +158,11 @@ static inline void msgpack_serialize_class(smart_str *buf, zval *val, zval *retv
158158
if (ce) {
159159
zend_string *priv_name, *prot_name;
160160
do {
161-
priv_name = zend_mangle_property_name(ce->name->val, ce->name->len,
161+
priv_name = zend_mangle_property_name(ZSTR_VAL(ce->name), ZSTR_LEN(ce->name),
162162
Z_STRVAL_P(value), Z_STRLEN_P(value),
163163
ce->type & ZEND_INTERNAL_CLASS);
164164
if ((data = zend_hash_find(Z_OBJPROP_P(val), priv_name)) != NULL) {
165-
msgpack_serialize_string(buf, priv_name->val, priv_name->len);
165+
msgpack_serialize_string(buf, ZSTR_VAL(priv_name), ZSTR_LEN(priv_name));
166166
pefree(priv_name, ce->type & ZEND_INTERNAL_CLASS);
167167
msgpack_serialize_zval(buf, data, var_hash);
168168
break;
@@ -175,7 +175,7 @@ static inline void msgpack_serialize_class(smart_str *buf, zval *val, zval *retv
175175
ce->type & ZEND_INTERNAL_CLASS);
176176

177177
if ((data = zend_hash_find(Z_OBJPROP_P(val), prot_name)) != NULL) {
178-
msgpack_serialize_string(buf, prot_name->val, prot_name->len);
178+
msgpack_serialize_string(buf, ZSTR_VAL(prot_name), ZSTR_LEN(prot_name));
179179
pefree(prot_name, ce->type & ZEND_INTERNAL_CLASS);
180180
msgpack_serialize_zval(buf, data, var_hash);
181181
break;
@@ -265,11 +265,11 @@ static inline void msgpack_serialize_array(smart_str *buf, zval *val, HashTable
265265
zval *value, *value_noref;
266266

267267
ZEND_HASH_FOREACH_KEY_VAL(ht, key_long, key_str, value) {
268-
if (key_str && incomplete_class && strcmp(key_str->val, MAGIC_MEMBER) == 0) {
268+
if (key_str && incomplete_class && strcmp(ZSTR_VAL(key_str), MAGIC_MEMBER) == 0) {
269269
continue;
270270
}
271271
if (key_str && hash) {
272-
msgpack_serialize_string(buf, key_str->val, key_str->len);
272+
msgpack_serialize_string(buf, ZSTR_VAL(key_str), ZSTR_LEN(key_str));
273273
} else if (hash) {
274274
msgpack_pack_long(buf, key_long);
275275
}
@@ -354,7 +354,7 @@ static inline void msgpack_serialize_object(smart_str *buf, zval *val, HashTable
354354
msgpack_pack_nil(buf);
355355
msgpack_pack_long(buf, MSGPACK_SERIALIZE_TYPE_CUSTOM_OBJECT);
356356

357-
msgpack_serialize_string(buf, ce->name->val, ce->name->len);
357+
msgpack_serialize_string(buf, ZSTR_VAL(ce->name), ZSTR_LEN(ce->name));
358358
msgpack_pack_raw(buf, serialized_length);
359359
msgpack_pack_raw_body(buf, serialized_data, serialized_length);
360360
} else {
@@ -480,7 +480,7 @@ void msgpack_serialize_zval(smart_str *buf, zval *val, HashTable *var_hash) /* {
480480
PHP_CLASS_ATTRIBUTES;
481481
PHP_SET_CLASS_ATTRIBUTES(val_noref);
482482

483-
msgpack_serialize_object(buf, val, var_hash, class_name->val, class_name->len, incomplete_class);
483+
msgpack_serialize_object(buf, val, var_hash, ZSTR_VAL(class_name), ZSTR_LEN(class_name), incomplete_class);
484484

485485
PHP_CLEANUP_CLASS_ATTRIBUTES();
486486
}

‎msgpack_unpack.c‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ static zend_class_entry* msgpack_unserialize_class(zval **container, zend_string
205205
zval_ptr_dtor(&user_func);
206206
if (func_call_status != SUCCESS) {
207207
MSGPACK_WARNING("[msgpack] (%s) defined (%s) but not found",
208-
__FUNCTION__, class_name->val);
208+
__FUNCTION__, ZSTR_VAL(class_name));
209209

210210
incomplete_class = 1;
211211
ce = PHP_IC_ENTRY;
@@ -215,7 +215,7 @@ static zend_class_entry* msgpack_unserialize_class(zval **container, zend_string
215215
if ((ce = zend_lookup_class(class_name)) == NULL) {
216216
MSGPACK_WARNING("[msgpack] (%s) Function %s() hasn't defined "
217217
"the class it was called for",
218-
__FUNCTION__, class_name->val);
218+
__FUNCTION__, ZSTR_VAL(class_name));
219219

220220
incomplete_class = 1;
221221
ce = PHP_IC_ENTRY;
@@ -234,7 +234,7 @@ static zend_class_entry* msgpack_unserialize_class(zval **container, zend_string
234234

235235
/* store incomplete class name */
236236
if (incomplete_class) {
237-
php_store_class_name(container_val, class_name->val, class_name->len);
237+
php_store_class_name(container_val, ZSTR_VAL(class_name), ZSTR_LEN(class_name));
238238
}
239239

240240
return ce;
@@ -421,7 +421,6 @@ int msgpack_unserialize_bin(msgpack_unserialize_data *unpack, const char* base,
421421
}
422422
/* }}} */
423423

424-
425424
int msgpack_unserialize_array(msgpack_unserialize_data *unpack, unsigned int count, zval **obj) /* {{{ */ {
426425
MSGPACK_UNSERIALIZE_ALLOC_VALUE(unpack);
427426

0 commit comments

Comments
 (0)