diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-07-02 23:12:32 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-07-02 23:12:32 -0400 |
| commit | c4b831e92d68e6c56246ae6e5b2002ef558525ac (patch) | |
| tree | d1149907147426527037f74f4a763e0cef27640a /src/or/connection.c | |
| parent | 36468ec44b6dc3443b0142de83a100e2a853acf8 (diff) | |
| download | tor-c4b831e92d68e6c56246ae6e5b2002ef558525ac.tar.gz tor-c4b831e92d68e6c56246ae6e5b2002ef558525ac.zip | |
Small tweaks to 2841 code
- const-ify some transport_t pointers
- Remove a vestigial argument to parse_bridge_line
- Make it compile without warnings on my laptop with
--enable-gcc-warnings
Diffstat (limited to 'src/or/connection.c')
| -rw-r--r-- | src/or/connection.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index e0865885f8..05937ac864 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -4130,7 +4130,7 @@ get_proxy_addrport(tor_addr_t *addr, uint16_t *port, goto done; } else if (options->ClientTransportPlugin || options->Bridges) { - transport_t *transport=NULL; + const transport_t *transport=NULL; int r; r = find_transport_by_bridge_addrport(&conn->addr, conn->port, &transport); if (r == 0) { /* transport found */ @@ -4197,5 +4197,6 @@ proxy_type_to_string(int proxy_type) case PROXY_NONE: return "NULL"; default: tor_assert(0); } + return NULL; /*Unreached*/ } |