osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Move defines for helping with UTF-16 surrogate pairs to wsutil/unicode-utils.h 

tvbuff version was moved, but with 'or' optimization from packet-json.

svn path=/trunk/; revision=54632
This commit is contained in:
Jakub Zawadzki 2014-01-07 21:55:49 +00:00
parent adb28bd812
commit d1dcee936b
3 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
epan/dissectors/packet-json.c
View File

@ -37,6 +37,8 @@
#include <epan/packet.h>
#include <epan/tvbparse.h>
#include <wsutil/unicode-utils.h>
void proto_register_json(void);
void proto_reg_handoff_json(void);
@ -247,20 +249,6 @@ static void after_array(void *tvbparse_data, const void *wanted_data _U_, tvbpar
wmem_stack_pop(data->stack);
}
/*
* defines for helping with UTF-16 surrogate pairs
*/
#define LEAD_SURROGATE_START 0xd800
#define LEAD_SURROGATE_END 0xdbff
#define TRAIL_SURROGATE_START 0xdc00
#define TRAIL_SURROGATE_END 0xdfff
#define IS_LEAD_SURROGATE(l) (((l)>=LEAD_SURROGATE_START)&&((l)<=LEAD_SURROGATE_END))
#define IS_TRAIL_SURROGATE(t) (((t)>=TRAIL_SURROGATE_START)&&((t)<=TRAIL_SURROGATE_END))
#define GET_UNICHAR_FROM_SURROGATES(l,t) (0x10000+(((l-LEAD_SURROGATE_START)<<10)|(t-TRAIL_SURROGATE_START)))
static char *json_string_unescape(tvbparse_elem_t *tok)
{
char *str = (char *)wmem_alloc(wmem_packet_scope(), tok->len - 1);
@ -350,7 +338,7 @@ static char *json_string_unescape(tvbparse_elem_t *tok)
}
if ((IS_TRAIL_SURROGATE(trail_surrogate))) {
unicode_hex = GET_UNICHAR_FROM_SURROGATES(lead_surrogate,trail_surrogate);
unicode_hex = SURROGATE_VALUE(lead_surrogate,trail_surrogate);
} else {
valid = FALSE;
}

8
epan/tvbuff.c
View File

@ -41,6 +41,7 @@
#include "wsutil/pint.h"
#include "wsutil/sign_ext.h"
#include "wsutil/unicode-utils.h"
#include "tvbuff.h"
#include "tvbuff-int.h"
#include "strutil.h"
@ -2002,13 +2003,6 @@ tvb_get_ucs_2_string(wmem_allocator_t *scope, tvbuff_t *tvb, const gint offset,
* REPLACEMENT CHARACTER at the end.
*/
#define IS_LEAD_SURROGATE(uchar2) \
((uchar2) >= 0xd800 && (uchar2) < 0xdc00)
#define IS_TRAIL_SURROGATE(uchar2) \
((uchar2) >= 0xdc00 && (uchar2) < 0xe000)
#define SURROGATE_VALUE(lead, trail) \
(((((lead) - 0xd800) << 10) + ((trail) - 0xdc00)) + 0x100000)
static wmem_strbuf_t *
tvb_extract_utf_16_string(wmem_allocator_t *scope, tvbuff_t *tvb, const gint offset, gint size, const guint encoding)
{

11
wsutil/unicode-utils.h
View File

@ -84,4 +84,15 @@ void arg_list_utf_16to8(int argc, char *argv[]);
#endif /* _WIN32 */
/*
* defines for helping with UTF-16 surrogate pairs
*/
#define IS_LEAD_SURROGATE(uchar2) \
((uchar2) >= 0xd800 && (uchar2) < 0xdc00)
#define IS_TRAIL_SURROGATE(uchar2) \
((uchar2) >= 0xdc00 && (uchar2) < 0xe000)
#define SURROGATE_VALUE(lead, trail) \
(((((lead) - 0xd800) << 10) | ((trail) - 0xdc00)) + 0x100000)
#endif /* __UNICODEUTIL_H__ */