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.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/or/connection.c b/src/or/connection.c
index 2bd2d07e94..af0572905d 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1893,7 +1893,7 @@ retry_listeners(smartlist_t *old_conns,
   int retval = 0;
 
   if (default_addr) {
-    tor_addr_from_str(&dflt_addr, default_addr);
+    tor_addr_parse(&dflt_addr, default_addr);
   } else {
     tor_addr_make_unspec(&dflt_addr);
   }
@@ -1917,7 +1917,7 @@ retry_listeners(smartlist_t *old_conns,
           port->is_unix_addr = 1;
           memcpy(port->unix_addr, c->value, len+1);
         } else {
-          if (tor_addr_port_parse(c->value, &addr, &portval) < 0) {
+          if (tor_addr_port_lookup(c->value, &addr, &portval) < 0) {
             log_warn(LD_CONFIG, "Can't parse/resolve %s %s",
                      c->key, c->value);
             retval = -1;