commit 02653ca867156d01e0784474cbb539ddfc149472
author Joseph Reynolds <jrey@us.ibm.com> Thu May 10 15:55:09 2018 -0500
committer Joseph Reynolds <jrey@us.ibm.com> Wed May 30 09:15:54 2018 -0500
tree 1866f7c875b1a7c6dbd56435deed205afe93c09a
parent 269501c56f6e082a9d5ad8afae291037f5007844

Use s.c_str() in log messages

Partly resolves openbmc/openbmc 2905

Bonus!  The new static_assert found a related bug in log.cpp:
  log("msg", entry("fmt", data, entry("fmt", data)))
which should have been:
  log("msg", entry("fmt", data), entry("fmt", data))

Tested: static_assert only

Change-Id: Ie1c550a27f454ef92ee096d812adcc400a1a25cf
Signed-off-by: Joseph Reynolds <jrey@us.ibm.com>

util.cpp

diff --git a/util.cpp b/util.cpp
index c4e989a..9527426 100644
--- a/util.cpp
+++ b/util.cpp
@@ -57,7 +57,7 @@
         if (sscanf(str.c_str(), "%hx", &buff) <= 0)
         {
             log<level::ERR>("Invalid Mask",
-                            entry("SUBNETMASK=%s", subnetMask));
+                            entry("SUBNETMASK=%s", subnetMask.c_str()));
 
             return 0;
         }
@@ -72,7 +72,7 @@
             if (((sizeof(buff) * 8) - (__builtin_ctz(buff))) != __builtin_popcount(buff))
             {
                 log<level::ERR>("Invalid Mask",
-                                entry("SUBNETMASK=%s", subnetMask));
+                                entry("SUBNETMASK=%s", subnetMask.c_str()));
 
                 return 0;
             }
@@ -101,7 +101,7 @@
     if (rc <= 0)
     {
         log<level::ERR>("inet_pton failed:",
-                        entry("SUBNETMASK=%s", subnetMask));
+                        entry("SUBNETMASK=%s", subnetMask.c_str()));
         return 0;
     }
 
@@ -114,7 +114,7 @@
     else
     {
         log<level::ERR>("Invalid Mask",
-                        entry("SUBNETMASK=%s", subnetMask));
+                        entry("SUBNETMASK=%s", subnetMask.c_str()));
         return 0;
     }
 }
@@ -384,8 +384,8 @@
         if(status < 0)
         {
             log<level::ERR>("Unable to delete the interface",
-                             entry("INTF=%s", intf.c_str(),
-                             entry("STATUS=%d", status)));
+                            entry("INTF=%s", intf.c_str()),
+                            entry("STATUS=%d", status));
             elog<InternalFailure>();
         }
     }
@@ -473,8 +473,8 @@
             }
 
             log<level::ERR>("Unable to execute the command",
-                            entry("CMD=%s", command.c_str(),
-                            entry("STATUS=%d", status)));
+                            entry("CMD=%s", command.c_str()),
+                            entry("STATUS=%d", status));
             elog<InternalFailure>();
         }
     }