aboutsummaryrefslogtreecommitdiffstats
path: root/epan/wmem
AgeCommit message (Collapse)AuthorFilesLines
2019-02-18Include epan header files in VS solution.Michael Mann1-0/+16
Add header files lists to add_library() so that Visual Studio can pick them up and include them in a "Header Files" folder for easier navigation within Visual Studio. Change-Id: I7cd8e39550f4db67eed8205593060ae8b4a5b1b9 Reviewed-on: https://code.wireshark.org/review/31289 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2019-02-02CMake: Fix DOCDIR on UnixJoão Valverde1-1/+1
User guides are installed to doc/Wireshark. Use doc/wireshark instead. Remove leftover variable CPACK_PACKAGE_NAME. Change-Id: I9a1d6bdc7d8f0b48c61e43679285d5ba83904a63 Reviewed-on: https://code.wireshark.org/review/31851 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-11-24Install development headers on all platformsJoão Valverde1-5/+3
Install headers to support plugins development on Windows. Change-Id: I3161bd2f730edf62ab44fee6ce4fedbb9aee0d31 Reviewed-on: https://code.wireshark.org/review/30776 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-10-12wmem_tree: fix crash with wmem_tree_destroy and NULL scopePeter Wu1-2/+6
The function was documented for use with a NULL scope, but it actually crashes since callbacks are not available for NULL scopes. git master is unaffected, but the GTK+ protocol dialog in 2.4 and 2.6 do crash. Bug: 14349 Change-Id: I54350e112192394797cf85eaac4f30194178d7c4 Fixes: v2.3.0rc0-2597-gb7d6cca4ae ("Add wmem_tree_destroy") Reviewed-on: https://code.wireshark.org/review/30126 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-19Try to discourage the use of APIs via counting.Gerald Combs2-4/+3
Add the ability to specify maximum function counts for each group to checkAPIs. Add maximum counts for the "termoutput" and "abort" groups where needed. Show summaries in various checkAPI targets. Switch uses of ws_g_warning back to plain g_warning. Change-Id: I5cbddc8c671729e424eed8551f69116d16491976 Reviewed-on: https://code.wireshark.org/review/29721 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-09-05wmem_test: fix no previous prototype for ‘check_val_map’ ↵Alexis La Goutte1-1/+1
[-Wmissing-prototypes] Change-Id: I9473e3d4fd6dffbbed6921770d8bd26e4104647b Reviewed-on: https://code.wireshark.org/review/29438 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-07-31wmem_interval_tree: fix no previous prototype for ↵Alexis La Goutte1-1/+1
‘update_edges_after_rotation’ [-Wmissing-prototypes] Change-Id: I60085243d0e57ac072246bf3374ed3b7f6078497 Reviewed-on: https://code.wireshark.org/review/28889 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-07-17wmem: make wmem_strsplit behave more like g_strsplitPeter Wu3-58/+58
In the past "g_strsplit" users were converted to use "wmem_strsplit" to avoid memory leaks when dissection fails. The semantics were slightly different though. When the DNS dissector tried to split the string "." using delimiter ".", it would previously (unexpectedly) receive an empty vector (and crash). Now it will receive a vector with one element. Additionally, suggest that users of wmem_strsplit with a NULL allocator use g_strsplit instead, otherwise it will leak the elements. Bug: 14980 Change-Id: I408dfdb0ffa9e24ccdba69c8ee095abea72f6feb Reviewed-on: https://code.wireshark.org/review/28724 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-07-14wmem_tree: describe tree traversal orderMatthieu Coudron2-6/+8
it is an inorder traversal (left/parent/right). Change-Id: Ia83efdfd45dab8c8386d84b3050af081312fde85 Reviewed-on: https://code.wireshark.org/review/28688 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-07-14wmem_itree:update children max_edge after rotationMatthieu Coudron1-3/+11
After a rotation, the post_rotation callback was just updating the root tree max_edge when it should also update its children since some of them might have lost or changed children. Any change in max_edge will bubble up/propagate to the parent. Change-Id: Ia6705d71de5c85847d51f97f86fd35f4da20c03a Reviewed-on: https://code.wireshark.org/review/28687 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-07-14mptcp: Correctly find mappings and reinjectionsMatthieu Coudron1-1/+1
- removed mptcp.duplicated_dsn in favor of mptcp.reinjection_of/mptcp.reinjected_in reinjected_in lists the packets where the DSN was later reinjected in. reinjection_of lists the packets in which this DSN was already transmitted. - There was a bug where the max_edge property of the interval tree was not correctly updated. Right now wireshark gives a dsn for every TCP frame (even empty packets). - Now displays mappings only for packets with data (seglen > 0). - Renamed dsn_map to dsn2packet_map and mappings to ssn2dsn_mappings. - precises the complexity of enabling certain MPTCP options so that the user better understand their impact on processing speed. Change-Id: I24adc3161021b7f6a084763a74dc580f1c1f2c2e Reviewed-on: https://code.wireshark.org/review/28326 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-03fix missing parentheses in 'if' statementchinarulezzz2-2/+2
Change-Id: I47f8566c4410d6aac1111b35fff3b044c14bc70b Reviewed-on: https://code.wireshark.org/review/27079 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-18Remove autotools build system.Dario Lombardo1-103/+0
It has been replaced by cmake. Change-Id: I83a5eddb8645dbbf6bca9f026066d2e995d8e87a Reviewed-on: https://code.wireshark.org/review/26969 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-19wmem: ensure wmem_memdup(..., NULL, 0) returns NULLPeter Wu3-2/+10
Rather than requiring all callers to pass a non-null source argument, explicitly allow a NULL source when the size is zero. This is consistent with g_memdup behavior. While at it, fix a memleak and avoid memset(0,0,0) in tests. Change-Id: I86a092625a508544d180da959e4afdd0366539f4 Reviewed-on: https://code.wireshark.org/review/26496 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Mališa Vučinić <malishav@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus <eapache@gmail.com>
2018-03-19wmem: fix random test failure due to key collisionPeter Wu1-1/+4
Fixes sporadic test failure in buildbot: ERROR:epan/wmem/wmem_test.c:1170:wmem_test_tree: assertion failed: (wmem_tree_count(tree) == CONTAINER_ITERS) Change-Id: Ia33b54d8f0a7afc37fa9356aa868c4a7b896e7da Test: wmem_test --seed R02S674cddedb75a1db84fb9698ac51213c0 Reviewed-on: https://code.wireshark.org/review/26501 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus <eapache@gmail.com>
2018-03-13CMake: Exclude wmem_test from the default buildGerald Combs1-0/+1
Exclude wmem_test from the default Wireshark.sln build similar to our other test programs. Change-Id: If9a16944823bb3a928260c5e1307870253f1da8f Reviewed-on: https://code.wireshark.org/review/26456 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-07spdx: more licenses converted.Dario Lombardo1-13/+1
Change-Id: I3861061ec261e63b23621799e020e811ed78a343 Reviewed-on: https://code.wireshark.org/review/26333 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-28Make sure CAPACITY() doesn't shift the 1 out of range.Guy Harris1-1/+1
Make the 1 we shift left the size of a size_t, so it'll only go out of range if the result couldn't possibly fit in a size_t. (That should also make the object of the shift unsigned, which may squelch some other complaints.) Not that the map is *likely* to be bigger than 4GB, but it should squelch some complaints from Visual Studio Code Analysis. Change-Id: I489bfe6b1d9d4329c267936d9106dbba4388c492 Reviewed-on: https://code.wireshark.org/review/26163 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-13WMEM: Add strjoin routines.Craig Jackson2-0/+93
Add wmem versions corresponding to g_strjoin() and g_strjoinv(). Modify packet-rtps.c to use wmem routines_ where it is now using g_ routines causing mallocs. Change-Id: I92c890a8b8f29a973e103676d8e5a681ee5abd50 Reviewed-on: https://code.wireshark.org/review/25764 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-08wmem: use SPDX identifiers.Dario Lombardo39-507/+39
Change-Id: Iad9a7a8a26bc6a7189a4578dfbcec1c2b3cc376e Reviewed-on: https://code.wireshark.org/review/25692 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-07Added wmem_map_contains and wmem_map_lookup_extendedMoshe Kaplan3-0/+100
Change-Id: I2943c67238fb913258f0f1f15df968c17b1ea002 Reviewed-on: https://code.wireshark.org/review/25626 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-18autotools: Library build products don't need explicit cleaningJoão Valverde1-5/+0
Change-Id: I5d68c05f2844d6c9ae486531b189dbf10bc09cff Reviewed-on: https://code.wireshark.org/review/24484 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-15autotools: make maintainer-clean should allow rerunning 'configure'João Valverde1-5/+0
Change-Id: Iedae94ffefe27b13b1967d69cacb757b5aa4576d Reviewed-on: https://code.wireshark.org/review/23928 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-10-13CMake: Allow user build flags to override default build flagsJoão Valverde1-2/+0
Autotools has the very useful feature by design of allowing the user to override the default build flags (you break it you keep it). Apparently CMake applies COMPILE_OPTIONS target property after CMAKE_{C,CXX}_FLAGS so that doesn't work here. Prepend our flags to those variables instead to make it work then. Specific target flag overrides can still be added with COMPILER_OPTIONS (e.g: generated files with -Wno-warning) but this is less effective and then we're back at the point where this overrides user flags. It's less of a concern though. Change-Id: I44761a79be4289238e02d4e781fef0099628817b Reviewed-on: https://code.wireshark.org/review/23675 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-09-17CMake: Initial work to install headers for the benefit of pluginsJoão Valverde1-0/+23
To be continued incrementally to fix gaps and omissions. If we are willing to reorganize the source tree to have one or two header include folders this could be simplified considerably. It would also force developers to give more consideration to API issues, which is a good thing. See also e7ef19efc0e928b50644b37772ccbf176e74f766. Bug: 14062 Change-Id: I0759da2f9793cfb5cf92c9e231457bba43df4353 Reviewed-on: https://code.wireshark.org/review/23548 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-15autotools: Initial work to install headers for the benefit of pluginsJoão Valverde1-14/+18
Install public headers required to build plugins for libwireshark (taps and dissectors). The source tree is organized to serve the CLI/GUI parts of wireshark. Plugins are built in tree. This change is intende to allow plugins to be built out-of-tree but we want to avoid dumping all headers into /usr/include. To be continued incrementally to fix errors and omissions. Change-Id: Iaa0def0ba3de4b456a29114c315544d2d64fa748 Reviewed-on: https://code.wireshark.org/review/23374 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-06plugins: config.h must not be included by public headersJoão Valverde1-0/+1
For a sane plugin build environment. Include config.h as the first header in the .c file instead. Fix by moving required compiler attribute macros to a new "ws_attributes.h" API header. Change-Id: I34f58a927f68c1a0e59686c14d214825149749e1 Reviewed-on: https://code.wireshark.org/review/23400 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-03-05wmem: Ensure callbacks are initialized and not accidentally unregisteredMichael Mann2-7/+4
Start the "callback register ID" at 1, so that zeroed out callback IDs are not found during unregister. Change-Id: I1d7d70f53d89c40e07d1637e1e195dd027855ed3 Reviewed-on: https://code.wireshark.org/review/20385 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2017-03-05Add wmem_tree_destroyMichael Mann2-0/+44
Allows the cleanup of NULL scoped wmem trees Change-Id: I7c49a224ca7e2f7ddfe0e38d3ea0e79aa2cb057c Reviewed-on: https://code.wireshark.org/review/20382 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2017-03-04Add wmem_tree_count.Michael Mann3-0/+30
There are cases where wmem_tree needs to know its number of nodes. Change-Id: I6411cf4275fd4d85a1d76382e1922d236be3b176 Reviewed-on: https://code.wireshark.org/review/20005 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-10wmem_list: Fix Dead Store (Dead assignement/Dead increment) Warning found by ↵Alexis La Goutte1-1/+0
Clang Change-Id: Ibbbe9fb0165eaa297c2b70bf7e478cf538e2cc33 Reviewed-on: https://code.wireshark.org/review/20040 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-09Add wmem_map_get_keys.Michael Mann2-0/+34
Mimic functionality of g_hash_table_get_keys Change-Id: I7702854ed771a5b3bf7ea5295a67c42f0f477cdf Reviewed-on: https://code.wireshark.org/review/20039 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-09Add wmem_map_stealMichael Mann2-0/+40
Mimic functionality of g_hash_table_steal Change-Id: Iaf4aeef951b60934569143b2d119f782aeefe380 Reviewed-on: https://code.wireshark.org/review/20038 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-09Add wmem_tree_remove32Michael Mann2-0/+19
Change-Id: Ic79fd0a2a13341dd7ba563cf3a056c51e9d16960 Reviewed-on: https://code.wireshark.org/review/20037 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-08wmem_list: add wmem_list_insert_sorted.Dario Lombardo3-0/+115
This mimics the function g_list_insert_sorted. Change-Id: I6f7ac01155588006662c8c0c138d88cea753868c Reviewed-on: https://code.wireshark.org/review/19978 Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-01-28wmem: Delay creation of map table until its neededMichael Mann1-2/+4
wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(), ...) doesn't have "file" scope ready at startup to create hash table and will assert. Change-Id: I3437f45ef42bf8635e4d504cf073fc3fb0c9a8cd Reviewed-on: https://code.wireshark.org/review/19825 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2017-01-28Add wmem_map_new_autoresetMichael Mann3-4/+122
This can be used similarly to wmem_tree_new_autoreset for hash tables that need reset after capture file change. Change-Id: I3a2f0b0a0cad3eca46266523c594d3d7aac17489 Reviewed-on: https://code.wireshark.org/review/19794 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2017-01-22wmem: fix rb-tree data printer feedJaap Keuter1-2/+2
When using a data printer for the red/black tree it is fed with the nodes of the tree. But nodes can be either subtree or data nodes. Don't feed the subtree nodes to the data printer. The data printer can't recognize it as such, can't handle it, or worse, could break stuff. Change-Id: Ibbc1311d901c0d0c52e710f951dd53620f2c3d0f Reviewed-on: https://code.wireshark.org/review/19652 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-24Add wmem_list_find_custom()João Valverde2-0/+18
Change-Id: I5c4f85df0a1899d629386581de2c2c3ec0812d54 Reviewed-on: https://code.wireshark.org/review/18440 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-09-30cmake: make WERROR_COMMON_FLAGS a normal stringPeter Wu1-7/+5
Instead of checking for the boolean "FALSE", just set an empty string. This avoids the need to check for WERROR_COMMON_FLAGS before using it. The transformation is the same for all files, remove "if (WERROR_COMMON_FLAGS)" and "endif()", reindent and add quotes (since we have a string here and not a list). Modelines have been added where missing. Change-Id: I0ab05ae507c51fa77336d49a99a226399cc81b92 Reviewed-on: https://code.wireshark.org/review/17997 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com>
2016-08-23CMake: Allow setting per target compiler warningsJoão Valverde1-0/+2
Setting our compiler warning flags in CMAKE_C_FLAGS does not allow using different flags per target. Allow for that possibility by setting the internal WS_WARNINGS_{C,CXX}_FLAGS and using the COMPILE_OPTIONS property to set them. This change is just setting mechanism and there should be no difference in generated warnings. The check_X_compiler_flag cmake test is changed to test each flag individually. We need a list, not a space separated string, and the aggregate test is not significant. Change-Id: I59fc5cd7e130c7a5e001c598e3df3e13f83a6a25 Reviewed-on: https://code.wireshark.org/review/17150 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-08-01Remove checkAPI warnings from wmem.Michael Mann3-9/+11
printf and g_warning are not allowed in epan or its subdirectories Change-Id: I4c07a7258f4c9566384bef93af35c350b5c88758 Reviewed-on: https://code.wireshark.org/review/16801 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-30Use correct relative path.Guy Harris1-1/+1
The build is done in epan/wmem, so libwsutil.la is in ../../wsutil. Change-Id: I053f6b925829e9c5e9ded014fbc716abc527b46a Reviewed-on: https://code.wireshark.org/review/16790 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-30ifdef out a variable used only on Windows.Guy Harris1-1/+3
Also, fix identation - tab stops are set every 8 spaces, not every 4 spaces, in UN*X, which is why the mode lines specify that. Change-Id: If7cfc2cdae26feb2d5c13e31a32ed950354fb15b Reviewed-on: https://code.wireshark.org/review/16789 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-30Add string function times to wmem_test.Gerald Combs3-2/+162
The system, GLib, and wmem string functions can perform differently, particularly on Windows. Start adding performance tests to wmem_test so that we can see the differences. With this change applied "wmem_test --verbose" prints out the following on a Windows 7 x64 VM here. wmem_test is linked against GLib 2.4.20. (MINPERF:g_printf_string_upper_bound (via g_snprintf) 1 string: u 327.602 ms s 0 .000 ms) (MINPERF:g_printf_string_upper_bound (via g_snprintf) 5 strings: u 1419.609 ms s 0.000 ms) (MINPERF:g_printf_string_upper_bound (via g_snprintf) mixed args: u 1606.810 ms s 0.000 ms) (MINPERF:_snprintf_s upper bound 1 string: u 124.801 ms s 0.000 ms) (MINPERF:_snprintf_s upper bound 5 strings: u 140.401 ms s 0.000 ms) (MINPERF:_snprintf_s upper bound mixed args: u 124.801 ms s 0.000 ms) (MINPERF:g_strdup_printf 2 strings: u 702.005 ms s 0.156 ms) (MINPERF:g_strconcat 2 strings: u 78.000 ms s 0.000 ms) (MINPERF:g_strdup_printf 5 strings: u 1419.609 ms s 0.156 ms) (MINPERF:g_strconcat 5 strings: u 93.601 ms s 0.156 ms) (MINPERF:wmem_strdup_printf 2 strings: u 343.202 ms s 0.312 ms) (MINPERF:wmem_strconcat 2 strings: u 93.601 ms s 0.468 ms) (MINPERF:wmem_strdup_printf 5 strings: u 327.602 ms s 8.268 ms) (MINPERF:wmem_strconcat 5 strings: u 62.400 ms s 3.432 ms) Change-Id: Id9b23918829db1719d141e7f830b9eba6245a25b Reviewed-on: https://code.wireshark.org/review/14857 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-16wmem_map.c: Address some VS Code Analysis warnings.Michael Mann1-3/+4
size_t can vary on size, so you can't always mix it with guint. Change-Id: I7e2ea3a990dd4df99422f6113aa3ae53dbf2bc4f Reviewed-on: https://code.wireshark.org/review/16501 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-30Reinstate the wmem test-programs target.Jeff Morriss1-0/+2
It's used when building the test programs (today wmem has only one but it might someday have more). Change-Id: I627513e1297b8348bf034e852eaf212ddbef96ff Reviewed-on: https://code.wireshark.org/review/16221 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-06-30Remove Makefile.common filesJoão Valverde2-88/+44
Now that nmake build system has been removed they are not needed anymore. Change-Id: I88075f955bb4349185859c1af4be22e53de5850f Reviewed-on: https://code.wireshark.org/review/16050 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-06-15Remove Nmake build systemPascal Quantin2-62/+0
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61 Reviewed-on: https://code.wireshark.org/review/15777 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-05-24Document wmem null guaranteeEvan Huus1-0/+4
Change-Id: Ibbbda815b144441f7db2d1920e1551c45e997370 Reviewed-on: https://code.wireshark.org/review/15549 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Dario Lombardo <lomato@gmail.com>