From 24a6003c4c348a6e9965df26423db9649336582b Mon Sep 17 00:00:00 2001 From: vboxsync Date: Tue, 24 Oct 2017 15:01:30 +0000 Subject: Runtime: scm cleanups git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@69219 cfe28804-0f27-0410-a406-dd0f0b0b656f --- src/VBox/Runtime/.scm-settings | 60 +++++++++++++++++++--- src/VBox/Runtime/common/asm/ASMBitFirstSetU64.asm | 1 - src/VBox/Runtime/common/asm/ASMBitNextClear.asm | 1 - src/VBox/Runtime/common/asm/ASMBitNextSet.asm | 1 - src/VBox/Runtime/common/asm/ASMGetLDTR.asm | 2 +- src/VBox/Runtime/common/asm/ASMGetTR.asm | 2 +- .../Runtime/common/asm/ASMMultU64ByU32DivByU32.asm | 1 - src/VBox/Runtime/common/checksum/crc16ccitt.cpp | 2 +- src/VBox/Runtime/common/err/errmsgcom.sed | 1 + src/VBox/Runtime/common/fs/isovfs.cpp | 1 + src/VBox/Runtime/common/math/RTUInt128MulByU64.asm | 1 - src/VBox/Runtime/common/math/remainderf.asm | 1 - src/VBox/Runtime/common/time/timesupA.mac | 2 - src/VBox/Runtime/common/vfs/vfsprogress.cpp | 1 - src/VBox/Runtime/common/zip/tarvfs.cpp | 1 - src/VBox/Runtime/os2/sys0.asm | 1 - ...aleQueryNormalizedBaseLocaleName-r3-generic.cpp | 1 - 17 files changed, 59 insertions(+), 21 deletions(-) diff --git a/src/VBox/Runtime/.scm-settings b/src/VBox/Runtime/.scm-settings index 17180900f8b..bae0cb977e8 100644 --- a/src/VBox/Runtime/.scm-settings +++ b/src/VBox/Runtime/.scm-settings @@ -24,12 +24,60 @@ # terms and conditions of either the GPL or the CDDL or both. # +--license-ose-dual ---filter-out-dirs "*/r0drv/solaris/vbi/*/." ---filter-out-dirs "*/common/math/gcc/." +--filter-out-dirs "/r0drv/solaris/vbi/*/." +--filter-out-dirs "/common/math/gcc/." ---filter-out-files "*/testcase/soundcard.h" ---filter-out-files "*/include/internal/ldrELF*.h" ---filter-out-files "*/common/math/x86/fenv-x86.c" ---filter-out-files "*/common/checksum/md5.cpp" +--filter-out-files "/testcase/soundcard.h" +--filter-out-files "/include/internal/ldrELF*.h" +--filter-out-files "/common/math/x86/fenv-x86.c" +--filter-out-files "/common/checksum/md5.cpp" + +# external code +/r0drv/freebsd/alloc-r0drv-freebsd.c : --external-copyright +/r0drv/freebsd/assert-r0drv-freebsd.c : --external-copyright +/r0drv/freebsd/initterm-r0drv-freebsd.c : --external-copyright +/r0drv/freebsd/memobj-r0drv-freebsd.c : --external-copyright +/r0drv/freebsd/process-r0drv-freebsd.c : --external-copyright +/r0drv/freebsd/semevent-r0drv-freebsd.c : --external-copyright +/r0drv/freebsd/semeventmulti-r0drv-freebsd.c : --external-copyright +/r0drv/freebsd/semfastmutex-r0drv-freebsd.c : --external-copyright +/r0drv/freebsd/spinlock-r0drv-freebsd.c : --external-copyright +/r0drv/freebsd/the-freebsd-kernel.h : --external-copyright +/r0drv/freebsd/thread2-r0drv-freebsd.c : --external-copyright +/r0drv/freebsd/time-r0drv-freebsd.c : --external-copyright +/r0drv/freebsd/timer-r0drv-freebsd.c : --external-copyright + +/r0drv/netbsd/assert-r0drv-netbsd.c : --external-copyright +/r0drv/netbsd/initterm-r0drv-netbsd.c : --external-copyright +/r0drv/netbsd/memobj-r0drv-netbsd.c : --external-copyright +/r0drv/netbsd/process-r0drv-netbsd.c : --external-copyright +/r0drv/netbsd/semevent-r0drv-netbsd.c : --external-copyright +/r0drv/netbsd/semeventmulti-r0drv-netbsd.c : --external-copyright +/r0drv/netbsd/semfastmutex-r0drv-netbsd.c : --external-copyright +/r0drv/netbsd/spinlock-r0drv-netbsd.c : --external-copyright +/r0drv/netbsd/the-netbsd-kernel.h : --external-copyright +/r0drv/netbsd/thread2-r0drv-netbsd.c : --external-copyright +/r0drv/netbsd/time-r0drv-netbsd.c : --external-copyright + +/r0drv/os2/alloc-r0drv-os2.cpp : --external-copyright +/r0drv/os2/assert-r0drv-os2.cpp : --external-copyright +/r0drv/os2/assertA-r0drv-os2.asm : --external-copyright +/r0drv/os2/initterm-r0drv-os2.cpp : --external-copyright +/r0drv/os2/memobj-r0drv-os2.cpp : --external-copyright +/r0drv/os2/process-r0drv-os2.cpp : --external-copyright +/r0drv/os2/RTR0AssertPanicSystem-r0drv-os2.asm : --external-copyright +/r0drv/os2/RTR0Os2DHQueryDOSVar.asm : --external-copyright +/r0drv/os2/RTR0Os2DHVMGlobalToProcess.asm : --external-copyright +/r0drv/os2/semevent-r0drv-os2.cpp : --external-copyright +/r0drv/os2/semeventmulti-r0drv-os2.cpp : --external-copyright +/r0drv/os2/semfastmutex-r0drv-os2.cpp : --external-copyright +/r0drv/os2/spinlock-r0drv-os2.cpp : --external-copyright +/r0drv/os2/the-os2-kernel.h : --external-copyright +/r0drv/os2/thread-r0drv-os2.cpp : --external-copyright +/r0drv/os2/thread2-r0drv-os2.cpp : --external-copyright +/r0drv/os2/time-r0drv-os2.cpp : --external-copyright +/r0drv/os2/timer-r0drv-os2.cpp : --external-copyright +/r0drv/os2/timerA-r0drv-os2.asm : --external-copyright diff --git a/src/VBox/Runtime/common/asm/ASMBitFirstSetU64.asm b/src/VBox/Runtime/common/asm/ASMBitFirstSetU64.asm index c1f24137f2e..112d712715e 100644 --- a/src/VBox/Runtime/common/asm/ASMBitFirstSetU64.asm +++ b/src/VBox/Runtime/common/asm/ASMBitFirstSetU64.asm @@ -114,4 +114,3 @@ BEGINPROC_EXPORTED ASMBitFirstSetU64 %endif ENDPROC ASMBitFirstSetU64 - diff --git a/src/VBox/Runtime/common/asm/ASMBitNextClear.asm b/src/VBox/Runtime/common/asm/ASMBitNextClear.asm index 808fa17827d..5b8cf98c6f7 100644 --- a/src/VBox/Runtime/common/asm/ASMBitNextClear.asm +++ b/src/VBox/Runtime/common/asm/ASMBitNextClear.asm @@ -171,4 +171,3 @@ BEGINPROC_EXPORTED ASMBitNextClear jmp .return ENDPROC ASMBitNextClear - diff --git a/src/VBox/Runtime/common/asm/ASMBitNextSet.asm b/src/VBox/Runtime/common/asm/ASMBitNextSet.asm index 0fe9caa9e7d..7012a2fd5c6 100644 --- a/src/VBox/Runtime/common/asm/ASMBitNextSet.asm +++ b/src/VBox/Runtime/common/asm/ASMBitNextSet.asm @@ -171,4 +171,3 @@ BEGINPROC_EXPORTED ASMBitNextSet jmp .return ENDPROC ASMBitNextSet - diff --git a/src/VBox/Runtime/common/asm/ASMGetLDTR.asm b/src/VBox/Runtime/common/asm/ASMGetLDTR.asm index d658ad13747..04cea394dce 100644 --- a/src/VBox/Runtime/common/asm/ASMGetLDTR.asm +++ b/src/VBox/Runtime/common/asm/ASMGetLDTR.asm @@ -34,7 +34,7 @@ BEGINCODE ;; ; Get the LDTR register. ; @returns LDTR. -; +; BEGINPROC_EXPORTED ASMGetLDTR sldt ax movzx eax, ax diff --git a/src/VBox/Runtime/common/asm/ASMGetTR.asm b/src/VBox/Runtime/common/asm/ASMGetTR.asm index 34c79d6d798..0057136c816 100644 --- a/src/VBox/Runtime/common/asm/ASMGetTR.asm +++ b/src/VBox/Runtime/common/asm/ASMGetTR.asm @@ -34,7 +34,7 @@ BEGINCODE ;; ; Get the TR register. ; @returns TR. -; +; BEGINPROC_EXPORTED ASMGetTR str ax movzx eax, ax diff --git a/src/VBox/Runtime/common/asm/ASMMultU64ByU32DivByU32.asm b/src/VBox/Runtime/common/asm/ASMMultU64ByU32DivByU32.asm index 8b548d341c9..c02db68cb78 100644 --- a/src/VBox/Runtime/common/asm/ASMMultU64ByU32DivByU32.asm +++ b/src/VBox/Runtime/common/asm/ASMMultU64ByU32DivByU32.asm @@ -100,4 +100,3 @@ BEGINPROC_EXPORTED ASMMultU64ByU32DivByU32 ret ENDPROC ASMMultU64ByU32DivByU32 - diff --git a/src/VBox/Runtime/common/checksum/crc16ccitt.cpp b/src/VBox/Runtime/common/checksum/crc16ccitt.cpp index 32b484cdb60..85908127cfc 100644 --- a/src/VBox/Runtime/common/checksum/crc16ccitt.cpp +++ b/src/VBox/Runtime/common/checksum/crc16ccitt.cpp @@ -24,6 +24,7 @@ * terms and conditions of either the GPL or the CDDL or both. */ + /********************************************************************************************************************************* * Header Files * *********************************************************************************************************************************/ @@ -105,4 +106,3 @@ RTDECL(uint16_t) RTCrc16CcittFinish(uint16_t uCrc) return uCrc; } - diff --git a/src/VBox/Runtime/common/err/errmsgcom.sed b/src/VBox/Runtime/common/err/errmsgcom.sed index 086d03b817e..328eb1e9d3f 100644 --- a/src/VBox/Runtime/common/err/errmsgcom.sed +++ b/src/VBox/Runtime/common/err/errmsgcom.sed @@ -3,6 +3,7 @@ # IPRT - SED script for converting COM errors # +# # Copyright (C) 2006-2017 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as diff --git a/src/VBox/Runtime/common/fs/isovfs.cpp b/src/VBox/Runtime/common/fs/isovfs.cpp index 2552ef4fac5..2c3ed5bc95b 100644 --- a/src/VBox/Runtime/common/fs/isovfs.cpp +++ b/src/VBox/Runtime/common/fs/isovfs.cpp @@ -454,6 +454,7 @@ typedef RTFSISOVDSINFO *PRTFSISOVDSINFO; * Global Variables * *********************************************************************************************************************************/ + /********************************************************************************************************************************* * Internal Functions * *********************************************************************************************************************************/ diff --git a/src/VBox/Runtime/common/math/RTUInt128MulByU64.asm b/src/VBox/Runtime/common/math/RTUInt128MulByU64.asm index 45cb7321296..9d427e16201 100644 --- a/src/VBox/Runtime/common/math/RTUInt128MulByU64.asm +++ b/src/VBox/Runtime/common/math/RTUInt128MulByU64.asm @@ -79,4 +79,3 @@ SEH64_END_PROLOGUE ret ENDPROC RTUInt128MulByU64 - diff --git a/src/VBox/Runtime/common/math/remainderf.asm b/src/VBox/Runtime/common/math/remainderf.asm index 1d191ff794c..77e4898dd78 100644 --- a/src/VBox/Runtime/common/math/remainderf.asm +++ b/src/VBox/Runtime/common/math/remainderf.asm @@ -64,4 +64,3 @@ BEGINPROC RT_NOCRT(remainderf) ret ENDPROC RT_NOCRT(remainderf) - diff --git a/src/VBox/Runtime/common/time/timesupA.mac b/src/VBox/Runtime/common/time/timesupA.mac index 24cc7b17e31..98d1c950523 100644 --- a/src/VBox/Runtime/common/time/timesupA.mac +++ b/src/VBox/Runtime/common/time/timesupA.mac @@ -883,5 +883,3 @@ ALIGNCODE(16) %endif ; AMD64 ENDPROC rtTimeNanoTSInternalAsm - - diff --git a/src/VBox/Runtime/common/vfs/vfsprogress.cpp b/src/VBox/Runtime/common/vfs/vfsprogress.cpp index 94b01c61b97..c8544c6cb59 100644 --- a/src/VBox/Runtime/common/vfs/vfsprogress.cpp +++ b/src/VBox/Runtime/common/vfs/vfsprogress.cpp @@ -517,4 +517,3 @@ RTDECL(int) RTVfsCreateProgressForFile(RTVFSFILE hVfsFile, PFNRTPROGRESS pfnProg return rc; } - diff --git a/src/VBox/Runtime/common/zip/tarvfs.cpp b/src/VBox/Runtime/common/zip/tarvfs.cpp index 87b00746dcb..2199232158a 100644 --- a/src/VBox/Runtime/common/zip/tarvfs.cpp +++ b/src/VBox/Runtime/common/zip/tarvfs.cpp @@ -1530,4 +1530,3 @@ RTDECL(int) RTZipTarFsStreamFromIoStream(RTVFSIOSTREAM hVfsIosIn, uint32_t fFlag return rc; } - diff --git a/src/VBox/Runtime/os2/sys0.asm b/src/VBox/Runtime/os2/sys0.asm index 6920f6daf3e..847773b17fa 100644 --- a/src/VBox/Runtime/os2/sys0.asm +++ b/src/VBox/Runtime/os2/sys0.asm @@ -53,4 +53,3 @@ BEGINBSS global __bss_start __bss_start: - diff --git a/src/VBox/Runtime/r3/generic/RTLocaleQueryNormalizedBaseLocaleName-r3-generic.cpp b/src/VBox/Runtime/r3/generic/RTLocaleQueryNormalizedBaseLocaleName-r3-generic.cpp index 90b7d4fc982..89b022d74a3 100644 --- a/src/VBox/Runtime/r3/generic/RTLocaleQueryNormalizedBaseLocaleName-r3-generic.cpp +++ b/src/VBox/Runtime/r3/generic/RTLocaleQueryNormalizedBaseLocaleName-r3-generic.cpp @@ -90,4 +90,3 @@ RTDECL(int) RTLocaleQueryNormalizedBaseLocaleName(char *pszName, size_t cbName) return rc; } - -- cgit v1.2.1