Changeset 41554 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Jun 3, 2012 10:33:25 PM (13 years ago)

Author:

vboxsync

Message:

RTErrGet: Don't immediately return values ending with _FIRST, _LAST, _LOWEST or _HIGHEST.

File:

• trunk/src/VBox/Runtime/common/err/errmsg.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/err/errmsg.cpp

@@ -86 +86 @@
              * one of those start/end #defines before we return.
              */
-            if (    !strstr(g_aStatusMsgs[i].pszDefine, "FIRST")
-                &&  !strstr(g_aStatusMsgs[i].pszDefine, "LAST"))
+#define STR_ENDS_WITH(a_psz, a_cch, a_sz) \
+    ( (a_cch) >= sizeof(a_sz) && !strncmp((a_psz) + (a_cch) - sizeof(a_sz) + 1, RT_STR_TUPLE(a_sz)) )
+            size_t const cchDefine = strlen(g_aStatusMsgs[i].pszDefine);
+            if (   !STR_ENDS_WITH(g_aStatusMsgs[i].pszDefine, cchDefine, "_FIRST")
+                && !STR_ENDS_WITH(g_aStatusMsgs[i].pszDefine, cchDefine, "_LAST")
+                && !STR_ENDS_WITH(g_aStatusMsgs[i].pszDefine, cchDefine, "_LOWEST")
+                && !STR_ENDS_WITH(g_aStatusMsgs[i].pszDefine, cchDefine, "_HIGHEST")
+               )
                 return &g_aStatusMsgs[i];
             iFound = i;