VirtualBox

Changeset 98280 in vbox for trunk


Ignore:
Timestamp:
Jan 24, 2023 11:58:44 AM (21 months ago)
Author:
vboxsync
Message:

Main/src-global: rc -> hrc/vrc. Make scm check this dir now. bugref:10223

Location:
trunk/src/VBox/Main
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Main/.scm-settings

    r98277 r98280  
    5555
    5656/src-client/*cpp: --no-rc-use
     57/src-global/*cpp: --no-rc-use
    5758
    5859# IDL and XML
  • trunk/src/VBox/Main/src-global/win/VBoxSDS.cpp

    r98103 r98280  
    554554        {
    555555            // copy service name
    556             int rc = ::RTUtf16Copy(m_wszServiceName, sizeof(m_wszServiceName), p_wszServiceName);
    557             AssertRCReturn(rc, E_NOT_SUFFICIENT_BUFFER);
    558             rc = ::RTUtf16Copy(m_wszServiceDisplayName, sizeof(m_wszServiceDisplayName), p_wszDisplayName);
    559             AssertRCReturn(rc, E_NOT_SUFFICIENT_BUFFER);
    560             rc = ::RTUtf16Copy(m_wszServiceDescription, sizeof(m_wszServiceDescription), p_wszDescription);
    561             AssertRCReturn(rc, E_NOT_SUFFICIENT_BUFFER);
     556            int vrc = ::RTUtf16Copy(m_wszServiceName, sizeof(m_wszServiceName), p_wszServiceName);
     557            AssertRCReturn(vrc, E_NOT_SUFFICIENT_BUFFER);
     558            vrc = ::RTUtf16Copy(m_wszServiceDisplayName, sizeof(m_wszServiceDisplayName), p_wszDisplayName);
     559            AssertRCReturn(vrc, E_NOT_SUFFICIENT_BUFFER);
     560            vrc = ::RTUtf16Copy(m_wszServiceDescription, sizeof(m_wszServiceDescription), p_wszDescription);
     561            AssertRCReturn(vrc, E_NOT_SUFFICIENT_BUFFER);
    562562
    563563            m_fInitialized = true;
     
    652652                {
    653653                    char szDest[1024];
    654                     int rc = ::RTLogQueryDestinations(pReleaseLogger, szDest, sizeof(szDest));
    655                     if (RT_SUCCESS(rc))
     654                    int vrc = ::RTLogQueryDestinations(pReleaseLogger, szDest, sizeof(szDest));
     655                    if (RT_SUCCESS(vrc))
    656656                    {
    657                         rc = ::RTStrCat(szDest, sizeof(szDest), " nohistory");
    658                         if (RT_SUCCESS(rc))
     657                        vrc = ::RTStrCat(szDest, sizeof(szDest), " nohistory");
     658                        if (RT_SUCCESS(vrc))
    659659                        {
    660                             rc = ::RTLogDestinations(pReleaseLogger, szDest);
    661                             AssertRC(rc);
     660                            vrc = ::RTLogDestinations(pReleaseLogger, szDest);
     661                            AssertRC(vrc);
    662662                        }
    663663                    }
  • trunk/src/VBox/Main/src-global/win/VirtualBoxSDSImpl.cpp

    r98103 r98280  
    11591159                /* Start the thread and we're good. */
    11601160                m_papWatchers[m_cWatchers++] = pWatcher;
    1161                 int rc = RTThreadCreateF(&pWatcher->hThread, i_watcherThreadProc, pWatcher, 0, RTTHREADTYPE_MAIN_WORKER,
    1162                                          RTTHREADFLAGS_WAITABLE, "watcher%u", pWatcher->iWatcher);
    1163                 if (RT_SUCCESS(rc))
     1161                int vrc = RTThreadCreateF(&pWatcher->hThread, i_watcherThreadProc, pWatcher, 0, RTTHREADTYPE_MAIN_WORKER,
     1162                                          RTTHREADFLAGS_WAITABLE, "watcher%u", pWatcher->iWatcher);
     1163                if (RT_SUCCESS(vrc))
    11641164                {
    11651165                    LogRel(("i_watchIt: Created new watcher #%u\n", m_cWatchers));
     
    11701170                }
    11711171
    1172                 LogRel(("i_watchIt: Error starting watcher thread: %Rrc\n", rc));
     1172                LogRel(("i_watchIt: Error starting watcher thread: %Rrc\n", vrc));
    11731173                m_papWatchers[--m_cWatchers] = NULL;
    11741174
     
    13291329            m_papWatchers[i] = NULL;
    13301330
    1331             int rc = RTThreadWait(pWatcher->hThread, RT_MS_1MIN / 2, NULL);
    1332             if (RT_SUCCESS(rc))
     1331            int vrc = RTThreadWait(pWatcher->hThread, RT_MS_1MIN / 2, NULL);
     1332            if (RT_SUCCESS(vrc))
    13331333                pWatcher->hThread = NIL_RTTHREAD;
    13341334            else
    1335                 LogRel(("i_shutdownAllWatchers: RTThreadWait failed on #%u: %Rrc\n", i, rc));
     1335                LogRel(("i_shutdownAllWatchers: RTThreadWait failed on #%u: %Rrc\n", i, vrc));
    13361336
    13371337            if (ASMAtomicDecU32(&pWatcher->cRefs) == 0)
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette