osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

wmem: Use better names in the API

This commit is contained in:
João Valverde 2021-11-27 17:31:16 +00:00
parent fbfb4959ae
commit f5d8d9e306
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/libwsutil0.symbols vendored
View File

@ -116,7 +116,6 @@ libwsutil.so.0 libwsutil0 #MINVER#
init_progfile_dir@Base 1.12.0~rc1
init_report_message@Base 2.3.0
int64_to_str_back@Base 3.5.1
int_compare@Base 3.6.0
int_to_str_back@Base 3.5.1
ip6_to_str@Base 3.5.1
ip6_to_str_buf@Base 3.5.1
@ -219,7 +218,6 @@ libwsutil.so.0 libwsutil0 #MINVER#
tm_is_valid@Base 3.5.0
type_util_gdouble_to_guint64@Base 1.10.0
type_util_guint64_to_gdouble@Base 1.10.0
uint_compare@Base 3.6.0
uint64_to_str_back@Base 3.5.1
uint64_to_str_back_len@Base 3.5.1
uint_to_str_back@Base 3.5.1
@ -244,6 +242,8 @@ libwsutil.so.0 libwsutil0 #MINVER#
wmem_array_try_index@Base 3.5.0
wmem_ascii_strdown@Base 3.5.0
wmem_cleanup@Base 3.5.0
wmem_compare_int@Base 3.7.0
wmem_compare_uint@Base 3.7.0
wmem_destroy_allocator@Base 3.5.0
wmem_destroy_array@Base 3.5.0
wmem_destroy_list@Base 3.5.0

2
epan/dissectors/packet-quic.c
View File

@ -3844,7 +3844,7 @@ quic_streams_add(packet_info *pinfo, quic_info_data_t *quic_info, guint64 stream
}
if (!wmem_list_find(quic_info->streams_list, GUINT_TO_POINTER(stream_id))) {
wmem_list_insert_sorted(quic_info->streams_list, GUINT_TO_POINTER(stream_id),
uint_compare);
wmem_compare_uint);
}
/* Map: first Stream ID for each UDP payload */

4
wsutil/wmem/wmem_miscutl.c
View File

@ -30,13 +30,13 @@ wmem_memdup(wmem_allocator_t *allocator, const void *source, const size_t size)
}
gint
int_compare(gconstpointer a, gconstpointer b)
wmem_compare_int(gconstpointer a, gconstpointer b)
{
return GPOINTER_TO_INT(a) - GPOINTER_TO_INT(b);
}
gint
uint_compare(gconstpointer a, gconstpointer b)
wmem_compare_uint(gconstpointer a, gconstpointer b)
{
return GPOINTER_TO_UINT(a) > GPOINTER_TO_UINT(b) ? 1 : (GPOINTER_TO_UINT(a) < GPOINTER_TO_UINT(b) ? -1 : 0);
}

4
wsutil/wmem/wmem_miscutl.h
View File

@ -44,11 +44,11 @@ G_GNUC_MALLOC;
*/
WS_DLL_PUBLIC
gint
int_compare(gconstpointer a, gconstpointer b);
wmem_compare_int(gconstpointer a, gconstpointer b);
WS_DLL_PUBLIC
gint
uint_compare(gconstpointer a, gconstpointer b);
wmem_compare_uint(gconstpointer a, gconstpointer b);
/** @}
* @} */

22
wsutil/wmem/wmem_test.c
View File

@ -844,11 +844,11 @@ wmem_test_list(void)
wmem_destroy_list(list);
list = wmem_list_new(NULL);
wmem_list_insert_sorted(list, GINT_TO_POINTER(5), int_compare);
wmem_list_insert_sorted(list, GINT_TO_POINTER(8), int_compare);
wmem_list_insert_sorted(list, GINT_TO_POINTER(1), int_compare);
wmem_list_insert_sorted(list, GINT_TO_POINTER(2), int_compare);
wmem_list_insert_sorted(list, GINT_TO_POINTER(9), int_compare);
wmem_list_insert_sorted(list, GINT_TO_POINTER(5), wmem_compare_int);
wmem_list_insert_sorted(list, GINT_TO_POINTER(8), wmem_compare_int);
wmem_list_insert_sorted(list, GINT_TO_POINTER(1), wmem_compare_int);
wmem_list_insert_sorted(list, GINT_TO_POINTER(2), wmem_compare_int);
wmem_list_insert_sorted(list, GINT_TO_POINTER(9), wmem_compare_int);
frame = wmem_list_head(list);
int1 = GPOINTER_TO_INT(wmem_list_frame_data(frame));
while ((frame = wmem_list_frame_next(frame))) {
@ -859,12 +859,12 @@ wmem_test_list(void)
wmem_destroy_list(list);
list = wmem_list_new(NULL);
wmem_list_insert_sorted(list, GINT_TO_POINTER(5), int_compare);
wmem_list_insert_sorted(list, GINT_TO_POINTER(1), int_compare);
wmem_list_insert_sorted(list, GINT_TO_POINTER(7), int_compare);
wmem_list_insert_sorted(list, GINT_TO_POINTER(3), int_compare);
wmem_list_insert_sorted(list, GINT_TO_POINTER(2), int_compare);
wmem_list_insert_sorted(list, GINT_TO_POINTER(2), int_compare);
wmem_list_insert_sorted(list, GINT_TO_POINTER(5), wmem_compare_int);
wmem_list_insert_sorted(list, GINT_TO_POINTER(1), wmem_compare_int);
wmem_list_insert_sorted(list, GINT_TO_POINTER(7), wmem_compare_int);
wmem_list_insert_sorted(list, GINT_TO_POINTER(3), wmem_compare_int);
wmem_list_insert_sorted(list, GINT_TO_POINTER(2), wmem_compare_int);
wmem_list_insert_sorted(list, GINT_TO_POINTER(2), wmem_compare_int);
frame = wmem_list_head(list);
int1 = GPOINTER_TO_INT(wmem_list_frame_data(frame));
while ((frame = wmem_list_frame_next(frame))) {