Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 80 insertions, 80 deletions

diff --git a/epan/dissectors/packet-xmpp-core.c b/epan/dissectors/packet-xmpp-core.c
index 4ca1b251..4e20574b 100644
--- a/epan/dissectors/packet-xmpp-core.c
+++ b/epan/dissectors/packet-xmpp-core.c
@@ -77,12 +77,12 @@ xmpp_iq(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *pac
     xmpp_attr_t *attr_id, *attr_type;
 
     xmpp_attr_info attrs_info[] = {
-        {"xmlns", &hf_xmpp_xmlns, FALSE, FALSE, NULL, NULL},
-        {"id", &hf_xmpp_id, TRUE, TRUE, NULL, NULL},
-        {"type", &hf_xmpp_type, TRUE, TRUE, NULL, NULL},
-        {"from", &hf_xmpp_from, FALSE, TRUE, NULL, NULL},
-        {"to", &hf_xmpp_to, FALSE, TRUE, NULL, NULL},
-        {"xml:lang", NULL, FALSE, FALSE, NULL, NULL}
+        {"xmlns", &hf_xmpp_xmlns, false, false, NULL, NULL},
+        {"id", &hf_xmpp_id, true, true, NULL, NULL},
+        {"type", &hf_xmpp_type, true, true, NULL, NULL},
+        {"from", &hf_xmpp_from, false, true, NULL, NULL},
+        {"to", &hf_xmpp_to, false, true, NULL, NULL},
+        {"xml:lang", NULL, false, false, NULL, NULL}
     };
 
     conversation_t     *conversation;
@@ -141,23 +141,23 @@ xmpp_iq(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *pac
      * in each packet related to specified jingle session and IBB sid in packet related to it*/
     if(xmpp_info && attr_id)
     {
-        gchar *jingle_sid, *ibb_sid, *gtalk_sid;
+        char *jingle_sid, *ibb_sid, *gtalk_sid;
 
-        jingle_sid = (gchar *)wmem_tree_lookup_string(xmpp_info->jingle_sessions, attr_id->value, WMEM_TREE_STRING_NOCASE);
+        jingle_sid = (char *)wmem_tree_lookup_string(xmpp_info->jingle_sessions, attr_id->value, WMEM_TREE_STRING_NOCASE);
 
         if (jingle_sid) {
             proto_item *it = proto_tree_add_string(tree, hf_xmpp_jingle_session, tvb, 0, 0, jingle_sid);
             proto_item_set_generated(it);
         }
 
-        ibb_sid = (gchar *)wmem_tree_lookup_string(xmpp_info->ibb_sessions, attr_id->value, WMEM_TREE_STRING_NOCASE);
+        ibb_sid = (char *)wmem_tree_lookup_string(xmpp_info->ibb_sessions, attr_id->value, WMEM_TREE_STRING_NOCASE);
 
         if (ibb_sid) {
             proto_item *it = proto_tree_add_string(tree, hf_xmpp_ibb, tvb, 0, 0, ibb_sid);
             proto_item_set_generated(it);
         }
 
-        gtalk_sid = (gchar *)wmem_tree_lookup_string(xmpp_info->gtalk_sessions, attr_id->value, WMEM_TREE_STRING_NOCASE);
+        gtalk_sid = (char *)wmem_tree_lookup_string(xmpp_info->gtalk_sessions, attr_id->value, WMEM_TREE_STRING_NOCASE);
 
         if (gtalk_sid) {
             proto_item *it = proto_tree_add_string(tree, hf_xmpp_gtalk, tvb, 0, 0, gtalk_sid);
@@ -200,12 +200,12 @@ xmpp_error(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *
     xmpp_element_t *text_element, *cond_element;
 
     xmpp_attr_info attrs_info[] = {
-        {"type", &hf_xmpp_error_type, TRUE, TRUE, NULL, NULL},
-        {"code", &hf_xmpp_error_code, FALSE, TRUE, NULL, NULL},
-        {"condition", &hf_xmpp_error_condition, TRUE, TRUE, NULL, NULL} /*TODO: validate list to the condition element*/
+        {"type", &hf_xmpp_error_type, true, true, NULL, NULL},
+        {"code", &hf_xmpp_error_code, false, true, NULL, NULL},
+        {"condition", &hf_xmpp_error_condition, true, true, NULL, NULL} /*TODO: validate list to the condition element*/
     };
 
-    gchar *error_info;
+    char *error_info;
 
     xmpp_attr_t *fake_condition = NULL;
 
@@ -218,7 +218,7 @@ xmpp_error(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *
     if(cond_element)
     {
         fake_condition = xmpp_ep_init_attr_t(pinfo->pool, cond_element->name, cond_element->offset, cond_element->length);
-        g_hash_table_insert(element->attrs, (gpointer)"condition", fake_condition);
+        g_hash_table_insert(element->attrs, (void *)"condition", fake_condition);
 
         error_info = wmem_strdup_printf(pinfo->pool, "%s: %s;", error_info, cond_element->name);
     }
@@ -251,21 +251,21 @@ xmpp_presence(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_
     proto_item *presence_item;
     proto_tree *presence_tree;
 
-    static const gchar *type_enums[] = {"error", "probe", "subscribe", "subscribed",
+    static const char *type_enums[] = {"error", "probe", "subscribe", "subscribed",
                                  "unavailable", "unsubscribe", "unsubscribed"};
     xmpp_array_t *type_array = xmpp_ep_init_array_t(pinfo->pool, type_enums, array_length(type_enums));
 
-    static const gchar *show_enums[] = {"away", "chat", "dnd", "xa"};
+    static const char *show_enums[] = {"away", "chat", "dnd", "xa"};
     xmpp_array_t *show_array = xmpp_ep_init_array_t(pinfo->pool, show_enums, array_length(show_enums));
 
     xmpp_attr_info attrs_info[] = {
-        {"from", &hf_xmpp_from, FALSE, FALSE, NULL, NULL},
-        {"id", &hf_xmpp_id, FALSE, TRUE, NULL, NULL},
-        {"to", &hf_xmpp_to, FALSE, FALSE, NULL, NULL},
-        {"type", &hf_xmpp_type, FALSE, TRUE, xmpp_val_enum_list, type_array},
-        {"xml:lang", NULL, FALSE, FALSE, NULL,NULL},
-        {"show", &hf_xmpp_presence_show, FALSE, TRUE, xmpp_val_enum_list, show_array},
-        {"priority", NULL, FALSE, FALSE, NULL, NULL}
+        {"from", &hf_xmpp_from, false, false, NULL, NULL},
+        {"id", &hf_xmpp_id, false, true, NULL, NULL},
+        {"to", &hf_xmpp_to, false, false, NULL, NULL},
+        {"type", &hf_xmpp_type, false, true, xmpp_val_enum_list, type_array},
+        {"xml:lang", NULL, false, false, NULL,NULL},
+        {"show", &hf_xmpp_presence_show, false, true, xmpp_val_enum_list, show_array},
+        {"priority", NULL, false, false, NULL, NULL}
     };
 
     xmpp_elem_info elems_info[] = {
@@ -291,13 +291,13 @@ xmpp_presence(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_
     if((show = xmpp_steal_element_by_name(packet, "show"))!=NULL)
     {
         xmpp_attr_t *fake_show = xmpp_ep_init_attr_t(pinfo->pool, show->data?show->data->value:"",show->offset, show->length);
-        g_hash_table_insert(packet->attrs, (gpointer)"show", fake_show);
+        g_hash_table_insert(packet->attrs, (void *)"show", fake_show);
     }
 
     if((priority = xmpp_steal_element_by_name(packet, "priority"))!=NULL)
     {
         xmpp_attr_t *fake_priority = xmpp_ep_init_attr_t(pinfo->pool, priority->data?priority->data->value:"",priority->offset, priority->length);
-        g_hash_table_insert(packet->attrs, (gpointer)"priority", fake_priority);
+        g_hash_table_insert(packet->attrs, (void *)"priority", fake_priority);
     }
     xmpp_display_attrs(presence_tree, packet, pinfo, tvb, attrs_info, array_length(attrs_info));
 
@@ -311,8 +311,8 @@ xmpp_presence_status(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_e
     proto_tree *status_tree;
 
     xmpp_attr_info attrs_info[] = {
-        {"xml:lang", NULL, FALSE, TRUE, NULL, NULL},
-        {"value", NULL, TRUE, TRUE, NULL, NULL}
+        {"xml:lang", NULL, false, true, NULL, NULL},
+        {"value", NULL, true, true, NULL, NULL}
     };
 
     xmpp_attr_t *fake_value;
@@ -326,7 +326,7 @@ xmpp_presence_status(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_e
         fake_value = xmpp_ep_init_attr_t(pinfo->pool, "(empty)", element->offset, element->length);
 
 
-    g_hash_table_insert(element->attrs, (gpointer)"value", fake_value);
+    g_hash_table_insert(element->attrs, (void *)"value", fake_value);
 
     xmpp_display_attrs(status_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
@@ -340,16 +340,16 @@ xmpp_message(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t
     proto_item *message_item;
     proto_tree *message_tree;
 
-    static const gchar  *type_enums[] = {"chat", "error", "groupchat", "headline", "normal"};
+    static const char   *type_enums[] = {"chat", "error", "groupchat", "headline", "normal"};
     xmpp_array_t *type_array = xmpp_ep_init_array_t(pinfo->pool, type_enums, array_length(type_enums));
 
     xmpp_attr_info attrs_info[] = {
-        {"from", &hf_xmpp_from, FALSE, FALSE, NULL, NULL},
-        {"id", &hf_xmpp_id, FALSE, TRUE, NULL, NULL},
-        {"to", &hf_xmpp_to, FALSE, FALSE, NULL, NULL},
-        {"type", &hf_xmpp_type, FALSE, TRUE, xmpp_val_enum_list, type_array},
-        {"xml:lang", NULL, FALSE, FALSE, NULL,NULL},
-        {"chatstate", &hf_xmpp_message_chatstate, FALSE, TRUE, NULL, NULL}
+        {"from", &hf_xmpp_from, false, false, NULL, NULL},
+        {"id", &hf_xmpp_id, false, true, NULL, NULL},
+        {"to", &hf_xmpp_to, false, false, NULL, NULL},
+        {"type", &hf_xmpp_type, false, true, xmpp_val_enum_list, type_array},
+        {"xml:lang", NULL, false, false, NULL,NULL},
+        {"chatstate", &hf_xmpp_message_chatstate, false, true, NULL, NULL}
     };
 
     xmpp_elem_info elems_info [] = {
@@ -384,7 +384,7 @@ xmpp_message(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t
     if((chatstate = xmpp_steal_element_by_attr(packet, "xmlns", "http://jabber.org/protocol/chatstates"))!=NULL)
     {
         xmpp_attr_t *fake_chatstate_attr = xmpp_ep_init_attr_t(pinfo->pool, chatstate->name, chatstate->offset, chatstate->length);
-        g_hash_table_insert(packet->attrs, (gpointer)"chatstate", fake_chatstate_attr);
+        g_hash_table_insert(packet->attrs, (void *)"chatstate", fake_chatstate_attr);
     }
 
     xmpp_display_attrs(message_tree, packet, pinfo, tvb, attrs_info, array_length(attrs_info));
@@ -394,9 +394,9 @@ xmpp_message(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t
     /*Displays data about IBB session*/
     if(xmpp_info && id)
     {
-        gchar *ibb_sid;
+        char *ibb_sid;
 
-        ibb_sid = (gchar *)wmem_tree_lookup_string(xmpp_info->ibb_sessions, id->value, WMEM_TREE_STRING_NOCASE);
+        ibb_sid = (char *)wmem_tree_lookup_string(xmpp_info->ibb_sessions, id->value, WMEM_TREE_STRING_NOCASE);
 
         if (ibb_sid) {
             proto_item *it = proto_tree_add_string(tree, hf_xmpp_ibb, tvb, 0, 0, ibb_sid);
@@ -413,8 +413,8 @@ xmpp_message_body(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_elem
     proto_tree *body_tree;
 
     xmpp_attr_info attrs_info[] = {
-        {"xml:lang", NULL, FALSE, TRUE, NULL, NULL},
-        {"value", NULL, TRUE, TRUE, NULL, NULL}
+        {"xml:lang", NULL, false, true, NULL, NULL},
+        {"value", NULL, true, true, NULL, NULL}
     };
 
     xmpp_attr_t *fake_data_attr;
@@ -423,7 +423,7 @@ xmpp_message_body(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_elem
     body_tree = proto_item_add_subtree(body_item, ett_xmpp_message_body);
 
     fake_data_attr = xmpp_ep_init_attr_t(pinfo->pool, element->data?element->data->value:"", element->offset, element->length);
-    g_hash_table_insert(element->attrs, (gpointer)"value", fake_data_attr);
+    g_hash_table_insert(element->attrs, (void *)"value", fake_data_attr);
 
 
     xmpp_display_attrs(body_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
@@ -437,8 +437,8 @@ xmpp_message_subject(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_e
     proto_tree *subject_tree;
 
     xmpp_attr_info attrs_info[] = {
-        {"xml:lang", NULL, FALSE, TRUE, NULL, NULL},
-        {"value", NULL, TRUE, FALSE, NULL, NULL}
+        {"xml:lang", NULL, false, true, NULL, NULL},
+        {"value", NULL, true, false, NULL, NULL}
     };
 
     xmpp_attr_t *fake_data_attr;
@@ -447,7 +447,7 @@ xmpp_message_subject(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_e
     subject_tree = proto_item_add_subtree(subject_item, ett_xmpp_message_subject);
 
     fake_data_attr = xmpp_ep_init_attr_t(pinfo->pool, element->data?element->data->value:"", element->offset, element->length);
-    g_hash_table_insert(element->attrs, (gpointer)"value", fake_data_attr);
+    g_hash_table_insert(element->attrs, (void *)"value", fake_data_attr);
 
 
     xmpp_display_attrs(subject_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
@@ -462,8 +462,8 @@ xmpp_message_thread(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_el
     proto_tree *thread_tree;
 
     xmpp_attr_info attrs_info[] = {
-        {"parent", &hf_xmpp_message_thread_parent, FALSE, TRUE, NULL, NULL},
-        {"value", NULL, TRUE, TRUE, NULL, NULL}
+        {"parent", &hf_xmpp_message_thread_parent, false, true, NULL, NULL},
+        {"value", NULL, true, true, NULL, NULL}
     };
 
     xmpp_attr_t *fake_value;
@@ -472,7 +472,7 @@ xmpp_message_thread(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_el
     thread_tree = proto_item_add_subtree(thread_item, ett_xmpp_message_thread);
 
     fake_value = xmpp_ep_init_attr_t(pinfo->pool, element->data?element->data->value:"", element->offset, element->length);
-    g_hash_table_insert(element->attrs, (gpointer)"value", fake_value);
+    g_hash_table_insert(element->attrs, (void *)"value", fake_value);
 
 
     xmpp_display_attrs(thread_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
@@ -487,10 +487,10 @@ xmpp_auth(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *p
     proto_tree *auth_tree;
 
     xmpp_attr_info_ext attrs_info[]={
-        {"urn:ietf:params:xml:ns:xmpp-sasl", {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}},
-        {"urn:ietf:params:xml:ns:xmpp-sasl", {"mechanism", NULL, TRUE, TRUE, NULL, NULL}},
-        {"http://www.google.com/talk/protocol/auth", {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}},
-        {"http://www.google.com/talk/protocol/auth", {"client-uses-full-bind-result", NULL, TRUE, TRUE, NULL, NULL}},
+        {"urn:ietf:params:xml:ns:xmpp-sasl", {"xmlns", &hf_xmpp_xmlns, true, true, NULL, NULL}},
+        {"urn:ietf:params:xml:ns:xmpp-sasl", {"mechanism", NULL, true, true, NULL, NULL}},
+        {"http://www.google.com/talk/protocol/auth", {"xmlns", &hf_xmpp_xmlns, true, true, NULL, NULL}},
+        {"http://www.google.com/talk/protocol/auth", {"client-uses-full-bind-result", NULL, true, true, NULL, NULL}},
     };
 
     col_set_str(pinfo->cinfo, COL_INFO, "AUTH");
@@ -507,13 +507,13 @@ xmpp_auth(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *p
 
 void
 xmpp_challenge_response_success(proto_tree *tree, tvbuff_t *tvb,
-    packet_info *pinfo, xmpp_element_t *packet, expert_field* ei, gint ett,  const char *col_info)
+    packet_info *pinfo, xmpp_element_t *packet, expert_field* ei, int ett,  const char *col_info)
 {
     proto_item *item;
     proto_tree *subtree;
 
     xmpp_attr_info attrs_info[] = {
-        {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}
+        {"xmlns", &hf_xmpp_xmlns, true, true, NULL, NULL}
     };
 
     col_set_str(pinfo->cinfo, COL_INFO, col_info);
@@ -534,11 +534,11 @@ xmpp_failure(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t
     proto_tree *fail_tree;
 
     xmpp_attr_info attrs_info[] = {
-        {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL},
-        {"condition", NULL, FALSE, TRUE, NULL, NULL}
+        {"xmlns", &hf_xmpp_xmlns, true, true, NULL, NULL},
+        {"condition", NULL, false, true, NULL, NULL}
     };
 
-    static const gchar *fail_names[] = {"aborted","account-disabled", "credentials-expired",
+    static const char *fail_names[] = {"aborted","account-disabled", "credentials-expired",
         "encryption-required", "incorrect-encoding", "invalid-authzid", "invalid-mechanism",
         "malformed-request", "mechanism-too-weak", "not-authorized", "temporary-auth-failure",
         "transition-needed"
@@ -546,7 +546,7 @@ xmpp_failure(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t
 
     xmpp_element_t *fail_condition, *text;
 
-    col_add_fstr(pinfo->cinfo, COL_INFO, "FAILURE ");
+    col_set_str(pinfo->cinfo, COL_INFO, "FAILURE ");
 
     fail_item = proto_tree_add_item(tree, hf_xmpp_failure, tvb, packet->offset, packet->length, ENC_BIG_ENDIAN);
     fail_tree = proto_item_add_subtree(fail_item, ett_xmpp_failure);
@@ -554,7 +554,7 @@ xmpp_failure(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t
     if((fail_condition = xmpp_steal_element_by_names(packet, fail_names, array_length(fail_names)))!=NULL)
     {
         xmpp_attr_t *fake_cond = xmpp_ep_init_attr_t(pinfo->pool, fail_condition->name, fail_condition->offset, fail_condition->length);
-        g_hash_table_insert(packet->attrs, (gpointer)"condition", fake_cond);
+        g_hash_table_insert(packet->attrs, (void *)"condition", fake_cond);
     }
 
     if((text = xmpp_steal_element_by_name(packet, "text"))!=NULL)
@@ -581,7 +581,7 @@ xmpp_failure_text(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_elem
 void
 xmpp_xml_header(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, xmpp_element_t *packet)
 {
-    col_add_fstr(pinfo->cinfo, COL_INFO, "XML ");
+    col_set_str(pinfo->cinfo, COL_INFO, "XML ");
     proto_tree_add_string(tree, hf_xmpp_xml_header_version, tvb, packet->offset, packet->length, "1.0");
 }
 
@@ -592,17 +592,17 @@ xmpp_stream(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t
     proto_tree *stream_tree;
 
     xmpp_attr_info_ext attrs_info [] = {
-        {"http://etherx.jabber.org/streams",{"xmlns", &hf_xmpp_xmlns, FALSE, TRUE, NULL, NULL}},
-        {"http://etherx.jabber.org/streams",{"version", NULL, FALSE, TRUE, NULL, NULL}},
-        {"http://etherx.jabber.org/streams",{"from", NULL, FALSE, TRUE, NULL, NULL}},
-        {"http://etherx.jabber.org/streams",{"to", NULL, FALSE, TRUE, NULL, NULL}},
-        {"http://etherx.jabber.org/streams",{"id", NULL, FALSE, TRUE, NULL, NULL}},
-        {"http://etherx.jabber.org/streams",{"xml:lang", NULL, FALSE, TRUE, NULL, NULL}},
-        {"jabber:client",{"xmlns", &hf_xmpp_xmlns, FALSE, TRUE, NULL, NULL}},
+        {"http://etherx.jabber.org/streams",{"xmlns", &hf_xmpp_xmlns, false, true, NULL, NULL}},
+        {"http://etherx.jabber.org/streams",{"version", NULL, false, true, NULL, NULL}},
+        {"http://etherx.jabber.org/streams",{"from", NULL, false, true, NULL, NULL}},
+        {"http://etherx.jabber.org/streams",{"to", NULL, false, true, NULL, NULL}},
+        {"http://etherx.jabber.org/streams",{"id", NULL, false, true, NULL, NULL}},
+        {"http://etherx.jabber.org/streams",{"xml:lang", NULL, false, true, NULL, NULL}},
+        {"jabber:client",{"xmlns", &hf_xmpp_xmlns, false, true, NULL, NULL}},
 
     };
 
-    col_add_fstr(pinfo->cinfo, COL_INFO, "STREAM ");
+    col_set_str(pinfo->cinfo, COL_INFO, "STREAM ");
 
     stream_item = proto_tree_add_item(tree, hf_xmpp_stream, tvb, packet->offset, packet->length, ENC_BIG_ENDIAN);
     stream_tree = proto_item_add_subtree(stream_item, ett_xmpp_stream);
@@ -611,8 +611,8 @@ xmpp_stream(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t
     xmpp_display_elems(stream_tree, packet, pinfo, tvb, NULL, 0);
 }
 
-/*returns TRUE if stream end occurs*/
-gboolean
+/*returns true if stream end occurs*/
+bool
 xmpp_stream_close(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo)
 {
     tvbparse_t        *tt;
@@ -623,11 +623,11 @@ xmpp_stream_close(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo)
     if((elem = tvbparse_get(tt,want_stream_end_tag))!=NULL)
     {
         proto_tree_add_item(tree, hf_xmpp_stream_end, tvb, elem->offset, elem->len, ENC_NA);
-        col_add_fstr(pinfo->cinfo, COL_INFO, "STREAM END");
+        col_set_str(pinfo->cinfo, COL_INFO, "STREAM END");
 
-        return TRUE;
+        return true;
     }
-    return FALSE;
+    return false;
 }
 
 void
@@ -644,7 +644,7 @@ xmpp_features(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_
         ENC_BIG_ENDIAN);
     features_tree = proto_item_add_subtree(features_item, ett_xmpp_features);
 
-    col_add_fstr(pinfo->cinfo, COL_INFO, "FEATURES ");
+    col_set_str(pinfo->cinfo, COL_INFO, "FEATURES ");
 
     xmpp_display_attrs(features_tree, packet, pinfo, tvb, NULL, 0);
     xmpp_display_elems(features_tree, packet, pinfo, tvb, elems_info, array_length(elems_info));
@@ -656,7 +656,7 @@ xmpp_features_mechanisms(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xm
     proto_tree *mechanisms_tree;
 
     xmpp_attr_info attrs_info [] = {
-        {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}
+        {"xmlns", &hf_xmpp_xmlns, true, true, NULL, NULL}
     };
 
     xmpp_elem_info elems_info [] = {
@@ -677,10 +677,10 @@ xmpp_starttls(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo,
     proto_tree *tls_tree;
 
     xmpp_attr_info attrs_info [] = {
-        {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL},
+        {"xmlns", &hf_xmpp_xmlns, true, true, NULL, NULL},
     };
 
-    col_add_fstr(pinfo->cinfo, COL_INFO, "STARTTLS ");
+    col_set_str(pinfo->cinfo, COL_INFO, "STARTTLS ");
 
     tls_item = proto_tree_add_item(tree, hf_xmpp_starttls, tvb, packet->offset, packet->length, ENC_BIG_ENDIAN);
     tls_tree = proto_item_add_subtree(tls_item, ett_xmpp_starttls);
@@ -702,13 +702,13 @@ xmpp_proceed(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo,
 {
     proto_item *proceed_item;
     proto_tree *proceed_tree;
-    guint32 ssl_proceed;
+    uint32_t ssl_proceed;
 
     xmpp_attr_info attrs_info [] = {
-        {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL},
+        {"xmlns", &hf_xmpp_xmlns, true, true, NULL, NULL},
     };
 
-    col_add_fstr(pinfo->cinfo, COL_INFO, "PROCEED ");
+    col_set_str(pinfo->cinfo, COL_INFO, "PROCEED ");
 
     proceed_item = proto_tree_add_item(tree, hf_xmpp_proceed, tvb, packet->offset, packet->length, ENC_BIG_ENDIAN);
     proceed_tree = proto_item_add_subtree(proceed_item, ett_xmpp_proceed);