Changeset 54067 in vbox for trunk/src/bldprogs/VBoxTpG.cpp

Timestamp:

Feb 3, 2015 11:12:16 AM (10 years ago)

Author:

vboxsync

Message:

try address the 'char *' conversion warnings on solaris.

File:

• trunk/src/bldprogs/VBoxTpG.cpp (modified) (2 diffs)

trunk/src/bldprogs/VBoxTpG.cpp

@@ -1183 +1183 @@
                         ScmStreamPrintf(pStrm, ", (%s)%M", pArg->pszTracerType, pszFmt, pArg->pszName);
                 }
+                else if (pArg->fType & VTG_TYPE_CONST_CHAR_PTR)
+                {
+                    /* Casting from 'const char *' (probe) to 'char *' (dtrace) is required to shut up warnings. */
+                    pszFmt += sizeof(", ") - 1;
+                    if (RTListNodeIsFirst(&pProbe->ArgHead, &pArg->ListEntry))
+                        ScmStreamPrintf(pStrm, "(char *)%M", pszFmt, pArg->pszName);
+                    else
+                        ScmStreamPrintf(pStrm, ", (char *)%M", pszFmt, pArg->pszName);
+                }
                 else
                 {
@@ -1653 +1662 @@
      * Try detect pointers.
      */
-    if (pszType[cchType - 1] == '*')    return VTG_TYPE_POINTER;
+    if (pszType[cchType - 1] == '*')
+    {
+        if (MY_STRMATCH("const char *")) return VTG_TYPE_POINTER | VTG_TYPE_CONST_CHAR_PTR;
+        return VTG_TYPE_POINTER;
+    }
     if (pszType[cchType - 1] == '&')
     {