diff options
author | Damien George <damien.p.george@gmail.com> | 2014-05-25 22:27:57 +0100 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-05-25 22:27:57 +0100 |
commit | 2617eebf2ff77e58f415162300747eaf1a5ab5d7 (patch) | |
tree | 7065586f59aa181b70b4721363ff7c7677f8e772 /py/qstr.c | |
parent | f88fc7bd23c7bab257a01857c6f4683ce491f78c (diff) |
Change const byte* to const char* where sensible.
This removes need for some casts (at least, more than it adds need
for new casts!).
Diffstat (limited to 'py/qstr.c')
-rw-r--r-- | py/qstr.c | 12 |
1 files changed, 3 insertions, 9 deletions
@@ -130,7 +130,7 @@ STATIC qstr qstr_add(const byte *q_ptr) { return last_pool->total_prev_len + last_pool->len - 1; } -qstr qstr_find_strn(const byte *str, uint str_len) { +qstr qstr_find_strn(const char *str, uint str_len) { // work out hash of str machine_uint_t str_hash = qstr_compute_hash((const byte*)str, str_len); @@ -152,7 +152,7 @@ qstr qstr_from_str(const char *str) { } qstr qstr_from_strn(const char *str, uint len) { - qstr q = qstr_find_strn((const byte*)str, len); + qstr q = qstr_find_strn(str, len); if (q == 0) { machine_uint_t hash = qstr_compute_hash((const byte*)str, len); byte *q_ptr = m_new(byte, 4 + len + 1); @@ -167,12 +167,6 @@ qstr qstr_from_strn(const char *str, uint len) { return q; } -qstr qstr_from_strn_take(char *str, uint alloc_len, uint len) { - qstr q = qstr_from_strn(str, len); - m_del(char, str, alloc_len); - return q; -} - byte *qstr_build_start(uint len, byte **q_ptr) { assert(len <= 65535); *q_ptr = m_new(byte, 4 + len + 1); @@ -182,7 +176,7 @@ byte *qstr_build_start(uint len, byte **q_ptr) { } qstr qstr_build_end(byte *q_ptr) { - qstr q = qstr_find_strn(Q_GET_DATA(q_ptr), Q_GET_LENGTH(q_ptr)); + qstr q = qstr_find_strn((const char*)Q_GET_DATA(q_ptr), Q_GET_LENGTH(q_ptr)); if (q == 0) { machine_uint_t len = Q_GET_LENGTH(q_ptr); machine_uint_t hash = qstr_compute_hash(Q_GET_DATA(q_ptr), len); |