From f9c2a2a243c976d9ea68a153f0d9ab1a36e77e4f Mon Sep 17 00:00:00 2001 From: Tyler Dauwalder Date: Fri, 17 Jan 2003 08:22:35 +0000 Subject: [PATCH] + Shrank license + Changed "#define TRACE(x)" to "#define TRACE(x) ;" git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2467 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/kernel/fs_device.h | 8 ++++- headers/private/disk_scanner/disk_scanner.h | 30 +++-------------- headers/private/disk_scanner/fs.h | 30 +++-------------- headers/private/disk_scanner/partition.h | 30 +++-------------- headers/private/disk_scanner/session.h | 30 +++-------------- .../kernel/disk_scanner/disk_scanner.c | 32 +++---------------- src/add-ons/kernel/disk_scanner/fs/bfs.c | 32 +++---------------- .../kernel/disk_scanner/partition/intel.c | 32 +++---------------- 8 files changed, 38 insertions(+), 186 deletions(-) diff --git a/headers/os/kernel/fs_device.h b/headers/os/kernel/fs_device.h index 41360d6e93..49fede909d 100644 --- a/headers/os/kernel/fs_device.h +++ b/headers/os/kernel/fs_device.h @@ -1,4 +1,10 @@ -// fs_devices.h +//---------------------------------------------------------------------- +// This software is part of the OpenBeOS distribution and is covered +// by the OpenBeOS license. +//--------------------------------------------------------------------- +/*! + \file fs_devices.h +*/ #ifndef _FS_DEVICE_H #define _FS_DEVICE_H diff --git a/headers/private/disk_scanner/disk_scanner.h b/headers/private/disk_scanner/disk_scanner.h index 1d8b51c68a..40e0f0ae4d 100644 --- a/headers/private/disk_scanner/disk_scanner.h +++ b/headers/private/disk_scanner/disk_scanner.h @@ -1,29 +1,7 @@ -//------------------------------------------------------------------------------ -// Copyright (c) 2001-2002, OpenBeOS -// -// 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. -// -// File Name: disk_scanner.h -// Author: Ingo Weinhold (bonefish@users.sf.net) -// Description: hook function declarations for disk_scanner module -//------------------------------------------------------------------------------ - +//---------------------------------------------------------------------- +// This software is part of the OpenBeOS distribution and is covered +// by the OpenBeOS license. +//--------------------------------------------------------------------- /*! \file disk_scanner.h hook function declarations for disk_scanner module diff --git a/headers/private/disk_scanner/fs.h b/headers/private/disk_scanner/fs.h index daa5d42254..3f1e5743cd 100644 --- a/headers/private/disk_scanner/fs.h +++ b/headers/private/disk_scanner/fs.h @@ -1,29 +1,7 @@ -//------------------------------------------------------------------------------ -// Copyright (c) 2001-2002, OpenBeOS -// -// 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. -// -// File Name: filesystem.h -// Author: Ingo Weinhold (bonefish@users.sf.net) -// Description: hook function declarations for disk_scanner filesystem modules -//------------------------------------------------------------------------------ - +//---------------------------------------------------------------------- +// This software is part of the OpenBeOS distribution and is covered +// by the OpenBeOS license. +//--------------------------------------------------------------------- /*! \file filesystem.h hook function declarations for disk_scanner filesystem modules diff --git a/headers/private/disk_scanner/partition.h b/headers/private/disk_scanner/partition.h index ee096dfbc7..7d7cfff0ee 100644 --- a/headers/private/disk_scanner/partition.h +++ b/headers/private/disk_scanner/partition.h @@ -1,29 +1,7 @@ -//------------------------------------------------------------------------------ -// Copyright (c) 2001-2002, OpenBeOS -// -// 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. -// -// File Name: partition.h -// Author: Ingo Weinhold (bonefish@users.sf.net) -// Description: hook function declarations for disk_scanner partition modules -//------------------------------------------------------------------------------ - +//---------------------------------------------------------------------- +// This software is part of the OpenBeOS distribution and is covered +// by the OpenBeOS license. +//--------------------------------------------------------------------- /*! \file partition.h hook function declarations for disk_scanner partition modules diff --git a/headers/private/disk_scanner/session.h b/headers/private/disk_scanner/session.h index 1657e4f968..6cb2fd7abf 100644 --- a/headers/private/disk_scanner/session.h +++ b/headers/private/disk_scanner/session.h @@ -1,29 +1,7 @@ -//------------------------------------------------------------------------------ -// Copyright (c) 2001-2002, OpenBeOS -// -// 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. -// -// File Name: session.h -// Author: Ingo Weinhold (bonefish@users.sf.net) -// Description: hook function declarations for disk_scanner session modules -//------------------------------------------------------------------------------ - +//---------------------------------------------------------------------- +// This software is part of the OpenBeOS distribution and is covered +// by the OpenBeOS license. +//--------------------------------------------------------------------- /*! \file session.h hook function declarations for disk_scanner session modules diff --git a/src/add-ons/kernel/disk_scanner/disk_scanner.c b/src/add-ons/kernel/disk_scanner/disk_scanner.c index 2c44ad3345..dfb7ec35c7 100644 --- a/src/add-ons/kernel/disk_scanner/disk_scanner.c +++ b/src/add-ons/kernel/disk_scanner/disk_scanner.c @@ -1,29 +1,7 @@ -//------------------------------------------------------------------------------ -// Copyright (c) 2001-2003, OpenBeOS -// -// 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. -// -// File Name: disk_scanner.c -// Author: Ingo Weinhold (bonefish@users.sf.net) -// Description: disk_scanner kernel module -//------------------------------------------------------------------------------ - +//---------------------------------------------------------------------- +// This software is part of the OpenBeOS distribution and is covered +// by the OpenBeOS license. +//--------------------------------------------------------------------- /*! \file disk_scanner.c disk_scanner kernel module @@ -45,7 +23,7 @@ static const char *kSessionModulePrefix = "disk_scanner/session"; static const char *kPartitionModulePrefix = "disk_scanner/partition"; static const char *kFSModulePrefix = "disk_scanner/fs"; -#define TRACE(x) +#define TRACE(x) ; //#define TRACE(x) dprintf x // prototypes diff --git a/src/add-ons/kernel/disk_scanner/fs/bfs.c b/src/add-ons/kernel/disk_scanner/fs/bfs.c index 9dc1b0ff83..8c6e8a77df 100644 --- a/src/add-ons/kernel/disk_scanner/fs/bfs.c +++ b/src/add-ons/kernel/disk_scanner/fs/bfs.c @@ -1,29 +1,7 @@ -//------------------------------------------------------------------------------ -// Copyright (c) 2001-2003, OpenBeOS -// -// 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. -// -// File Name: bfs.c -// Author: Tyler Dauwalder (tyler@dauwalder.net) -// Description: disk_scanner filesystem module for BFS filesystems -//------------------------------------------------------------------------------ - +//---------------------------------------------------------------------- +// This software is part of the OpenBeOS distribution and is covered +// by the OpenBeOS license. +//--------------------------------------------------------------------- /*! \file bfs.c disk_scanner filesystem module for BFS filesystems @@ -41,7 +19,7 @@ #define BFS_FS_MODULE_NAME "disk_scanner/fs/bfs/v1" const char *kModuleDebugName = "fs/bfs"; -#define TRACE(x) +#define TRACE(x) ; //#define TRACE(x) dprintf x // prototypes diff --git a/src/add-ons/kernel/disk_scanner/partition/intel.c b/src/add-ons/kernel/disk_scanner/partition/intel.c index 5035e2c502..7162b11711 100644 --- a/src/add-ons/kernel/disk_scanner/partition/intel.c +++ b/src/add-ons/kernel/disk_scanner/partition/intel.c @@ -1,29 +1,7 @@ -//------------------------------------------------------------------------------ -// Copyright (c) 2001-2003, OpenBeOS -// -// 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. -// -// File Name: intel.c -// Author: Ingo Weinhold (bonefish@users.sf.net) -// Description: disk_scanner partition module for "intel" style partitions -//------------------------------------------------------------------------------ - +//---------------------------------------------------------------------- +// This software is part of the OpenBeOS distribution and is covered +// by the OpenBeOS license. +//--------------------------------------------------------------------- /*! \file intel.c disk_scanner partition module for "intel" style partitions @@ -38,7 +16,7 @@ #include #include -#define TRACE(x) +#define TRACE(x) ; //#define TRACE(x) dprintf x #define INTEL_PARTITION_MODULE_NAME "disk_scanner/partition/intel/v1"