Skip to content

Commit ab5116e

Browse files
laruencelaruence
committed
Fixing tests (only 7 left)
1 parent fc1bb6e commit ab5116e

File tree

3 files changed

+196
-152
lines changed

3 files changed

+196
-152
lines changed

‎msgpack.c‎

Lines changed: 101 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -52,79 +52,79 @@ PS_SERIALIZER_FUNCS(msgpack);
5252
#endif
5353

5454
static zend_function_entry msgpack_functions[] = {
55-
ZEND_FE(msgpack_serialize, arginfo_msgpack_serialize)
56-
ZEND_FE(msgpack_unserialize, arginfo_msgpack_unserialize)
57-
ZEND_FALIAS(msgpack_pack, msgpack_serialize, arginfo_msgpack_serialize)
58-
ZEND_FALIAS(msgpack_unpack, msgpack_unserialize, arginfo_msgpack_unserialize)
59-
{NULL, NULL, NULL}
55+
ZEND_FE(msgpack_serialize, arginfo_msgpack_serialize)
56+
ZEND_FE(msgpack_unserialize, arginfo_msgpack_unserialize)
57+
ZEND_FALIAS(msgpack_pack, msgpack_serialize, arginfo_msgpack_serialize)
58+
ZEND_FALIAS(msgpack_unpack, msgpack_unserialize, arginfo_msgpack_unserialize)
59+
{NULL, NULL, NULL}
6060
};
6161

6262
static void msgpack_init_globals(zend_msgpack_globals *msgpack_globals) /* {{{ */
6363
{
64-
if (PG(display_errors)) {
65-
msgpack_globals->error_display = 1;
66-
} else {
67-
msgpack_globals->error_display = 0;
68-
}
64+
if (PG(display_errors)) {
65+
msgpack_globals->error_display = 1;
66+
} else {
67+
msgpack_globals->error_display = 0;
68+
}
6969

70-
msgpack_globals->php_only = 1;
70+
msgpack_globals->php_only = 1;
7171

72-
msgpack_globals->illegal_key_insert = 0;
73-
msgpack_globals->serialize.var_hash = NULL;
74-
msgpack_globals->serialize.level = 0;
72+
msgpack_globals->illegal_key_insert = 0;
73+
msgpack_globals->serialize.var_hash = NULL;
74+
msgpack_globals->serialize.level = 0;
7575
}
7676
/* }}} */
7777

7878
static ZEND_MINIT_FUNCTION(msgpack) /* {{{ */ {
79-
ZEND_INIT_MODULE_GLOBALS(msgpack, msgpack_init_globals, NULL);
79+
ZEND_INIT_MODULE_GLOBALS(msgpack, msgpack_init_globals, NULL);
8080

81-
REGISTER_INI_ENTRIES();
81+
REGISTER_INI_ENTRIES();
8282

8383
#if HAVE_PHP_SESSION
84-
php_session_register_serializer("msgpack", PS_SERIALIZER_ENCODE_NAME(msgpack), PS_SERIALIZER_DECODE_NAME(msgpack));
84+
php_session_register_serializer("msgpack", PS_SERIALIZER_ENCODE_NAME(msgpack), PS_SERIALIZER_DECODE_NAME(msgpack));
8585
#endif
8686

87-
msgpack_init_class();
87+
msgpack_init_class();
8888

89-
REGISTER_LONG_CONSTANT("MESSAGEPACK_OPT_PHPONLY",
90-
MSGPACK_CLASS_OPT_PHPONLY, CONST_CS | CONST_PERSISTENT);
89+
REGISTER_LONG_CONSTANT("MESSAGEPACK_OPT_PHPONLY",
90+
MSGPACK_CLASS_OPT_PHPONLY, CONST_CS | CONST_PERSISTENT);
9191

92-
return SUCCESS;
92+
return SUCCESS;
9393
}
9494
/* }}} */
9595

9696
static ZEND_MSHUTDOWN_FUNCTION(msgpack) /* {{{ */ {
97-
UNREGISTER_INI_ENTRIES();
97+
UNREGISTER_INI_ENTRIES();
9898

99-
return SUCCESS;
99+
return SUCCESS;
100100
}
101101
/* }}} */
102102

103103
static ZEND_MINFO_FUNCTION(msgpack) /* {{{ */ {
104-
php_info_print_table_start();
105-
php_info_print_table_row(2, "MessagePack Support", "enabled");
104+
php_info_print_table_start();
105+
php_info_print_table_row(2, "MessagePack Support", "enabled");
106106
#if HAVE_PHP_SESSION
107-
php_info_print_table_row(2, "Session Support", "enabled" );
107+
php_info_print_table_row(2, "Session Support", "enabled" );
108108
#endif
109-
php_info_print_table_row(2, "extension Version", PHP_MSGPACK_VERSION);
110-
php_info_print_table_row(2, "header Version", MSGPACK_VERSION);
111-
php_info_print_table_end();
109+
php_info_print_table_row(2, "extension Version", PHP_MSGPACK_VERSION);
110+
php_info_print_table_row(2, "header Version", MSGPACK_VERSION);
111+
php_info_print_table_end();
112112

113-
DISPLAY_INI_ENTRIES();
113+
DISPLAY_INI_ENTRIES();
114114
}
115115
/* }}} */
116116

117117
zend_module_entry msgpack_module_entry = {
118-
STANDARD_MODULE_HEADER,
119-
"msgpack",
120-
msgpack_functions,
121-
ZEND_MINIT(msgpack),
122-
ZEND_MSHUTDOWN(msgpack),
123-
NULL,
124-
NULL,
125-
ZEND_MINFO(msgpack),
126-
PHP_MSGPACK_VERSION,
127-
STANDARD_MODULE_PROPERTIES
118+
STANDARD_MODULE_HEADER,
119+
"msgpack",
120+
msgpack_functions,
121+
ZEND_MINIT(msgpack),
122+
ZEND_MSHUTDOWN(msgpack),
123+
NULL,
124+
NULL,
125+
ZEND_MINFO(msgpack),
126+
PHP_MSGPACK_VERSION,
127+
STANDARD_MODULE_PROPERTIES
128128
};
129129

130130
#ifdef COMPILE_DL_MSGPACK
@@ -187,77 +187,73 @@ PS_SERIALIZER_DECODE_FUNC(msgpack) /* {{{ */ {
187187

188188
PHP_MSGPACK_API void php_msgpack_serialize(smart_str *buf, zval *val) /* {{{ */ {
189189

190-
msgpack_serialize_data_t var_hash;
190+
msgpack_serialize_data_t var_hash;
191191

192-
msgpack_serialize_var_init(&var_hash);
193-
msgpack_serialize_zval(buf, val, var_hash);
194-
msgpack_serialize_var_destroy(&var_hash);
192+
msgpack_serialize_var_init(&var_hash);
193+
msgpack_serialize_zval(buf, val, var_hash);
194+
msgpack_serialize_var_destroy(&var_hash);
195195
}
196196
/* }}} */
197197

198198
PHP_MSGPACK_API void php_msgpack_unserialize(zval *return_value, char *str, size_t str_len) /* {{{ */ {
199-
int ret;
200-
size_t off = 0;
201-
msgpack_unpack_t mp;
202-
msgpack_unserialize_data_t var_hash;
199+
int ret;
200+
size_t off = 0;
201+
msgpack_unpack_t mp;
202+
msgpack_unserialize_data_t var_hash;
203203

204-
if (str_len <= 0) {
205-
RETURN_NULL();
206-
}
204+
if (str_len <= 0) {
205+
RETURN_NULL();
206+
}
207207

208-
template_init(&mp);
208+
template_init(&mp);
209209

210-
msgpack_unserialize_var_init(&var_hash);
210+
msgpack_unserialize_var_init(&var_hash);
211211

212-
RETVAL_NULL();
213-
mp.user.retval = return_value;
214-
mp.user.var_hash = &var_hash;
212+
mp.user.retval = return_value;
213+
mp.user.var_hash = &var_hash;
215214

216-
ret = template_execute(&mp, str, (size_t)str_len, &off);
217-
218-
switch (ret) {
219-
case MSGPACK_UNPACK_PARSE_ERROR:
220-
zval_dtor(return_value);
221-
ZVAL_FALSE(return_value);
222-
msgpack_unserialize_var_destroy(&var_hash, 1);
223-
MSGPACK_WARNING("[msgpack] (%s) Parse error", __FUNCTION__);
224-
break;
225-
case MSGPACK_UNPACK_CONTINUE:
226-
msgpack_unserialize_var_destroy(&var_hash, 1);
227-
MSGPACK_WARNING(
228-
"[msgpack] (%s) Insufficient data for unserializing",
229-
__FUNCTION__);
230-
break;
215+
ret = template_execute(&mp, str, (size_t)str_len, &off);
216+
217+
switch (ret) {
218+
case MSGPACK_UNPACK_PARSE_ERROR:
219+
zval_dtor(return_value);
220+
msgpack_unserialize_var_destroy(&var_hash, 1);
221+
MSGPACK_WARNING("[msgpack] (%s) Parse error", __FUNCTION__);
222+
RETURN_FALSE;
223+
case MSGPACK_UNPACK_CONTINUE:
224+
zval_dtor(return_value);
225+
msgpack_unserialize_var_destroy(&var_hash, 1);
226+
MSGPACK_WARNING("[msgpack] (%s) Insufficient data for unserializing", __FUNCTION__);
227+
RETURN_FALSE;
231228
case MSGPACK_UNPACK_EXTRA_BYTES:
232-
case MSGPACK_UNPACK_SUCCESS:
233-
msgpack_unserialize_var_destroy(&var_hash, 0);
234-
if (off < str_len) {
235-
MSGPACK_WARNING("[msgpack] (%s) Extra bytes", __FUNCTION__);
236-
}
237-
break;
229+
case MSGPACK_UNPACK_SUCCESS:
230+
msgpack_unserialize_var_destroy(&var_hash, 0);
231+
if (off < str_len) {
232+
MSGPACK_WARNING("[msgpack] (%s) Extra bytes", __FUNCTION__);
233+
}
234+
break;
238235
default:
239-
zval_dtor(return_value);
240-
ZVAL_FALSE(return_value);
241-
msgpack_unserialize_var_destroy(&var_hash, 0);
242-
MSGPACK_WARNING("[msgpack] (%s) Unknown result", __FUNCTION__);
243-
break;
236+
zval_dtor(return_value);
237+
msgpack_unserialize_var_destroy(&var_hash, 1);
238+
MSGPACK_WARNING("[msgpack] (%s) Unknown result", __FUNCTION__);
239+
RETURN_FALSE;
244240
}
245241
}
246242
/* }}} */
247243

248244
static ZEND_FUNCTION(msgpack_serialize) /* {{{ */ {
249-
zval *parameter;
250-
smart_str buf = {0};
245+
zval *parameter;
246+
smart_str buf = {0};
251247

252-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &parameter) == FAILURE) {
253-
return;
254-
}
248+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &parameter) == FAILURE) {
249+
return;
250+
}
255251

256-
php_msgpack_serialize(&buf, parameter);
252+
php_msgpack_serialize(&buf, parameter);
257253

258254
if (buf.s) {
259255
smart_str_0(&buf);
260-
ZVAL_STR(return_value, buf.s);
256+
ZVAL_STR(return_value, buf.s);
261257
} else {
262258
RETURN_EMPTY_STRING();
263259
}
@@ -266,28 +262,28 @@ static ZEND_FUNCTION(msgpack_serialize) /* {{{ */ {
266262
/* }}} */
267263

268264
static ZEND_FUNCTION(msgpack_unserialize) /* {{{ */ {
269-
zend_string *str;
270-
zval *object = NULL;
265+
zend_string *str;
266+
zval *object = NULL;
271267

272-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|z", &str, &object) == FAILURE) {
273-
return;
274-
}
268+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|z", &str, &object) == FAILURE) {
269+
return;
270+
}
275271

276-
if (!str) {
277-
RETURN_NULL();
278-
}
272+
if (!str) {
273+
RETURN_NULL();
274+
}
279275

280-
if (object == NULL) {
281-
php_msgpack_unserialize(return_value, str->val, str->len);
282-
} else {
276+
if (object == NULL) {
277+
php_msgpack_unserialize(return_value, str->val, str->len);
278+
} else {
283279
zval zv;
284-
php_msgpack_unserialize(&zv, str->val, str->len);
280+
php_msgpack_unserialize(&zv, str->val, str->len);
285281

286-
if (msgpack_convert_template(return_value, object, &zv) != SUCCESS) {
287-
RETVAL_NULL();
288-
}
282+
if (msgpack_convert_template(return_value, object, &zv) != SUCCESS) {
283+
RETVAL_NULL();
284+
}
289285
zval_ptr_dtor(&zv);
290-
}
286+
}
291287
}
292288
/* }}} */
293289

‎msgpack_class.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,8 @@ static ZEND_METHOD(msgpack_unpacker, __construct) /* {{{ */ {
310310
static ZEND_METHOD(msgpack_unpacker, __destruct) /* {{{ */ {
311311
php_msgpack_unpacker_t *unpacker = Z_MSGPACK_UNPACKER_P(getThis());
312312
smart_str_free(&unpacker->buffer);
313-
msgpack_unserialize_var_destroy(&unpacker->var_hash, unpacker->error);
314313
zval_ptr_dtor(&unpacker->retval);
314+
msgpack_unserialize_var_destroy(&unpacker->var_hash, unpacker->error);
315315
}
316316
/* }}} */
317317

0 commit comments

Comments
 (0)