diff options
| -rw-r--r-- | epan/dissectors/packet-xmpp-utils.c | 6 | ||||
| -rw-r--r-- | epan/strutil.c | 4 | ||||
| -rw-r--r-- | epan/strutil.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-xmpp-utils.c b/epan/dissectors/packet-xmpp-utils.c index 9abd8bb381..c0b4d25f07 100644 --- a/epan/dissectors/packet-xmpp-utils.c +++ b/epan/dissectors/packet-xmpp-utils.c @@ -280,7 +280,7 @@ xmpp_unknown_attrs(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, xmpp proto_tree_add_string(tree, hf_xmpp_xmlns, tvb, attr->offset, attr->length, attr->value); else { /*xmlns may looks like xmlns:abbrev="sth"*/ - gchar* xmlns_needle = epan_strcasestr((const char *)keys->data, "xmlns:"); + const gchar *xmlns_needle = epan_strcasestr((const char *)keys->data, "xmlns:"); if (xmlns_needle && xmlns_needle == keys->data) { proto_tree_add_string_format(tree, hf_xmpp_xmlns, tvb, attr->offset, attr->length, attr->value,"%s: %s", (gchar*)keys->data, attr->value); } else { @@ -560,7 +560,7 @@ xmpp_xml_frame_to_element_t(xml_frame_t *xml_frame, xmpp_element_t *parent, tvbu { gint l; gchar *value = NULL; - gchar *xmlns_needle = NULL; + const gchar *xmlns_needle = NULL; xmpp_attr_t *attr = wmem_new(wmem_packet_scope(), xmpp_attr_t); attr->length = 0; @@ -661,7 +661,7 @@ attr_find_pred(gpointer key, gpointer value _U_, gpointer user_data) if( strcmp(attr_name, "xmlns") == 0 ) { - gchar *first_occur = epan_strcasestr((const char *)key, "xmlns:"); + const gchar *first_occur = epan_strcasestr((const char *)key, "xmlns:"); if(first_occur && first_occur == key) return TRUE; else diff --git a/epan/strutil.c b/epan/strutil.c index 762d704f2d..715001e6b1 100644 --- a/epan/strutil.c +++ b/epan/strutil.c @@ -1057,7 +1057,7 @@ convert_string_case(const char *string, gboolean case_insensitive) } } -char * +const char * epan_strcasestr(const char *haystack, const char *needle) { gsize hlen = strlen(haystack); @@ -1065,7 +1065,7 @@ epan_strcasestr(const char *haystack, const char *needle) while (hlen-- >= nlen) { if (!g_ascii_strncasecmp(haystack, needle, nlen)) - return (char*) haystack; + return haystack; haystack++; } return NULL; diff --git a/epan/strutil.h b/epan/strutil.h index f92136bbcd..62c1dac564 100644 --- a/epan/strutil.h +++ b/epan/strutil.h @@ -269,7 +269,7 @@ char * convert_string_case(const char *string, gboolean case_insensitive); * Otherwise it returns NULL. */ WS_DLL_PUBLIC -char * epan_strcasestr(const char *haystack, const char *needle); +const char * epan_strcasestr(const char *haystack, const char *needle); /** Guarantee a non-null string. * |