diff options
author | Nick Mathewson <nickm@torproject.org> | 2011-10-11 11:21:31 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2011-10-11 11:30:12 -0400 |
commit | 00b2b69add373f168e8729e99f349ec5a3753db3 (patch) | |
tree | 1752d1b14be442831174faadcbfce9afd83181bb /src/or/transports.c | |
parent | 69921837a743d551576b3b157657623a0bb96308 (diff) | |
download | tor-00b2b69add373f168e8729e99f349ec5a3753db3.tar.gz tor-00b2b69add373f168e8729e99f349ec5a3753db3.zip |
Fix names of functions that convert strings to addrs
Now let's have "lookup" indicate that there can be a hostname
resolution, and "parse" indicate that there wasn't. Previously, we
had one "lookup" function that did resolution; four "parse" functions,
half of which did resolution; and a "from_str()" function that didn't
do resolution. That's confusing and error-prone!
The code changes in this commit are exactly the result of this perl
script, run under "perl -p -i.bak" :
s/tor_addr_port_parse/tor_addr_port_lookup/g;
s/parse_addr_port(?=[^_])/addr_port_lookup/g;
s/tor_addr_from_str/tor_addr_parse/g;
This patch leaves aton and pton alone: their naming convention and
behavior is is determined by the sockets API.
More renaming may be needed.
Diffstat (limited to 'src/or/transports.c')
-rw-r--r-- | src/or/transports.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/transports.c b/src/or/transports.c index 3c533ccd95..6e8200f407 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -715,7 +715,7 @@ parse_smethod_line(const char *line, managed_proxy_t *mp) } addrport = smartlist_get(items, 2); - if (tor_addr_port_parse(addrport, &addr, &port)<0) { + if (tor_addr_port_lookup(addrport, &addr, &port)<0) { log_warn(LD_CONFIG, "Error parsing transport " "address '%s'", addrport); goto err; @@ -800,7 +800,7 @@ parse_cmethod_line(const char *line, managed_proxy_t *mp) } addrport = smartlist_get(items, 3); - if (tor_addr_port_parse(addrport, &addr, &port)<0) { + if (tor_addr_port_lookup(addrport, &addr, &port)<0) { log_warn(LD_CONFIG, "Error parsing transport " "address '%s'", addrport); goto err; |