nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid c99 designated initializers in circuitmux_ewma.c

Browse Source 
We still want to build on compilers w/o c99 support, such as
(notoriously, shamefully) MSVC.

So I'm commenting out the designated initializers in
circuitmux_ewma.c.  The alternative would have been to use some kind
of macros to use designated initializers only when they're
supported, but that's error-prone, and can lead to code having
different meanings under different compilers.

Bug 7286; fix on 0.2.4.4-alpha; spotted by Gisle Vanem.
This commit is contained in:
Nick Mathewson 2012-11-02 13:14:39 -04:00
parent ae99fc1ccb
commit 05194cce62
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ewma_policy_c99 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes:
- Compile correctly on compilers without C99 designated initializer
support. Fixes bug 7286; bugfix on 0.2.4.4-alpha.

19
src/or/circuitmux_ewma.c
View File

@ -200,15 +200,16 @@ static int ewma_enabled = 0;
/*** EWMA circuitmux_policy_t method table ***/ /*** EWMA circuitmux_policy_t method table ***/
circuitmux_policy_t ewma_policy = { .alloc_cmux_data = ewma_alloc_cmux_data, circuitmux_policy_t ewma_policy = {
.free_cmux_data = ewma_free_cmux_data, /*.alloc_cmux_data =*/ ewma_alloc_cmux_data,
.alloc_circ_data = ewma_alloc_circ_data, /*.free_cmux_data =*/ ewma_free_cmux_data,
.free_circ_data = ewma_free_circ_data, /*.alloc_circ_data =*/ ewma_alloc_circ_data,
.notify_circ_active = ewma_notify_circ_active, /*.free_circ_data =*/ ewma_free_circ_data,
.notify_circ_inactive = ewma_notify_circ_inactive, /*.notify_circ_active =*/ ewma_notify_circ_active,
.notify_set_n_cells = NULL, /* EWMA doesn't need this */ /*.notify_circ_inactive =*/ ewma_notify_circ_inactive,
.notify_xmit_cells = ewma_notify_xmit_cells, /*.notify_set_n_cells =*/ NULL, /* EWMA doesn't need this */
.pick_active_circuit = ewma_pick_active_circuit /*.notify_xmit_cells =*/ ewma_notify_xmit_cells,
/*.pick_active_circuit =*/ ewma_pick_active_circuit
}; };
/*** EWMA method implementations using the below EWMA helper functions ***/ /*** EWMA method implementations using the below EWMA helper functions ***/