diff options
| author | João Valverde <j@v6e.pt> | 2021-07-12 21:22:05 +0100 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-07-26 14:56:11 +0000 |
| commit | 7f9c1f5f92c131354fc8b2b88d473706786064c0 (patch) | |
| tree | 9249c0eda50dea18e8b85e8aeb8c1d3c98a007cb /debian | |
| parent | 8310665ae707b589e04167ef9bd2aed6f71651f3 (diff) | |
Move wmem to wsutil
This allows wmem to be used from other libraries, namely wsutil.
It is often the case that a funtion exists in wsutil and cannot
be used with a wmem scope, requiring some code duplication or
extra memory allocations, or vice-versa, code in epan cannot be
moved to wsutil because it has a wmem dependency.
To this end wmem is moved to wsutil. Scope management remains part
of epan because those scope semantics are specific to dissection.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/libwireshark0.symbols | 108 | ||||
| -rw-r--r-- | debian/libwsutil-dev.install | 1 | ||||
| -rw-r--r-- | debian/libwsutil0.symbols | 106 |
3 files changed, 112 insertions, 103 deletions
diff --git a/debian/libwireshark0.symbols b/debian/libwireshark0.symbols index cb41cfb0a3..54d7448713 100644 --- a/debian/libwireshark0.symbols +++ b/debian/libwireshark0.symbols @@ -1913,7 +1913,6 @@ libwireshark.so.0 libwireshark0 #MINVER# uat_update_record@Base 1.99.3 udp_dissect_pdus@Base 1.99.3 udp_port_to_display@Base 1.99.2 - uint64_compare@Base 3.5.0 uint_to_str_back@Base 2.1.0 union_of_tap_listener_flags@Base 1.9.1 unit_name_string_get_value@Base 2.3.0 @@ -2002,108 +2001,11 @@ libwireshark.so.0 libwireshark0 #MINVER# value_is_in_range@Base 1.9.1 value_string_ext_free@Base 1.12.0~rc1 value_string_ext_new@Base 1.9.1 - wmem_alloc0@Base 1.9.1 - wmem_alloc@Base 1.9.1 - wmem_allocator_new@Base 1.9.1 - wmem_array_append@Base 1.12.0~rc1 - wmem_array_bzero@Base 2.1.0 - wmem_array_get_count@Base 1.12.0~rc1 - wmem_array_get_raw@Base 1.12.0~rc1 - wmem_array_grow@Base 3.3.0 - wmem_array_index@Base 1.12.0~rc1 - wmem_array_new@Base 1.12.0~rc1 - wmem_array_set_null_terminator@Base 2.1.0 - wmem_array_sized_new@Base 1.12.0~rc1 - wmem_array_sort@Base 1.12.0~rc1 - wmem_array_try_index@Base 3.1.0 - wmem_ascii_strdown@Base 1.12.0~rc1 - wmem_cleanup@Base 1.12.0~rc1 - wmem_destroy_allocator@Base 1.9.1 - wmem_destroy_array@Base 3.3.0 - wmem_destroy_list@Base 1.12.0~rc1 - wmem_double_hash@Base 1.12.0~rc1 - wmem_epan_scope@Base 1.9.1 - wmem_file_scope@Base 1.9.1 - wmem_free@Base 1.9.1 - wmem_free_all@Base 1.9.1 - wmem_gc@Base 1.9.1 - wmem_init@Base 1.12.0~rc1 - wmem_int64_hash@Base 1.12.0~rc1 - wmem_itree_find_intervals@Base 2.1.0 - wmem_itree_insert@Base 2.1.0 - wmem_itree_is_empty@Base 2.1.0 - wmem_itree_new@Base 2.1.0 - wmem_list_append@Base 1.12.0~rc1 - wmem_list_count@Base 1.12.0~rc1 - wmem_list_find@Base 2.1.0 - wmem_list_find_custom@Base 2.3.0 - wmem_list_foreach@Base 2.1.0 - wmem_list_frame_data@Base 1.12.0~rc1 - wmem_list_frame_next@Base 1.12.0~rc1 - wmem_list_frame_prev@Base 1.12.0~rc1 - wmem_list_head@Base 1.12.0~rc1 - wmem_list_insert_sorted@Base 2.3.0 - wmem_list_new@Base 1.12.0~rc1 - wmem_list_prepend@Base 1.12.0~rc1 - wmem_list_remove@Base 1.12.0~rc1 - wmem_list_remove_frame@Base 1.12.0~rc1 - wmem_list_tail@Base 1.12.0~rc1 - wmem_map_contains@Base 2.5.1 - wmem_map_foreach@Base 2.1.0 - wmem_map_get_keys@Base 2.3.0 - wmem_map_insert@Base 1.12.0~rc1 - wmem_map_lookup@Base 1.12.0~rc1 - wmem_map_lookup_extended@Base 2.5.1 - wmem_map_new@Base 1.12.0~rc1 - wmem_map_new_autoreset@Base 2.3.0 - wmem_map_remove@Base 1.12.0~rc1 - wmem_map_size@Base 2.1.0 - wmem_map_steal@Base 2.3.0 - wmem_memdup@Base 1.12.0~rc1 - wmem_packet_scope@Base 1.9.1 - wmem_realloc@Base 1.9.1 - wmem_register_callback@Base 1.12.0~rc1 - wmem_stack_peek@Base 1.9.1 - wmem_stack_pop@Base 1.9.1 - wmem_str_hash@Base 1.12.0~rc1 - wmem_strbuf_append@Base 1.9.1 - wmem_strbuf_append_c@Base 1.12.0~rc1 - wmem_strbuf_append_len@Base 3.3.1 - wmem_strbuf_append_printf@Base 1.9.1 - wmem_strbuf_append_unichar@Base 1.12.0~rc1 - wmem_strbuf_append_vprintf@Base 3.1.1 - wmem_strbuf_finalize@Base 1.12.0~rc1 - wmem_strbuf_get_len@Base 1.9.1 - wmem_strbuf_get_str@Base 1.9.1 - wmem_strbuf_new@Base 1.9.1 - wmem_strbuf_sized_new@Base 1.9.1 - wmem_strbuf_truncate@Base 1.12.0~rc1 - wmem_strconcat@Base 1.12.0~rc1 - wmem_strdup@Base 1.9.1 - wmem_strdup_printf@Base 1.9.1 - wmem_strdup_vprintf@Base 1.9.1 - wmem_strjoin@Base 2.5.1 - wmem_strjoinv@Base 2.5.1 - wmem_strndup@Base 1.9.1 - wmem_strong_hash@Base 1.12.0~rc1 - wmem_strsplit@Base 1.12.0~rc1 - wmem_tree_count@Base 2.3.0 - wmem_tree_destroy@Base 2.3.0 - wmem_tree_foreach@Base 1.12.0~rc1 - wmem_tree_insert32@Base 1.12.0~rc1 - wmem_tree_insert32_array@Base 1.12.0~rc1 - wmem_tree_insert_string@Base 1.12.0~rc1 - wmem_tree_is_empty@Base 1.12.0~rc1 - wmem_tree_lookup32@Base 1.12.0~rc1 - wmem_tree_lookup32_array@Base 1.12.0~rc1 - wmem_tree_lookup32_array_le@Base 1.12.0~rc1 - wmem_tree_lookup32_le@Base 1.12.0~rc1 - wmem_tree_lookup_string@Base 1.12.0~rc1 - wmem_tree_new@Base 1.12.0~rc1 - wmem_tree_new_autoreset@Base 1.12.0~rc1 - wmem_tree_remove_string@Base 1.99.9 - wmem_tree_remove32@Base 2.3.0 - wmem_unregister_callback@Base 1.12.0~rc1 + wmem_cleanup_scopes@Base 3.5.0 + wmem_epan_scope@Base 3.5.0 + wmem_init_scopes@Base 3.5.0 + wmem_packet_scope@Base 3.5.0 + wmem_file_scope@Base 3.5.0 word_to_hex@Base 2.1.0 write_carrays_hex_data@Base 1.99.1 write_csv_column_titles@Base 1.99.1 diff --git a/debian/libwsutil-dev.install b/debian/libwsutil-dev.install index ef9f0d6527..2284dee2ea 100644 --- a/debian/libwsutil-dev.install +++ b/debian/libwsutil-dev.install @@ -4,3 +4,4 @@ ws_compiler_tests.h usr/include/wireshark ws_diag_control.h usr/include/wireshark ws_symbol_export.h usr/include/wireshark wsutil/*.h usr/include/wireshark/wsutil +wsutil/wmem/*.h usr/include/wireshark/wsutil/wmem diff --git a/debian/libwsutil0.symbols b/debian/libwsutil0.symbols index 5885cf0d90..9746c18ec0 100644 --- a/debian/libwsutil0.symbols +++ b/debian/libwsutil0.symbols @@ -195,10 +195,116 @@ 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 + uint64_compare@Base 3.5.0 ulaw2linear@Base 1.12.0~rc1 unix_epoch_to_nstime@Base 3.5.0 update_adler32@Base 1.12.0~rc1 update_crc10_by_bytes@Base 1.10.0 + wmem_alloc0@Base 3.5.0 + wmem_alloc@Base 3.5.0 + wmem_allocator_new@Base 3.5.0 + wmem_array_append@Base 3.5.0 + wmem_array_bzero@Base 3.5.0 + wmem_array_get_count@Base 3.5.0 + wmem_array_get_raw@Base 3.5.0 + wmem_array_grow@Base 3.5.0 + wmem_array_index@Base 3.5.0 + wmem_array_new@Base 3.5.0 + wmem_array_set_null_terminator@Base 3.5.0 + wmem_array_sized_new@Base 3.5.0 + wmem_array_sort@Base 3.5.0 + wmem_array_try_index@Base 3.5.0 + wmem_ascii_strdown@Base 3.5.0 + wmem_cleanup@Base 3.5.0 + wmem_destroy_allocator@Base 3.5.0 + wmem_destroy_array@Base 3.5.0 + wmem_destroy_list@Base 3.5.0 + wmem_double_hash@Base 3.5.0 + wmem_enter_scope@Base 3.5.0 + wmem_epan_scope@Base 3.5.0 + wmem_file_scope@Base 3.5.0 + wmem_free@Base 3.5.0 + wmem_free_all@Base 3.5.0 + wmem_gc@Base 3.5.0 + wmem_in_scope@Base 3.5.0 + wmem_init@Base 3.5.0 + wmem_int64_hash@Base 3.5.0 + wmem_itree_find_intervals@Base 3.5.0 + wmem_itree_insert@Base 3.5.0 + wmem_itree_is_empty@Base 3.5.0 + wmem_itree_new@Base 3.5.0 + wmem_leave_scope@Base 3.5.0 + wmem_list_append@Base 3.5.0 + wmem_list_count@Base 3.5.0 + wmem_list_find@Base 3.5.0 + wmem_list_find_custom@Base 3.5.0 + wmem_list_foreach@Base 3.5.0 + wmem_list_frame_data@Base 3.5.0 + wmem_list_frame_next@Base 3.5.0 + wmem_list_frame_prev@Base 3.5.0 + wmem_list_head@Base 3.5.0 + wmem_list_insert_sorted@Base 3.5.0 + wmem_list_new@Base 3.5.0 + wmem_list_prepend@Base 3.5.0 + wmem_list_remove@Base 3.5.0 + wmem_list_remove_frame@Base 3.5.0 + wmem_list_tail@Base 3.5.0 + wmem_map_contains@Base 3.5.0 + wmem_map_foreach@Base 3.5.0 + wmem_map_get_keys@Base 3.5.0 + wmem_map_insert@Base 3.5.0 + wmem_map_lookup@Base 3.5.0 + wmem_map_lookup_extended@Base 3.5.0 + wmem_map_new@Base 3.5.0 + wmem_map_new_autoreset@Base 3.5.0 + wmem_map_remove@Base 3.5.0 + wmem_map_size@Base 3.5.0 + wmem_map_steal@Base 3.5.0 + wmem_memdup@Base 3.5.0 + wmem_packet_scope@Base 3.5.0 + wmem_realloc@Base 3.5.0 + wmem_register_callback@Base 3.5.0 + wmem_stack_peek@Base 3.5.0 + wmem_stack_pop@Base 3.5.0 + wmem_str_hash@Base 3.5.0 + wmem_strbuf_append@Base 3.5.0 + wmem_strbuf_append_c@Base 3.5.0 + wmem_strbuf_append_len@Base 3.5.0 + wmem_strbuf_append_printf@Base 3.5.0 + wmem_strbuf_append_unichar@Base 3.5.0 + wmem_strbuf_append_vprintf@Base 3.5.0 + wmem_strbuf_finalize@Base 3.5.0 + wmem_strbuf_get_len@Base 3.5.0 + wmem_strbuf_get_str@Base 3.5.0 + wmem_strbuf_new@Base 3.5.0 + wmem_strbuf_sized_new@Base 3.5.0 + wmem_strbuf_truncate@Base 3.5.0 + wmem_strconcat@Base 3.5.0 + wmem_strdup@Base 3.5.0 + wmem_strdup_printf@Base 3.5.0 + wmem_strdup_vprintf@Base 3.5.0 + wmem_strjoin@Base 3.5.0 + wmem_strjoinv@Base 3.5.0 + wmem_strndup@Base 3.5.0 + wmem_strong_hash@Base 3.5.0 + wmem_strsplit@Base 3.5.0 + wmem_tree_count@Base 3.5.0 + wmem_tree_destroy@Base 3.5.0 + wmem_tree_foreach@Base 3.5.0 + wmem_tree_insert32@Base 3.5.0 + wmem_tree_insert32_array@Base 3.5.0 + wmem_tree_insert_string@Base 3.5.0 + wmem_tree_is_empty@Base 3.5.0 + wmem_tree_lookup32@Base 3.5.0 + wmem_tree_lookup32_array@Base 3.5.0 + wmem_tree_lookup32_array_le@Base 3.5.0 + wmem_tree_lookup32_le@Base 3.5.0 + wmem_tree_lookup_string@Base 3.5.0 + wmem_tree_new@Base 3.5.0 + wmem_tree_new_autoreset@Base 3.5.0 + wmem_tree_remove_string@Base 3.5.0 + wmem_tree_remove32@Base 3.5.0 + wmem_unregister_callback@Base 3.5.0 write_file_binary_mode@Base 3.5.0 ws_add_crash_info@Base 1.10.0 ws_ascii_strnatcasecmp@Base 1.99.1 |