Re-do a cast in order to make old buggy freebsd gcc happy

Fix for #9254.  Bugfix on 0.2.4.14-alpha.

This is not actually a bug in the Tor code.
This commit is contained in:
Nick Mathewson 2013-07-16 14:48:12 -04:00
parent 7a4145c45a
commit c36bdbd535
2 changed files with 8 additions and 2 deletions

4
changes/bug9254 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes:
- Fix a spurious compilation warning with some older versions of
GCC on FreeBSD. Fixes bug 9254; bugfix on 0.2.4.14-alpha.

View File

@ -1518,8 +1518,10 @@ static size_t
n_cells_in_circ_queues(const circuit_t *c) n_cells_in_circ_queues(const circuit_t *c)
{ {
size_t n = c->n_chan_cells.n; size_t n = c->n_chan_cells.n;
if (! CIRCUIT_IS_ORIGIN(c)) if (! CIRCUIT_IS_ORIGIN(c)) {
n += TO_OR_CIRCUIT((circuit_t*)c)->p_chan_cells.n; circuit_t *cc = (circuit_t *) c;
n += TO_OR_CIRCUIT(cc)->p_chan_cells.n;
}
return n; return n;
} }