Changeset 46326 in vbox for trunk/src/VBox/VMM

Timestamp:

May 30, 2013 12:16:53 PM (12 years ago)

Author:

vboxsync

Message:

RT_STR_TUPLE

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAll.cpp (modified) (2 diffs)
• VMMAll/VMMAll.cpp (modified) (1 diff)
• VMMR0/GVMMR0.cpp (modified) (2 diffs)
• VMMR3/CPUM.cpp (modified) (1 diff)
• VMMR3/DBGFLog.cpp (modified) (2 diffs)
• VMMR3/FTM.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAll.cpp

@@ -2659 +2659 @@
     }
     else
-        cch = pfnOutput(pvArgOutput, "<bad-pgmpage-ptr>", sizeof("<bad-pgmpage-ptr>") - 1);
+        cch = pfnOutput(pvArgOutput, RT_STR_TUPLE("<bad-pgmpage-ptr>"));
     NOREF(pszType); NOREF(cchWidth); NOREF(pvUser);
     return cch;
@@ -2681 +2681 @@
     }
     else
-        cch = pfnOutput(pvArgOutput, "<bad-pgmramrange-ptr>", sizeof("<bad-pgmramrange-ptr>") - 1);
+        cch = pfnOutput(pvArgOutput, RT_STR_TUPLE("<bad-pgmramrange-ptr>"));
     NOREF(pszType); NOREF(cchWidth); NOREF(cchPrecision); NOREF(pvUser); NOREF(fFlags);
     return cch;

trunk/src/VBox/VMM/VMMAll/VMMAll.cpp

@@ -94 +94 @@
     }
     if (cCpus == 0)
-        return pfnOutput(pvArgOutput, "<empty>", sizeof("<empty>") - 1);
+        return pfnOutput(pvArgOutput, RT_STR_TUPLE("<empty>"));
     if (cCpus == RT_ELEMENTS(pSet->au32Bitmap) * 32)
-        return pfnOutput(pvArgOutput, "<full>", sizeof("<full>") - 1);
+        return pfnOutput(pvArgOutput, RT_STR_TUPLE("<full>"));
 
     /*

trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp

@@ -545 +545 @@
      * String switch time!
      */
-    if (strncmp(pszName, "/GVMM/", sizeof("/GVMM/") - 1))
+    if (strncmp(pszName, RT_STR_TUPLE("/GVMM/")))
         return VERR_CFGM_VALUE_NOT_FOUND; /* borrow status codes from CFGM... */
     int rc = VINF_SUCCESS;
@@ -613 +613 @@
      * String switch time!
      */
-    if (strncmp(pszName, "/GVMM/", sizeof("/GVMM/") - 1))
+    if (strncmp(pszName, RT_STR_TUPLE("/GVMM/")))
         return VERR_CFGM_VALUE_NOT_FOUND; /* borrow status codes from CFGM... */
     int rc = VINF_SUCCESS;

trunk/src/VBox/VMM/VMMR3/CPUM.cpp

@@ -3026 +3026 @@
     else
     {
-        if (!strncmp(pszArgs, "verbose", sizeof("verbose") - 1))
+        if (!strncmp(pszArgs, RT_STR_TUPLE("verbose")))
         {
             pszArgs += 7;
             *penmType = CPUMDUMPTYPE_VERBOSE;
         }
-        else if (!strncmp(pszArgs, "terse", sizeof("terse") - 1))
+        else if (!strncmp(pszArgs, RT_STR_TUPLE("terse")))
         {
             pszArgs += 5;
             *penmType = CPUMDUMPTYPE_TERSE;
         }
-        else if (!strncmp(pszArgs, "default", sizeof("default") - 1))
+        else if (!strncmp(pszArgs, RT_STR_TUPLE("default")))
         {
             pszArgs += 7;

trunk/src/VBox/VMM/VMMR3/DBGFLog.cpp

@@ -42 +42 @@
     PRTLOGGER   pLogger;
     const char *psz = *ppsz;
-    if (!strncmp(psz, "release:", sizeof("release:") - 1))
+    if (!strncmp(psz, RT_STR_TUPLE("release:")))
     {
         *ppsz += sizeof("release:") - 1;
@@ -49 +49 @@
     else
     {
-        if (!strncmp(psz, "debug:", sizeof("debug:") - 1))
+        if (!strncmp(psz, RT_STR_TUPLE("debug:")))
             *ppsz += sizeof("debug:") - 1;
         pLogger = RTLogDefaultInstance();

trunk/src/VBox/VMM/VMMR3/FTM.cpp

@@ -198 +198 @@
 static int ftmR3TcpWriteACK(PVM pVM)
 {
-    int rc = RTTcpWrite(pVM->ftm.s.hSocket, "ACK\n", sizeof("ACK\n") - 1);
+    int rc = RTTcpWrite(pVM->ftm.s.hSocket, RT_STR_TUPLE("ACK\n"));
     if (RT_FAILURE(rc))
     {
@@ -286 +286 @@
         return VINF_SUCCESS;
 
-    if (!strncmp(szMsg, "NACK=", sizeof("NACK=") - 1))
+    if (!strncmp(szMsg, RT_STR_TUPLE("NACK=")))
     {
         char *pszMsgText = strchr(szMsg, ';');
@@ -334 +334 @@
 static int ftmR3TcpSubmitCommand(PVM pVM, const char *pszCommand, bool fWaitForAck = true)
 {
-    int rc = RTTcpSgWriteL(pVM->ftm.s.hSocket, 2, pszCommand, strlen(pszCommand), "\n", sizeof("\n") - 1);
+    int rc = RTTcpSgWriteL(pVM->ftm.s.hSocket, 2, pszCommand, strlen(pszCommand), RT_STR_TUPLE("\n"));
     if (RT_FAILURE(rc))
         return rc;