From 731be7dde11e3901859e6d527cd59a0ff566df3e Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 30 Aug 2019 18:27:35 -0400 Subject: [PATCH] Relicense all of Ingo's BSD/MIT+advertising clause'd code as plain MIT. Via email: > I'm fine with re-licensing all code using BSD license + advertising > clause to MIT license. --- .../private/kernel/util/KernelUtilsOrder.h | 31 +++------------- headers/private/kernel/util/Vector.h | 31 +++------------- headers/private/kernel/util/VectorMap.h | 35 ++++--------------- headers/private/kernel/util/VectorSet.h | 31 +++------------- .../private/userlandfs/shared/Compatibility.h | 31 +++------------- headers/private/userlandfs/shared/Vector.h | 31 +++------------- .../netfs/headers/shared/BlockingQueue.h | 31 +++------------- .../kernel/file_systems/ramfs/AreaUtils.cpp | 32 +++-------------- .../kernel/file_systems/ramfs/AreaUtils.h | 31 +++------------- src/add-ons/kernel/file_systems/ramfs/List.h | 31 +++------------- src/add-ons/kernel/file_systems/ramfs/Misc.h | 31 +++------------- .../kernel/file_systems/ramfs/SLList.h | 31 +++------------- .../file_systems/userlandfs/shared/Debug.cpp | 30 +++------------- .../libkernelppp/headers/TemplateList.h | 31 +++------------- src/apps/installer/BlockingQueue.h | 31 +++------------- 15 files changed, 63 insertions(+), 406 deletions(-) diff --git a/headers/private/kernel/util/KernelUtilsOrder.h b/headers/private/kernel/util/KernelUtilsOrder.h index 9b308af45d..8c40004e9d 100644 --- a/headers/private/kernel/util/KernelUtilsOrder.h +++ b/headers/private/kernel/util/KernelUtilsOrder.h @@ -1,30 +1,7 @@ -// KernelUtilsOrders.h -// -// Copyright (c) 2003, Ingo Weinhold (bonefish@cs.tu-berlin.de) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder shall -// not be used in advertising or otherwise to promote the sale, use or other -// dealings in this Software without prior written authorization of the -// copyright holder. - +/* + * Copyright 2003, Ingo Weinhold, ingo_weinhold@gmx.de. + * All rights reserved. Distributed under the terms of the MIT license. + */ #ifndef _KERNEL_UTILS_ORDERS_H #define _KERNEL_UTILS_ORDERS_H diff --git a/headers/private/kernel/util/Vector.h b/headers/private/kernel/util/Vector.h index 6a90cdc3aa..0a51a29240 100644 --- a/headers/private/kernel/util/Vector.h +++ b/headers/private/kernel/util/Vector.h @@ -1,30 +1,7 @@ -// Vector.h -// -// Copyright (c) 2003, Ingo Weinhold (bonefish@cs.tu-berlin.de) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder shall -// not be used in advertising or otherwise to promote the sale, use or other -// dealings in this Software without prior written authorization of the -// copyright holder. - +/* + * Copyright 2003, Ingo Weinhold, ingo_weinhold@gmx.de. + * All rights reserved. Distributed under the terms of the MIT license. + */ #ifndef _VECTOR_H #define _VECTOR_H diff --git a/headers/private/kernel/util/VectorMap.h b/headers/private/kernel/util/VectorMap.h index 0c5cf00184..652ece267c 100644 --- a/headers/private/kernel/util/VectorMap.h +++ b/headers/private/kernel/util/VectorMap.h @@ -1,30 +1,7 @@ -// VectorMap.h -// -// Copyright (c) 2003, Ingo Weinhold (bonefish@cs.tu-berlin.de) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder shall -// not be used in advertising or otherwise to promote the sale, use or other -// dealings in this Software without prior written authorization of the -// copyright holder. - +/* + * Copyright 2003, Ingo Weinhold, ingo_weinhold@gmx.de. + * All rights reserved. Distributed under the terms of the MIT license. + */ #ifndef _VECTOR_MAP_H #define _VECTOR_MAP_H @@ -85,9 +62,9 @@ public: Entry; typedef VectorMapEntry ConstEntry; - typedef VectorMapIterator + typedef VectorMapIterator Iterator; - typedef VectorMapIterator + typedef VectorMapIterator ConstIterator; private: diff --git a/headers/private/kernel/util/VectorSet.h b/headers/private/kernel/util/VectorSet.h index 41933ebb7d..b9a3f2746a 100644 --- a/headers/private/kernel/util/VectorSet.h +++ b/headers/private/kernel/util/VectorSet.h @@ -1,30 +1,7 @@ -// VectorSet.h -// -// Copyright (c) 2003, Ingo Weinhold (bonefish@cs.tu-berlin.de) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder shall -// not be used in advertising or otherwise to promote the sale, use or other -// dealings in this Software without prior written authorization of the -// copyright holder. - +/* + * Copyright 2003, Ingo Weinhold, ingo_weinhold@gmx.de. + * All rights reserved. Distributed under the terms of the MIT license. + */ #ifndef _VECTOR_SET_H #define _VECTOR_SET_H diff --git a/headers/private/userlandfs/shared/Compatibility.h b/headers/private/userlandfs/shared/Compatibility.h index 8a686ff2ba..6f0d2a759c 100644 --- a/headers/private/userlandfs/shared/Compatibility.h +++ b/headers/private/userlandfs/shared/Compatibility.h @@ -1,30 +1,7 @@ -// Compatibility.h -// -// Copyright (c) 2004, Ingo Weinhold (bonefish@cs.tu-berlin.de) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder shall -// not be used in advertising or otherwise to promote the sale, use or other -// dealings in this Software without prior written authorization of the -// copyright holder. - +/* + * Copyright 2004, Ingo Weinhold, ingo_weinhold@gmx.de. + * All rights reserved. Distributed under the terms of the MIT license. + */ #ifndef USERLAND_FS_COMPATIBILITY_H #define USERLAND_FS_COMPATIBILITY_H diff --git a/headers/private/userlandfs/shared/Vector.h b/headers/private/userlandfs/shared/Vector.h index 266d34a09d..6410bc7d6e 100644 --- a/headers/private/userlandfs/shared/Vector.h +++ b/headers/private/userlandfs/shared/Vector.h @@ -1,30 +1,7 @@ -// Vector.h -// -// Copyright (c) 2003, Ingo Weinhold (bonefish@cs.tu-berlin.de) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder shall -// not be used in advertising or otherwise to promote the sale, use or other -// dealings in this Software without prior written authorization of the -// copyright holder. - +/* + * Copyright 2003, Ingo Weinhold, ingo_weinhold@gmx.de. + * All rights reserved. Distributed under the terms of the MIT license. + */ #ifndef _VECTOR_H #define _VECTOR_H diff --git a/src/add-ons/kernel/file_systems/netfs/headers/shared/BlockingQueue.h b/src/add-ons/kernel/file_systems/netfs/headers/shared/BlockingQueue.h index 2ba67c3f89..ac048a7fd8 100644 --- a/src/add-ons/kernel/file_systems/netfs/headers/shared/BlockingQueue.h +++ b/src/add-ons/kernel/file_systems/netfs/headers/shared/BlockingQueue.h @@ -1,30 +1,7 @@ -// BlockingQueue.h -// -// Copyright (c) 2004, Ingo Weinhold (bonefish@cs.tu-berlin.de) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder shall -// not be used in advertising or otherwise to promote the sale, use or other -// dealings in this Software without prior written authorization of the -// copyright holder. - +/* + * Copyright 2004, Ingo Weinhold, ingo_weinhold@gmx.de. + * All rights reserved. Distributed under the terms of the MIT license. + */ #ifndef BLOCKING_QUEUE_H #define BLOCKING_QUEUE_H diff --git a/src/add-ons/kernel/file_systems/ramfs/AreaUtils.cpp b/src/add-ons/kernel/file_systems/ramfs/AreaUtils.cpp index 7ae34547fc..31838533b9 100644 --- a/src/add-ons/kernel/file_systems/ramfs/AreaUtils.cpp +++ b/src/add-ons/kernel/file_systems/ramfs/AreaUtils.cpp @@ -1,29 +1,7 @@ -// AreaUtils.cpp -// -// Copyright (c) 2003, Ingo Weinhold (bonefish@cs.tu-berlin.de) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder shall -// not be used in advertising or otherwise to promote the sale, use or other -// dealings in this Software without prior written authorization of the -// copyright holder. +/* + * Copyright 2003, Ingo Weinhold, ingo_weinhold@gmx.de. + * All rights reserved. Distributed under the terms of the MIT license. + */ #include @@ -64,7 +42,7 @@ AreaUtils::calloc(size_t nmemb, size_t size) } // free -void +void AreaUtils::free(void *ptr) { //PRINT(("AreaUtils::free(%p)\n", ptr)); diff --git a/src/add-ons/kernel/file_systems/ramfs/AreaUtils.h b/src/add-ons/kernel/file_systems/ramfs/AreaUtils.h index 7fb069b378..539c8387a7 100644 --- a/src/add-ons/kernel/file_systems/ramfs/AreaUtils.h +++ b/src/add-ons/kernel/file_systems/ramfs/AreaUtils.h @@ -1,30 +1,7 @@ -// AreaUtils.h -// -// Copyright (c) 2003, Ingo Weinhold (bonefish@cs.tu-berlin.de) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder shall -// not be used in advertising or otherwise to promote the sale, use or other -// dealings in this Software without prior written authorization of the -// copyright holder. - +/* + * Copyright 2003, Ingo Weinhold, ingo_weinhold@gmx.de. + * All rights reserved. Distributed under the terms of the MIT license. + */ #ifndef AREA_UTILS_H #define AREA_UTILS_H diff --git a/src/add-ons/kernel/file_systems/ramfs/List.h b/src/add-ons/kernel/file_systems/ramfs/List.h index 952e0d453d..fdca2d7036 100644 --- a/src/add-ons/kernel/file_systems/ramfs/List.h +++ b/src/add-ons/kernel/file_systems/ramfs/List.h @@ -1,30 +1,7 @@ -// List.h -// -// Copyright (c) 2003, Ingo Weinhold (bonefish@cs.tu-berlin.de) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder shall -// not be used in advertising or otherwise to promote the sale, use or other -// dealings in this Software without prior written authorization of the -// copyright holder. - +/* + * Copyright 2003, Ingo Weinhold, ingo_weinhold@gmx.de. + * All rights reserved. Distributed under the terms of the MIT license. + */ #ifndef LIST_H #define LIST_H diff --git a/src/add-ons/kernel/file_systems/ramfs/Misc.h b/src/add-ons/kernel/file_systems/ramfs/Misc.h index 17540d54c6..d869777e7f 100644 --- a/src/add-ons/kernel/file_systems/ramfs/Misc.h +++ b/src/add-ons/kernel/file_systems/ramfs/Misc.h @@ -1,30 +1,7 @@ -// Misc.h -// -// Copyright (c) 2003, Ingo Weinhold (bonefish@cs.tu-berlin.de) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder shall -// not be used in advertising or otherwise to promote the sale, use or other -// dealings in this Software without prior written authorization of the -// copyright holder. - +/* + * Copyright 2003, Ingo Weinhold, ingo_weinhold@gmx.de. + * All rights reserved. Distributed under the terms of the MIT license. + */ #ifndef MISC_H #define MISC_H diff --git a/src/add-ons/kernel/file_systems/ramfs/SLList.h b/src/add-ons/kernel/file_systems/ramfs/SLList.h index f979a442af..97e1a43092 100644 --- a/src/add-ons/kernel/file_systems/ramfs/SLList.h +++ b/src/add-ons/kernel/file_systems/ramfs/SLList.h @@ -1,30 +1,7 @@ -// SLList.h -// -// Copyright (c) 2003, Ingo Weinhold (bonefish@cs.tu-berlin.de) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder shall -// not be used in advertising or otherwise to promote the sale, use or other -// dealings in this Software without prior written authorization of the -// copyright holder. - +/* + * Copyright 2003, Ingo Weinhold, ingo_weinhold@gmx.de. + * All rights reserved. Distributed under the terms of the MIT license. + */ #ifndef SL_LIST_H #define SL_LIST_H diff --git a/src/add-ons/kernel/file_systems/userlandfs/shared/Debug.cpp b/src/add-ons/kernel/file_systems/userlandfs/shared/Debug.cpp index d4dfa55dd1..6d95774cbf 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/shared/Debug.cpp +++ b/src/add-ons/kernel/file_systems/userlandfs/shared/Debug.cpp @@ -1,29 +1,7 @@ -// Debug.cpp -// -// Copyright (c) 2003-2004, Ingo Weinhold (bonefish@cs.tu-berlin.de) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder shall -// not be used in advertising or otherwise to promote the sale, use or other -// dealings in this Software without prior written authorization of the -// copyright holder. +/* + * Copyright 2003-2004, Ingo Weinhold, ingo_weinhold@gmx.de. + * All rights reserved. Distributed under the terms of the MIT license. + */ #include #include diff --git a/src/add-ons/kernel/network/ppp/shared/libkernelppp/headers/TemplateList.h b/src/add-ons/kernel/network/ppp/shared/libkernelppp/headers/TemplateList.h index 25a7419e77..7847bc2f67 100644 --- a/src/add-ons/kernel/network/ppp/shared/libkernelppp/headers/TemplateList.h +++ b/src/add-ons/kernel/network/ppp/shared/libkernelppp/headers/TemplateList.h @@ -1,30 +1,7 @@ -// TemplateList.h -// -// Copyright (c) 2003, Ingo Weinhold (bonefish@cs.tu-berlin.de) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder shall -// not be used in advertising or otherwise to promote the sale, use or other -// dealings in this Software without prior written authorization of the -// copyright holder. - +/* + * Copyright 2003, Ingo Weinhold, ingo_weinhold@gmx.de. + * All rights reserved. Distributed under the terms of the MIT license. + */ #ifndef TEMPLATE_LIST_H #define TEMPLATE_LIST_H diff --git a/src/apps/installer/BlockingQueue.h b/src/apps/installer/BlockingQueue.h index bedc0ef868..98f0c6e22f 100644 --- a/src/apps/installer/BlockingQueue.h +++ b/src/apps/installer/BlockingQueue.h @@ -1,30 +1,7 @@ -// BlockingQueue.h -// -// Copyright (c) 2004, Ingo Weinhold (bonefish@cs.tu-berlin.de) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder shall -// not be used in advertising or otherwise to promote the sale, use or other -// dealings in this Software without prior written authorization of the -// copyright holder. - +/* + * Copyright 2004, Ingo Weinhold, ingo_weinhold@gmx.de. + * All rights reserved. Distributed under the terms of the MIT license. + */ #ifndef BLOCKING_QUEUE_H #define BLOCKING_QUEUE_H