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

wsutil: Rename ws_strcasestr to ws_ascii_strcasestr 

This is more reflective of the what it does, a locale-independent
comparison
This commit is contained in:
John Thacker 2023-10-11 23:00:19 -04:00
parent f0df148413
commit 4deb4c6e4c
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-k12.c
View File

@ -230,8 +230,8 @@ dissect_k12(tvbuff_t* tvb,packet_info* pinfo,proto_tree* tree, void* data _U_)
if (! handles ) {
for (i=0 ; i < nk12_handles; i++) {
if ( ws_strcasestr(pinfo->pseudo_header->k12.stack_file, k12_handles[i].match)
|| ws_strcasestr(pinfo->pseudo_header->k12.input_name, k12_handles[i].match) ) {
if ( ws_ascii_strcasestr(pinfo->pseudo_header->k12.stack_file, k12_handles[i].match)
|| ws_ascii_strcasestr(pinfo->pseudo_header->k12.input_name, k12_handles[i].match) ) {
handles = k12_handles[i].handles;
break;
}

6
epan/dissectors/packet-xmpp-utils.c
View File

@ -285,7 +285,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"*/
const gchar *xmlns_needle = ws_strcasestr((const char *)keys->data, "xmlns:");
const gchar *xmlns_needle = ws_ascii_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 {
@ -596,7 +596,7 @@ xmpp_xml_frame_to_element_t(wmem_allocator_t *pool, xml_frame_t *xml_frame, xmpp
g_hash_table_insert(node->attrs,(gpointer)attr->name,(gpointer)attr);
/*checking that attr->name looks like xmlns:ns*/
xmlns_needle = ws_strcasestr(attr->name, "xmlns");
xmlns_needle = ws_ascii_strcasestr(attr->name, "xmlns");
if(xmlns_needle == attr->name)
{
@ -672,7 +672,7 @@ attr_find_pred(gpointer key, gpointer value _U_, gpointer user_data)
if( strcmp(attr_name, "xmlns") == 0 )
{
const gchar *first_occur = ws_strcasestr((const char *)key, "xmlns:");
const gchar *first_occur = ws_ascii_strcasestr((const char *)key, "xmlns:");
if(first_occur && first_occur == key)
return TRUE;
else

2
packaging/debian/libwsutil0.symbols
View File

@ -417,6 +417,7 @@ libwsutil.so.0 libwsutil0 #MINVER#
word_to_hex_punct@Base 3.5.1
write_file_binary_mode@Base 3.5.0
ws_add_crash_info@Base 1.10.0
ws_ascii_strcasestr@Base 4.2.0rc1
ws_ascii_strnatcasecmp@Base 1.99.1
ws_ascii_strnatcmp@Base 1.99.1
ws_base32_decode@Base 2.3.0
@ -507,7 +508,6 @@ libwsutil.so.0 libwsutil0 #MINVER#
ws_regex_matches_pos@Base 3.7.2
ws_regex_pattern@Base 3.7.0
ws_socket_ptoa@Base 3.1.1
ws_strcasestr@Base 3.7.0
ws_strdup_underline@Base 3.7.0
ws_strerrorname_r@Base 3.7.0
ws_strptime@Base 3.7.0

2
wsutil/str_util.c
View File

@ -321,7 +321,7 @@ isdigit_string(const unsigned char *str)
}
const char *
ws_strcasestr(const char *haystack, const char *needle)
ws_ascii_strcasestr(const char *haystack, const char *needle)
{
/* Do not use strcasestr() here, even if a system has it, as it is
* locale-dependent (and has different results for e.g. Turkic languages.)

2
wsutil/str_util.h
View File

@ -167,7 +167,7 @@ bool isdigit_string(const unsigned char *str);
* Otherwise it returns NULL.
*/
WS_DLL_PUBLIC
const char *ws_strcasestr(const char *haystack, const char *needle);
const char *ws_ascii_strcasestr(const char *haystack, const char *needle);
WS_DLL_PUBLIC
char *ws_escape_string(wmem_allocator_t *alloc, const char *string, bool add_quotes);