Changeset 62453 in vbox for trunk

Timestamp:

Jul 22, 2016 3:20:39 PM (8 years ago)

Author:

vboxsync

Message:

*: MSC level 4 warnings in release bldprogs.

File:

• trunk/src/VBox/Runtime/common/string/uniread.cpp (modified) (11 diffs)

trunk/src/VBox/Runtime/common/string/uniread.cpp

@@ -60 +60 @@
  * @param   ...                 Format arguments.
  */
-static void ParseError(const char *pszFormat, ...)
+static DECL_NO_RETURN(void) ParseError(const char *pszFormat, ...)
 {
     va_list va;
@@ -198 +198 @@
     {
         ParseError("Bad Decomposition Type/Mappings\n");
-        return *ppszType;
+        /* not reached: return *ppszType; */
     }
     *psz++ = '\0';
@@ -256 +256 @@
             {
                 ParseError("failed converting '%s' to a number!\n", psz);
-                return ~(RTUNICP)0;
+                /* not reached: return ~(RTUNICP)0;*/
             }
         }
@@ -262 +262 @@
         {
             ParseError("failed converting '%s' to a number!\n", psz);
-            return ~(RTUNICP)0;
+            /* not reached: return ~(RTUNICP)0; */
         }
     }
@@ -299 +299 @@
         {
             ParseError("Too many mappings.\n");
-            break;
+            /* not reached: break; */
         }
         if (i >= cAlloc)
@@ -593 +593 @@
         {
             ParseError("U+05X is out of range\n", CodePoint);
-            continue;
+            /* not reached: continue;*/
         }
 
@@ -602 +602 @@
         {
             ParseError("i=%d CodePoint=%u\n", i, CodePoint);
-            CloseFile(pFile);
-            return 1;
+            /* not reached: CloseFile(pFile);
+            return 1; */
         }
 
@@ -675 +675 @@
 {
     if (!**ppszNextField)
-    {
         ParseError("Missing Y/N/M field\n");
-        return 0;
-    }
-    char *psz = NextField(ppszNextField);
-    if (!strcmp(psz, "N"))
-        return 0;
-    if (!strcmp(psz, "Y"))
-        return 1;
-    if (!strcmp(psz, "M"))
-        return 2;
-    ParseError("Unexpected Y/N/M value: '%s'\n",  psz);
-    return 0;
+    else
+    {
+        char *psz = NextField(ppszNextField);
+        if (!strcmp(psz, "N"))
+            return 0;
+        if (!strcmp(psz, "Y"))
+            return 1;
+        if (!strcmp(psz, "M"))
+            return 2;
+        ParseError("Unexpected Y/N/M value: '%s'\n",  psz);
+    }
+    /* not reached: return 0; */
 }
 
@@ -721 +721 @@
     {
         ParseError("U+%06X is out of the g_aCPInfo range.\n", StartCP);
-        return;
+        /* not reached: return; */
     }
     struct CPINFO *pCPInfo = &g_aCPInfo[StartCP];
@@ -792 +792 @@
     {
         ParseError("Unknown property '%s'\n", pszProperty);
-        return;
+        /* not reached: return; */
     }
 
@@ -834 +834 @@
         {
             ParseError("no property field.\n");
-            continue;
+            /* not reached: continue; */
         }