diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
| commit | 9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9 (patch) | |
| tree | 2784370cda9bbf2da9114d70f05399c0b229d28c /epan/dissectors/packet-xml.h | |
| parent | Adding debian version 4.2.6-1. (diff) | |
| download | wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.tar.xz wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/packet-xml.h')
| -rw-r--r-- | epan/dissectors/packet-xml.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/epan/dissectors/packet-xml.h b/epan/dissectors/packet-xml.h index e56355f2..2e9a9c65 100644 --- a/epan/dissectors/packet-xml.h +++ b/epan/dissectors/packet-xml.h @@ -14,10 +14,10 @@ typedef struct _xml_ns_t { /* the name of this namespace */ - gchar* name; + char* name; /* its fully qualified name */ - const gchar* fqn; + const char* fqn; /* the contents of the whole element from <> to </> */ int hf_tag; @@ -26,7 +26,7 @@ typedef struct _xml_ns_t { int hf_cdata; /* the subtree for its sub items */ - gint ett; + int ett; wmem_map_t* attributes; /* key: the attribute name @@ -56,8 +56,8 @@ typedef struct _xml_frame_t { struct _xml_frame_t* last_child; struct _xml_frame_t* prev_sibling; struct _xml_frame_t* next_sibling; - const gchar *name; - const gchar *name_orig_case; + const char *name; + const char *name_orig_case; tvbuff_t *value; proto_tree* tree; proto_item* item; @@ -66,12 +66,13 @@ typedef struct _xml_frame_t { int start_offset; int length; packet_info* pinfo; + wmem_map_t *decryption_keys; } xml_frame_t; WS_DLL_PUBLIC -xml_frame_t *xml_get_tag(xml_frame_t *frame, const gchar *name); +xml_frame_t *xml_get_tag(xml_frame_t *frame, const char *name); WS_DLL_PUBLIC -xml_frame_t *xml_get_attrib(xml_frame_t *frame, const gchar *name); +xml_frame_t *xml_get_attrib(xml_frame_t *frame, const char *name); WS_DLL_PUBLIC xml_frame_t *xml_get_cdata(xml_frame_t *frame); |