Changeset 94913 in vbox

Timestamp:

May 8, 2022 7:07:29 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

151321

Message:

scm: New heuristic to trigger only on 'HRESULT rc' and 'int rc' declarations as the other one was too broad and triggered on things which we don't want it to trigger on, bugref:10223

File:

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

trunk/src/bldprogs/scmrw.cpp

@@ -3391 +3391 @@
         }
 
+#if 0 /* This is too broad and triggers on things we don't want to trigger on (like autoCaller.rc()). */
         const RTSTRTUPLE RcTuple = { RT_STR_TUPLE("rc") };
         size_t const cchWord = RcTuple.cch;
@@ -3415 +3416 @@
             }
         }
+#else
+        /* Trigger on declarations of 'HRESULT rc' and 'int rc'. */
+        static const SCMMATCHWORD s_aHresultRc[] =
+        {
+            { RT_STR_TUPLE("HRESULT"),                  0, true, false },
+            { RT_STR_TUPLE("rc"),                       1, true, false }
+        };
+
+        static const SCMMATCHWORD s_aIntRc[] =
+        {
+            { RT_STR_TUPLE("int"),                      0, true, false },
+            { RT_STR_TUPLE("rc"),                       1, true, false }
+        };
+
+        rc = ScmMatchWords(pchLine, cchLine, s_aHresultRc, RT_ELEMENTS(s_aHresultRc),
+                           &offNext, NULL /*paIdentifiers*/, RTErrInfoInitStatic(&ErrInfo));
+        if (RT_SUCCESS(rc))
+        {
+            ScmFixManually(pState, "%u:%zu: 'HRESULT rc' is not allowed! Use 'HRESULT hrc' instead.\n",
+                           iLine, offNext);
+            continue;
+        }
+
+        rc = ScmMatchWords(pchLine, cchLine, s_aIntRc, RT_ELEMENTS(s_aIntRc),
+                           &offNext, NULL /*paIdentifiers*/, RTErrInfoInitStatic(&ErrInfo));
+        if (RT_SUCCESS(rc))
+        {
+            ScmFixManually(pState, "%u:%zu: 'int rc' is not allowed! Use 'int vrc' instead.\n",
+                           iLine, offNext);
+            continue;
+        }
+#endif
     }