From c12690b58af593e40fe5cb7aff0aa1a942228bb2 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 28 Feb 2009 15:24:54 +0000 Subject: [PATCH] Some file renaming (removed the haiku_ prefix). git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29351 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../userlandfs/server/haiku/Jamfile | 19 +++++++++---------- ...{haiku_block_cache.cpp => block_cache.cpp} | 12 ++++++------ .../{haiku_block_cache.h => block_cache.h} | 0 ...on_variable.cpp => condition_variable.cpp} | 4 ++-- ...dition_variable.h => condition_variable.h} | 0 .../userlandfs/server/haiku/file_map.cpp | 2 +- .../haiku/{haiku_hash.cpp => khash.cpp} | 2 +- .../server/haiku/{haiku_hash.h => khash.h} | 0 .../server/haiku/{haiku_lock.cpp => lock.cpp} | 2 +- .../server/haiku/{haiku_lock.h => lock.h} | 0 .../server/haiku/{haiku_slab.cpp => slab.cpp} | 4 ++-- .../server/haiku/{haiku_slab.h => slab.h} | 0 12 files changed, 22 insertions(+), 23 deletions(-) rename src/add-ons/kernel/file_systems/userlandfs/server/haiku/{haiku_block_cache.cpp => block_cache.cpp} (99%) rename src/add-ons/kernel/file_systems/userlandfs/server/haiku/{haiku_block_cache.h => block_cache.h} (100%) rename src/add-ons/kernel/file_systems/userlandfs/server/haiku/{haiku_condition_variable.cpp => condition_variable.cpp} (98%) rename src/add-ons/kernel/file_systems/userlandfs/server/haiku/{haiku_condition_variable.h => condition_variable.h} (100%) rename src/add-ons/kernel/file_systems/userlandfs/server/haiku/{haiku_hash.cpp => khash.cpp} (99%) rename src/add-ons/kernel/file_systems/userlandfs/server/haiku/{haiku_hash.h => khash.h} (100%) rename src/add-ons/kernel/file_systems/userlandfs/server/haiku/{haiku_lock.cpp => lock.cpp} (99%) rename src/add-ons/kernel/file_systems/userlandfs/server/haiku/{haiku_lock.h => lock.h} (100%) rename src/add-ons/kernel/file_systems/userlandfs/server/haiku/{haiku_slab.cpp => slab.cpp} (95%) rename src/add-ons/kernel/file_systems/userlandfs/server/haiku/{haiku_slab.h => slab.h} (100%) diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/Jamfile b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/Jamfile index 2847c69a41..a112da2b4d 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/Jamfile +++ b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/Jamfile @@ -22,18 +22,17 @@ DEFINES += BUILDING_USERLAND_FS_SERVER=1 ; # the library providing the Haiku kernel interface for add-ons SharedLibrary libuserlandfs_haiku_kernel.so : - haiku_kernel_emu.cpp - - haiku_block_cache.cpp - haiku_condition_variable.cpp - haiku_hash.cpp - haiku_lock.cpp - haiku_slab.cpp - HaikuKernelFileSystem.cpp - HaikuKernelVolume.cpp - + block_cache.cpp + condition_variable.cpp file_cache.cpp file_map.cpp + khash.cpp + lock.cpp + slab.cpp + + haiku_kernel_emu.cpp + HaikuKernelFileSystem.cpp + HaikuKernelVolume.cpp : UserlandFSServer diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_block_cache.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/block_cache.cpp similarity index 99% rename from src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_block_cache.cpp rename to src/add-ons/kernel/file_systems/userlandfs/server/haiku/block_cache.cpp index d9b1970c34..1858dd7a46 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_block_cache.cpp +++ b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/block_cache.cpp @@ -3,7 +3,7 @@ * Distributed under the terms of the MIT License. */ -#include "haiku_block_cache.h" +#include "block_cache.h" #include @@ -14,14 +14,14 @@ #include #include +#include #include -#include "haiku_condition_variable.h" -#include "haiku_fs_cache.h" -#include "haiku_hash.h" -#include "haiku_lock.h" -#include "haiku_slab.h" +#include "condition_variable.h" +#include "khash.h" +#include "lock.h" +#include "slab.h" // TODO: this is a naive but growing implementation to test the API: diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_block_cache.h b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/block_cache.h similarity index 100% rename from src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_block_cache.h rename to src/add-ons/kernel/file_systems/userlandfs/server/haiku/block_cache.h diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_condition_variable.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/condition_variable.cpp similarity index 98% rename from src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_condition_variable.cpp rename to src/add-ons/kernel/file_systems/userlandfs/server/haiku/condition_variable.cpp index 8ef5a1bf3c..d845f17834 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_condition_variable.cpp +++ b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/condition_variable.cpp @@ -3,7 +3,7 @@ * Distributed under the terms of the MIT License. */ -#include "haiku_condition_variable.h" +#include "condition_variable.h" #include #include @@ -19,7 +19,7 @@ #include #include -#include "haiku_lock.h" +#include "lock.h" #define STATUS_ADDED 1 diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_condition_variable.h b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/condition_variable.h similarity index 100% rename from src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_condition_variable.h rename to src/add-ons/kernel/file_systems/userlandfs/server/haiku/condition_variable.h diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/file_map.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/file_map.cpp index 97beef8a67..a10d413530 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/file_map.cpp +++ b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/file_map.cpp @@ -14,7 +14,7 @@ #include -#include "haiku_lock.h" +#include "lock.h" #include "vfs.h" diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_hash.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/khash.cpp similarity index 99% rename from src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_hash.cpp rename to src/add-ons/kernel/file_systems/userlandfs/server/haiku/khash.cpp index 267435ba81..2f4aef9db1 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_hash.cpp +++ b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/khash.cpp @@ -4,7 +4,7 @@ ** Distributed under the terms of the NewOS License. */ -#include "haiku_hash.h" +#include "khash.h" #include #include diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_hash.h b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/khash.h similarity index 100% rename from src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_hash.h rename to src/add-ons/kernel/file_systems/userlandfs/server/haiku/khash.h diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_lock.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/lock.cpp similarity index 99% rename from src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_lock.cpp rename to src/add-ons/kernel/file_systems/userlandfs/server/haiku/lock.cpp index 426dc491bc..76cea38d34 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_lock.cpp +++ b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/lock.cpp @@ -8,7 +8,7 @@ /* Mutex and recursive_lock code */ -#include "haiku_lock.h" +#include "lock.h" #include diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_lock.h b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/lock.h similarity index 100% rename from src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_lock.h rename to src/add-ons/kernel/file_systems/userlandfs/server/haiku/lock.h diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_slab.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/slab.cpp similarity index 95% rename from src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_slab.cpp rename to src/add-ons/kernel/file_systems/userlandfs/server/haiku/slab.cpp index bc1d72704e..466bb659ac 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_slab.cpp +++ b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/slab.cpp @@ -1,9 +1,9 @@ /* - * Copyright 2001-2009, Ingo Weinhold, ingo_weinhold@gmx.de. + * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de. * Distributed under the terms of the MIT License. */ -#include "haiku_slab.h" +#include "slab.h" #include diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_slab.h b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/slab.h similarity index 100% rename from src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_slab.h rename to src/add-ons/kernel/file_systems/userlandfs/server/haiku/slab.h