dpif: Rename dpif_get_name() to dpif_port_get_name(), update interface.

With multiple kinds of datapaths, code should not just use
"dp%u" along with dpif_minor() to print a datapath name, because not all
datapaths can sensibly be named that way.  We want to use a function
with a name like dpif_get_name() to retrieve a datapath name for printing
to the user, in which case the existing dpif_get_name() function would be
confusing.  So rename the existing one to something more explicit.

1 files changed, 20 insertions, 17 deletions

diff --git a/lib/dpif.c b/lib/dpif.c
index 21f1173fa..3dc7af007 100644
--- a/lib/dpif.c
+++ b/lib/dpif.c
@@ -169,22 +169,6 @@ dpif_create(const char *name, struct dpif *dpif)
 }
 
 int
-dpif_get_name(struct dpif *dpif, char *name, size_t name_size)
-{
-    struct odp_port port;
-    int error;
-
-    assert(name_size > 0);
-    *name = '\0';
-
-    error = dpif_port_query_by_number(dpif, ODPP_LOCAL, &port);
-    if (!error) {
-        ovs_strlcpy(name, port.devname, name_size);
-    }
-    return error;
-}
-
-int
 dpif_delete(struct dpif *dpif)
 {
     COVERAGE_INC(dpif_destroy);
@@ -323,6 +307,24 @@ dpif_port_query_by_name(const struct dpif *dpif, const char *devname,
 }
 
 int
+dpif_port_get_name(struct dpif *dpif, uint16_t port_no,
+                   char *name, size_t name_size)
+{
+    struct odp_port port;
+    int error;
+
+    assert(name_size > 0);
+
+    error = dpif_port_query_by_number(dpif, port_no, &port);
+    if (!error) {
+        ovs_strlcpy(name, port.devname, name_size);
+    } else {
+        *name = '\0';
+    }
+    return error;
+}
+
+int
 dpif_port_list(const struct dpif *dpif,
                struct odp_port **ports, size_t *n_ports)
 {
@@ -698,7 +700,8 @@ dpifmon_create(const char *datapath_name, struct dpifmon **monp)
     if (error) {
         goto error;
     }
-    error = dpif_get_name(&mon->dpif, local_name, sizeof local_name);
+    error = dpif_port_get_name(&mon->dpif, ODPP_LOCAL,
+                               local_name, sizeof local_name);
     if (error) {
         goto error_close_dpif;
     }