- Timestamp:
- Aug 15, 2016 5:19:46 PM (8 years ago)
- Location:
- trunk/src/VBox
- Files:
-
- 1 added
- 9 edited
-
Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp (modified) (1 diff)
-
Additions/common/VBoxService/VBoxServiceBalloon.cpp (modified) (1 diff)
-
Additions/darwin/VBoxClient/VBoxClientClipboard.cpp (modified) (1 diff)
-
Frontends/VBoxBalloonCtrl/VBoxWatchdog.cpp (modified) (1 diff)
-
HostDrivers/VBoxUSB/darwin/testcase/Makefile.kup (added)
-
HostDrivers/VBoxUSB/darwin/testcase/tstOpenUSBDev.cpp (modified) (5 diffs)
-
HostServices/SharedClipboard/service.cpp (modified) (2 diffs)
-
Main/src-helper-apps/VBoxExtPackHelperApp.cpp (modified) (2 diffs)
-
Storage/VD.cpp (modified) (8 diffs)
-
Storage/VHDX.cpp (modified) (10 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp
r63338 r63495 332 332 g_File = NIL_RTFILE; 333 333 kern_return_t kr = IOServiceClose(uConnection); 334 AssertMsg(kr == kIOReturnSuccess, ("%#x (%d)\n", kr, kr)); 334 AssertMsg(kr == kIOReturnSuccess, ("%#x (%d)\n", kr, kr)); NOREF(kr); 335 335 int rc = RTFileClose(hFile); 336 336 AssertRC(rc); -
trunk/src/VBox/Additions/common/VBoxService/VBoxServiceBalloon.cpp
r62521 r63495 75 75 static void **g_pavBalloon = NULL; 76 76 77 #ifdef RT_OS_LINUX 77 78 /** True = madvise(MADV_DONTFORK) works, false otherwise. */ 78 79 static bool g_fSysMadviseWorks; 80 #endif 79 81 80 82 -
trunk/src/VBox/Additions/darwin/VBoxClient/VBoxClientClipboard.cpp
r62523 r63495 146 146 * Forwards cliproard content between host and guest. 147 147 * 148 * @param ThreadSelf Unused parameter.148 * @param hThreadSelf Unused parameter. 149 149 * @param pvUser Unused parameter. 150 150 * 151 151 * @return IPRT status code. 152 152 */ 153 static DECLCALLBACK(int) vbclGuestPasteboardPoll(RTTHREAD ThreadSelf, void *pvUser) 154 { 153 static DECLCALLBACK(int) vbclGuestPasteboardPoll(RTTHREAD hThreadSelf, void *pvUser) 154 { 155 RT_NOREF(hThreadSelf, pvUser); 156 155 157 /* 156 158 * Block all signals for this thread. Only the main thread will handle signals. -
trunk/src/VBox/Frontends/VBoxBalloonCtrl/VBoxWatchdog.cpp
r63384 r63495 372 372 AssertRC(rc2); 373 373 374 mapVMIter it = g_mapVM.find(strUuid); 375 Assert(it == g_mapVM.end()); 374 Assert(g_mapVM.find(strUuid) == g_mapVM.end()); 376 375 g_mapVM.insert(std::make_pair(strUuid, m)); 377 376 serviceLogVerbose(("Added machine \"%ls\"\n", strUuid.raw())); -
trunk/src/VBox/HostDrivers/VBoxUSB/darwin/testcase/tstOpenUSBDev.cpp
r62490 r63495 80 80 81 81 82 static int tstDoWork(io_object_t USBDevice, mach_port_t MasterPort,const char *argv0)82 static int tstDoWork(io_object_t USBDevice, const char *argv0) 83 83 { 84 84 /* … … 190 190 191 191 int ch; 192 int i = 1;193 192 RTGETOPTUNION ValueUnion; 194 193 RTGETOPTSTATE GetState; … … 218 217 * Open the master port. 219 218 */ 220 mach_port_t MasterPort = NULL;219 mach_port_t MasterPort = MACH_PORT_NULL; 221 220 krc = IOMasterPort(MACH_PORT_NULL, &MasterPort); 222 221 if (krc != KERN_SUCCESS) … … 236 235 } 237 236 238 io_iterator_t USBDevices = NULL;237 io_iterator_t USBDevices = IO_OBJECT_NULL; 239 238 IOReturn irc = IOServiceGetMatchingServices(MasterPort, RefMatchingDict, &USBDevices); 240 239 if (irc != kIOReturnSuccess) … … 267 266 cMatches++; 268 267 CFRelease(PropsRef); 269 tstDoWork(USBDevice, MasterPort,argv[0]);268 tstDoWork(USBDevice, argv[0]); 270 269 } 271 270 else -
trunk/src/VBox/HostServices/SharedClipboard/service.cpp
r62792 r63495 749 749 } 750 750 751 #ifndef UNIT_TEST 751 752 /** 752 753 * SSM descriptor table for the VBOXCLIPBOARDCLIENTDATA structure. … … 761 762 SSMFIELD_ENTRY_TERM() 762 763 }; 764 #endif 763 765 764 766 static DECLCALLBACK(int) svcSaveState(void *, uint32_t u32ClientID, void *pvClient, PSSMHANDLE pSSM) -
trunk/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp
r62875 r63495 1351 1351 1352 1352 #elif defined(RT_OS_DARWIN) 1353 RT_NOREF(pszDisplayInfoHack); 1353 1354 char szIconName[RTPATH_MAX]; 1354 1355 int rc = RTPathAppPrivateArch(szIconName, sizeof(szIconName)); … … 1387 1388 */ 1388 1389 FILE *pSocketStrm; 1390 #if defined(__clang__) || RT_GNUC_PREREQ(4, 4) 1391 # pragma GCC diagnostic push 1392 #endif 1393 #pragma GCC diagnostic ignored "-Wdeprecated-declarations" 1389 1394 orc = AuthorizationExecuteWithPrivileges(AuthRef, pszExecPath, kAuthorizationFlagDefaults, 1390 1395 (char * const *)&papszArgs[cSuArgs + 3], 1391 1396 &pSocketStrm); 1397 #if defined(__clang__) || RT_GNUC_PREREQ(4, 4) 1398 # pragma GCC diagnostic pop 1399 #endif 1392 1400 if (orc == errAuthorizationSuccess) 1393 1401 { -
trunk/src/VBox/Storage/VD.cpp
r62873 r63495 659 659 /** Array of pointers to the filters backends. */ 660 660 static PCVDFILTERBACKEND *g_apFilterBackends = NULL; 661 #ifndef VBOX_HDD_NO_DYNAMIC_BACKENDS 661 662 /** Array of handles to the corresponding plugin. */ 662 static RTLDRMOD *g_ahFilterBackendPlugins = NULL; 663 static PRTLDRMOD g_pahFilterBackendPlugins = NULL; 664 #endif 663 665 664 666 /** Forward declaration of the async discard helper. */ … … 692 694 } 693 695 696 #ifndef VBOX_HDD_NO_DYNAMIC_BACKENDS 694 697 /** 695 698 * internal: add single backend. … … 699 702 return vdAddBackends(hPlugin, &pBackend, 1); 700 703 } 704 #endif 701 705 702 706 /** … … 723 727 } 724 728 729 #ifndef VBOX_HDD_NO_DYNAMIC_BACKENDS 730 725 731 /** 726 732 * internal: add single cache backend. … … 730 736 return vdAddCacheBackends(hPlugin, &pBackend, 1); 731 737 } 738 732 739 733 740 /** … … 747 754 g_apFilterBackends = pTmp; 748 755 749 RTLDRMOD *pTmpPlugins = (RTLDRMOD*)RTMemRealloc(g_ahFilterBackendPlugins,750 (g_cFilterBackends + cBackends) * sizeof(RTLDRMOD));756 PRTLDRMOD pTmpPlugins = (PRTLDRMOD)RTMemRealloc(g_pahFilterBackendPlugins, 757 (g_cFilterBackends + cBackends) * sizeof(RTLDRMOD)); 751 758 if (RT_UNLIKELY(!pTmpPlugins)) 752 759 return VERR_NO_MEMORY; 753 760 754 g_ ahFilterBackendPlugins = pTmpPlugins;761 g_pahFilterBackendPlugins = pTmpPlugins; 755 762 memcpy(&g_apFilterBackends[g_cFilterBackends], ppBackends, cBackends * sizeof(PCVDFILTERBACKEND)); 756 763 for (unsigned i = g_cFilterBackends; i < g_cFilterBackends + cBackends; i++) 757 g_ ahFilterBackendPlugins[i] = hPlugin;764 g_pahFilterBackendPlugins[i] = hPlugin; 758 765 g_cFilterBackends += cBackends; 759 766 return VINF_SUCCESS; 760 767 } 768 761 769 762 770 /** … … 771 779 return vdAddFilterBackends(hPlugin, &pBackend, 1); 772 780 } 781 782 #endif /* VBOX_HDD_NO_DYNAMIC_BACKENDS*/ 773 783 774 784 /** … … 3647 3657 for (unsigned i = 0; i < g_cFilterBackends; i++) 3648 3658 { 3649 while (i < g_cFilterBackends && g_ ahFilterBackendPlugins[i] == pIt->hPlugin)3659 while (i < g_cFilterBackends && g_pahFilterBackendPlugins[i] == pIt->hPlugin) 3650 3660 { 3651 3661 memcpy(&g_apFilterBackends[i], &g_apFilterBackends[i + 1], (g_cFilterBackends - i - 1) * sizeof(PCVBOXHDDBACKEND)); 3652 memcpy(&g_ ahFilterBackendPlugins[i], &g_ahFilterBackendPlugins[i + 1], (g_cFilterBackends - i - 1) * sizeof(RTLDRMOD));3662 memcpy(&g_pahFilterBackendPlugins[i], &g_pahFilterBackendPlugins[i + 1], (g_cFilterBackends - i - 1) * sizeof(RTLDRMOD)); 3653 3663 /** @todo for now skip reallocating, doesn't save much */ 3654 3664 g_cFilterBackends--; -
trunk/src/VBox/Storage/VHDX.cpp
r62743 r63495 708 708 } 709 709 710 #if 0 /* unused */ 711 710 712 /** 711 713 * Converts a VHDX log entry header between file and host endianness. … … 752 754 } 753 755 756 754 757 /** 755 758 * Converts a VHDX log data descriptor between file and host endianness. … … 772 775 } 773 776 777 774 778 /** 775 779 * Converts a VHDX log data sector between file and host endianness. … … 789 793 pLogDataSectorConv->u32SequenceLow = SET_ENDIAN_U32(pLogDataSector->u32SequenceLow); 790 794 } 795 796 #endif /* unused */ 791 797 792 798 /** … … 880 886 } 881 887 888 #if 0 /* unused */ 889 882 890 /** 883 891 * Converts a VHDX page 83 data item between file and host endianness. … … 895 903 vhdxConvUuidEndianess(enmConv, &pPage83DataConv->UuidPage83Data, &pPage83Data->UuidPage83Data); 896 904 } 905 #endif /* unused */ 897 906 898 907 /** … … 912 921 } 913 922 923 #if 0 /* unused */ 924 914 925 /** 915 926 * Converts a VHDX physical sector size item between file and host endianness. … … 928 939 } 929 940 941 930 942 /** 931 943 * Converts a VHDX parent locator header item between file and host endianness. … … 946 958 } 947 959 960 948 961 /** 949 962 * Converts a VHDX parent locator entry between file and host endianness. … … 964 977 pParentLocatorEntryConv->u16ValueLength = SET_ENDIAN_U16(pParentLocatorEntry->u16ValueLength); 965 978 } 979 980 #endif /* unused */ 966 981 967 982 /**
Note:
See TracChangeset
for help on using the changeset viewer.

