Explorar el Código

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.
Nick Mathewson hace 11 años
padre
commit
c36bdbd535
Se han modificado 2 ficheros con 8 adiciones y 2 borrados
  1. 4 0
      changes/bug9254
  2. 4 2
      src/or/circuitlist.c

+ 4 - 0
changes/bug9254

@@ -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.
+

+ 4 - 2
src/or/circuitlist.c

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