Problem: inconsistency of using terms address and uri

Solution: use terms more consistently

src/socket_base.hpp

@@ -82,9 +82,9 @@ class socket_base_t : public own_t,
     //  Interface for communication with the API layer.
     int setsockopt (int option_, const void *optval_, size_t optvallen_);
     int getsockopt (int option_, void *optval_, size_t *optvallen_);
-    int bind (const char *addr_);
-    int connect (const char *addr_);
-    int term_endpoint (const char *addr_);
+    int bind (const char *endpoint_uri_);
+    int connect (const char *endpoint_uri_);
+    int term_endpoint (const char *endpoint_uri_);
     int send (zmq::msg_t *msg_, int flags_);
     int recv (zmq::msg_t *msg_, int flags_);
     void add_signaler (signaler_t *s_);
@@ -120,20 +120,24 @@ class socket_base_t : public own_t,
 
     int monitor (const char *endpoint_, int events_);
 
-    void event_connected (const std::string &addr_, zmq::fd_t fd_);
-    void event_connect_delayed (const std::string &addr_, int err_);
-    void event_connect_retried (const std::string &addr_, int interval_);
-    void event_listening (const std::string &addr_, zmq::fd_t fd_);
-    void event_bind_failed (const std::string &addr_, int err_);
-    void event_accepted (const std::string &addr_, zmq::fd_t fd_);
-    void event_accept_failed (const std::string &addr_, int err_);
-    void event_closed (const std::string &addr_, zmq::fd_t fd_);
-    void event_close_failed (const std::string &addr_, int err_);
-    void event_disconnected (const std::string &addr_, zmq::fd_t fd_);
-    void event_handshake_failed_no_detail (const std::string &addr_, int err_);
-    void event_handshake_failed_protocol (const std::string &addr_, int err_);
-    void event_handshake_failed_auth (const std::string &addr_, int err_);
-    void event_handshake_succeeded (const std::string &addr_, int err_);
+    void event_connected (const std::string &endpoint_uri_, zmq::fd_t fd_);
+    void event_connect_delayed (const std::string &endpoint_uri_, int err_);
+    void event_connect_retried (const std::string &endpoint_uri_,
+                                int interval_);
+    void event_listening (const std::string &endpoint_uri_, zmq::fd_t fd_);
+    void event_bind_failed (const std::string &endpoint_uri_, int err_);
+    void event_accepted (const std::string &endpoint_uri_, zmq::fd_t fd_);
+    void event_accept_failed (const std::string &endpoint_uri_, int err_);
+    void event_closed (const std::string &endpoint_uri_, zmq::fd_t fd_);
+    void event_close_failed (const std::string &endpoint_uri_, int err_);
+    void event_disconnected (const std::string &endpoint_uri_, zmq::fd_t fd_);
+    void event_handshake_failed_no_detail (const std::string &endpoint_uri_,
+                                           int err_);
+    void event_handshake_failed_protocol (const std::string &endpoint_uri_,
+                                          int err_);
+    void event_handshake_failed_auth (const std::string &endpoint_uri_,
+                                      int err_);
+    void event_handshake_succeeded (const std::string &endpoint_uri_, int err_);
 
     //  Query the state of a specific peer. The default implementation
     //  always returns an ENOTSUP error.
@@ -182,17 +186,19 @@ class socket_base_t : public own_t,
 
   private:
     // test if event should be sent and then dispatch it
-    void event (const std::string &addr_, intptr_t value_, int type_);
+    void event (const std::string &endpoint_uri_, intptr_t value_, int type_);
 
     // Socket event data dispatch
-    void
-    monitor_event (int event_, intptr_t value_, const std::string &addr_) const;
+    void monitor_event (int event_,
+                        intptr_t value_,
+                        const std::string &endpoint_uri_) const;
 
     // Monitor socket cleanup
     void stop_monitor (bool send_monitor_stopped_event_ = true);
 
     //  Creates new endpoint ID and adds the endpoint to the map.
-    void add_endpoint (const char *addr_, own_t *endpoint_, pipe_t *pipe_);
+    void
+    add_endpoint (const char *endpoint_uri_, own_t *endpoint_, pipe_t *pipe_);
 
     //  Map of open endpoints.
     typedef std::pair<own_t *, pipe_t *> endpoint_pipe_t;
@@ -203,8 +209,8 @@ class socket_base_t : public own_t,
     class inprocs_t
     {
       public:
-        void emplace (const char *addr_, pipe_t *pipe_);
-        int erase_pipes (const std::string &addr_str_);
+        void emplace (const char *endpoint_uri_, pipe_t *pipe_);
+        int erase_pipes (const std::string &endpoint_uri_str_);
         void erase_pipe (pipe_t *pipe_);
 
       private:
@@ -234,7 +240,7 @@ class socket_base_t : public own_t,
 
     //  Parse URI string.
     static int
-    parse_uri (const char *uri_, std::string &protocol_, std::string &address_);
+    parse_uri (const char *uri_, std::string &protocol_, std::string &path_);
 
     //  Check whether transport protocol, as specified in connect or
     //  bind, is available and compatible with the socket type.
@@ -259,7 +265,7 @@ class socket_base_t : public own_t,
 
     void update_pipe_options (int option_);
 
-    std::string resolve_tcp_addr (std::string endpoint_address_,
+    std::string resolve_tcp_addr (std::string endpoint_uri_,
                                   const char *tcp_address_);
 
     //  Socket's mailbox object.