Skip to content

Added is_map function to check is array map or plain array #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bobrik wants to merge 4 commits into from
Closed

Added is_map function to check is array map or plain array #6

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
deccffa
Added is_map function to check is array map or plain array
bobrik Sep 25, 2012
d5ed5d8
Fixed comments to c-style
bobrik Sep 25, 2012
376470b
Renamed is_map function to msgpack_check_ht_is_map
bobrik Sep 25, 2012
9f75250
Removed unneeded check for array
bobrik Sep 25, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion msgpack_pack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,25 @@
# define Z_ISREF_P(pz) PZVAL_IS_REF(pz)
#endif

/* from php soap extension */
static int msgpack_check_ht_is_map(zval *array)
{
int i, count = zend_hash_num_elements(Z_ARRVAL_P(array));

zend_hash_internal_pointer_reset(Z_ARRVAL_P(array));
for (i = 0; i < count; i++) {
char *str_index;
ulong num_index;

if (zend_hash_get_current_key(Z_ARRVAL_P(array), &str_index, &num_index, 0) == HASH_KEY_IS_STRING ||
num_index != i) {
return 1;
}
zend_hash_move_forward(Z_ARRVAL_P(array));
}
return 0;
}

inline static int msgpack_var_add(
HashTable *var_hash, zval *var, void *var_old TSRMLS_DC)
{
Expand Down Expand Up @@ -296,7 +315,7 @@ inline static void msgpack_serialize_array(
msgpack_pack_nil(buf);
msgpack_pack_long(buf, MSGPACK_SERIALIZE_TYPE_REFERENCE);
}
else if (ht->nNumOfElements == ht->nNextFreeElement)
else if (!msgpack_check_ht_is_map(val))
{
hash = 0;
msgpack_pack_array(buf, n);
Expand Down