[ovs-dev] [PATCH] lib: Make error messages more useful

[Greg Rose]

There are many "opening datapath" error messages and when one occurs
it is impossible to know just from the log message which of the
"opening datapath" errors occurred.  Add additional log information
identifying the datapath argument name and the line number.

Signed-off-by: Greg Rose <gvrose8192 at gmail.com>
---
 lib/dpctl.c | 39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/lib/dpctl.c b/lib/dpctl.c
index b769544..c1de858 100644
--- a/lib/dpctl.c
+++ b/lib/dpctl.c
@@ -214,7 +214,8 @@ dpctl_del_dp(int argc OVS_UNUSED, const char *argv[],
 
     error = parsed_dpif_open(argv[1], false, &dpif);
     if (error) {
-        dpctl_error(dpctl_p, error, "opening datapath");
+        dpctl_error(dpctl_p, error, "%s:%d opening datapath",
+                    argv[1], __LINE__);
         return error;
     }
     error = dpif_delete(dpif);
@@ -235,7 +236,8 @@ dpctl_add_if(int argc OVS_UNUSED, const char *argv[],
 
     error = parsed_dpif_open(argv[1], false, &dpif);
     if (error) {
-        dpctl_error(dpctl_p, error, "opening datapath");
+        dpctl_error(dpctl_p, error, "%s:%d opening datapath",
+                    argv[1], __LINE__);
         return error;
     }
     for (i = 2; i < argc; i++) {
@@ -324,7 +326,8 @@ dpctl_set_if(int argc, const char *argv[], struct dpctl_params *dpctl_p)
 
     error = parsed_dpif_open(argv[1], false, &dpif);
     if (error) {
-        dpctl_error(dpctl_p, error, "opening datapath");
+        dpctl_error(dpctl_p, error, "%s:%d opening datapath",
+                    argv[1], __LINE__);
         return error;
     }
     for (i = 2; i < argc; i++) {
@@ -459,7 +462,8 @@ dpctl_del_if(int argc, const char *argv[], struct dpctl_params *dpctl_p)
 
     error = parsed_dpif_open(argv[1], false, &dpif);
     if (error) {
-        dpctl_error(dpctl_p, error, "opening datapath");
+        dpctl_error(dpctl_p, error, "%s:%d opening datapath",
+                    argv[1], __LINE__);
         return error;
     }
     for (i = 2; i < argc; i++) {
@@ -838,7 +842,8 @@ dpctl_dump_flows(int argc, const char *argv[], struct dpctl_params *dpctl_p)
     error = parsed_dpif_open(name, false, &dpif);
     free(name);
     if (error) {
-        dpctl_error(dpctl_p, error, "opening datapath");
+        dpctl_error(dpctl_p, error, "%s:%d opening datapath",
+                    argv[1], __LINE__);
         goto out_free;
     }
 
@@ -974,7 +979,8 @@ dpctl_put_flow(int argc, const char *argv[], enum dpif_flow_put_flags flags,
     error = parsed_dpif_open(dp_name, false, &dpif);
     free(dp_name);
     if (error) {
-        dpctl_error(dpctl_p, error, "opening datapath");
+        dpctl_error(dpctl_p, error, "%s:%d opening datapath",
+                    argv[1], __LINE__);
         return error;
     }
 
@@ -1086,7 +1092,8 @@ dpctl_get_flow(int argc, const char *argv[], struct dpctl_params *dpctl_p)
     error = parsed_dpif_open(dp_name, false, &dpif);
     free(dp_name);
     if (error) {
-        dpctl_error(dpctl_p, error, "opening datapath");
+        dpctl_error(dpctl_p, error, "%s:%d opening datapath",
+                    argv[1], __LINE__);
         return error;
     }
 
@@ -1145,7 +1152,8 @@ dpctl_del_flow(int argc, const char *argv[], struct dpctl_params *dpctl_p)
     error = parsed_dpif_open(dp_name, false, &dpif);
     free(dp_name);
     if (error) {
-        dpctl_error(dpctl_p, error, "opening datapath");
+        dpctl_error(dpctl_p, error, "%s:%d opening datapath",
+                    argv[1], __LINE__);
         return error;
     }
 
@@ -1225,7 +1233,8 @@ dpctl_del_flows(int argc, const char *argv[], struct dpctl_params *dpctl_p)
     error = parsed_dpif_open(name, false, &dpif);
     free(name);
     if (error) {
-        dpctl_error(dpctl_p, error, "opening datapath");
+        dpctl_error(dpctl_p, error, "%s:%d opening datapath",
+                    argv[1], __LINE__);
         return error;
     }
 
@@ -1294,7 +1303,8 @@ dpctl_dump_conntrack(int argc, const char *argv[],
     error = parsed_dpif_open(name, false, &dpif);
     free(name);
     if (error) {
-        dpctl_error(dpctl_p, error, "opening datapath");
+        dpctl_error(dpctl_p, error, "%s:%d opening datapath",
+                    argv[1], __LINE__);
         return error;
     }
 
@@ -1360,7 +1370,8 @@ dpctl_flush_conntrack(int argc, const char *argv[],
         error = parsed_dpif_open(name, false, &dpif);
         free(name);
         if (error) {
-            dpctl_error(dpctl_p, error, "opening datapath");
+            dpctl_error(dpctl_p, error, "%s:%d opening datapath",
+                    argv[1], __LINE__);
             return error;
         }
     }
@@ -1444,7 +1455,8 @@ dpctl_ct_stats_show(int argc, const char *argv[],
     error = parsed_dpif_open(name, false, &dpif);
     free(name);
     if (error) {
-        dpctl_error(dpctl_p, error, "opening datapath");
+        dpctl_error(dpctl_p, error, "%s:%d opening datapath",
+                    argv[1], __LINE__);
         return error;
     }
 
@@ -1581,7 +1593,8 @@ dpctl_ct_bkts(int argc, const char *argv[],
     error = parsed_dpif_open(name, false, &dpif);
     free(name);
     if (error) {
-        dpctl_error(dpctl_p, error, "opening datapath");
+        dpctl_error(dpctl_p, error, "%s:%d opening datapath",
+                    argv[1], __LINE__);
         return error;
     }
 
-- 
1.8.3.1