From 7b7bdc283d3ab38b371c873f52f5b4622e5cdd3b Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sun, 1 Sep 2019 14:54:15 -0500 Subject: [PATCH] Cleanup: rename f_paths to f_path --- build/level_0/settings | 2 +- build/monolithic/settings | 2 +- level_0/f_conversion/c/conversion.h | 2 +- level_0/f_fss/c/fss.h | 2 +- level_0/f_memory/c/memory.h | 2 +- .../c/path_filesystem.h} | 20 ++++++++++---------- .../{f_paths/c/fll_paths.h => f_path/c/path_fll.h} | 11 ++++++----- level_0/{f_paths => f_path}/data/build/dependencies | 0 level_0/{f_paths => f_path}/data/build/settings | 4 ++-- level_0/f_pipe/c/pipe.h | 2 +- level_0/f_socket/c/socket.h | 2 +- level_0/f_string/c/string.h | 2 +- level_0/f_types/c/types_array.h | 2 +- level_0/f_utf/c/utf.h | 2 +- level_1/fl_socket/c/socket.h | 2 +- level_1/fl_string/c/string.h | 2 +- level_1/fl_utf/c/utf.h | 2 +- level_3/init/c/init.h | 2 +- 18 files changed, 32 insertions(+), 31 deletions(-) rename level_0/{f_paths/c/filesystem_paths.h => f_path/c/path_filesystem.h} (93%) rename level_0/{f_paths/c/fll_paths.h => f_path/c/path_fll.h} (91%) rename level_0/{f_paths => f_path}/data/build/dependencies (100%) rename level_0/{f_paths => f_path}/data/build/settings (84%) diff --git a/build/level_0/settings b/build/level_0/settings index f4eda93..42b33a5 100644 --- a/build/level_0/settings +++ b/build/level_0/settings @@ -13,7 +13,7 @@ build_libraries -lc build_libraries_fll build_sources_library level_0/console.c level_0/conversion.c level_0/file.c level_0/memory.c level_0/pipe.c level_0/print.c level_0/utf.c build_sources_program -build_sources_headers level_0/colors.h level_0/console.h level_0/conversion.h level_0/status.h level_0/file.h level_0/fss.h level_0/memory.h level_0/fll_paths.h level_0/filesystem_paths.h level_0/pipe.h level_0/print.h level_0/serialized.h level_0/string.h level_0/types.h level_0/types_array.h level_0/utf.h +build_sources_headers level_0/colors.h level_0/console.h level_0/conversion.h level_0/status.h level_0/file.h level_0/fss.h level_0/memory.h level_0/path_fll.h level_0/path_filesystem.h level_0/pipe.h level_0/print.h level_0/serialized.h level_0/string.h level_0/types.h level_0/types_array.h level_0/utf.h build_shared yes build_static yes diff --git a/build/monolithic/settings b/build/monolithic/settings index 45ce8be..b00459d 100644 --- a/build/monolithic/settings +++ b/build/monolithic/settings @@ -13,7 +13,7 @@ build_libraries -lc build_libraries_fll build_sources_library level_0/console.c level_0/conversion.c level_0/file.c level_0/memory.c level_0/pipe.c level_0/print.c level_0/utf.c level_1/colors.c level_1/console.c level_1/directory.c level_1/status.c level_1/file.c level_1/fss.c level_1/fss_basic.c level_1/fss_basic_list.c level_1/fss_extended.c level_1/program.c level_1/serialized.c level_1/string.c level_1/utf.c level_2/colors.c level_2/execute.c level_2/status.c build_sources_program -build_sources_headers level_0/colors.h level_0/console.h level_0/conversion.h level_0/status.h level_0/file.h level_0/fss.h level_0/memory.h level_0/fll_paths.h level_0/filesystem_paths.h level_0/pipe.h level_0/print.h level_0/serialized.h level_0/string.h level_0/types.h level_0/types_array.h level_0/utf.h level_1/colors.h level_1/console.h level_1/directory.h level_1/status.h level_1/file.h level_1/fss.h level_1/fss_basic.h level_1/fss_basic_list.h level_1/fss_status.h level_1/fss_extended.h level_1/fss_macro.h level_1/program.h level_1/serialized.h level_1/string.h level_1/utf.h level_2/colors.h level_2/execute.h level_2/status.h level_2/fss_basic.h level_2/fss_basic_list.h level_2/fss_extended.h level_2/fss_status.h +build_sources_headers level_0/colors.h level_0/console.h level_0/conversion.h level_0/status.h level_0/file.h level_0/fss.h level_0/memory.h level_0/path_fll.h level_0/path_filesystem.h level_0/pipe.h level_0/print.h level_0/serialized.h level_0/string.h level_0/types.h level_0/types_array.h level_0/utf.h level_1/colors.h level_1/console.h level_1/directory.h level_1/status.h level_1/file.h level_1/fss.h level_1/fss_basic.h level_1/fss_basic_list.h level_1/fss_status.h level_1/fss_extended.h level_1/fss_macro.h level_1/program.h level_1/serialized.h level_1/string.h level_1/utf.h level_2/colors.h level_2/execute.h level_2/status.h level_2/fss_basic.h level_2/fss_basic_list.h level_2/fss_extended.h level_2/fss_status.h build_sources_bash build_sources_settings build_shared yes diff --git a/level_0/f_conversion/c/conversion.h b/level_0/f_conversion/c/conversion.h index f970d0c..5d5a396 100644 --- a/level_0/f_conversion/c/conversion.h +++ b/level_0/f_conversion/c/conversion.h @@ -25,7 +25,7 @@ // libc includes #include -// fll includes +// fll-0 includes #include #include #include diff --git a/level_0/f_fss/c/fss.h b/level_0/f_fss/c/fss.h index 4a6373c..9afd750 100644 --- a/level_0/f_fss/c/fss.h +++ b/level_0/f_fss/c/fss.h @@ -13,7 +13,7 @@ #ifndef _F_fss_h #define _F_fss_h -// fll includes +// fll-0 includes #include #include #include diff --git a/level_0/f_memory/c/memory.h b/level_0/f_memory/c/memory.h index 5170fff..e2a0f15 100644 --- a/level_0/f_memory/c/memory.h +++ b/level_0/f_memory/c/memory.h @@ -28,7 +28,7 @@ #include #include -// fll includes +// fll-0 includes #include #include diff --git a/level_0/f_paths/c/filesystem_paths.h b/level_0/f_path/c/path_filesystem.h similarity index 93% rename from level_0/f_paths/c/filesystem_paths.h rename to level_0/f_path/c/path_filesystem.h index 8ee02a8..f174696 100644 --- a/level_0/f_paths/c/filesystem_paths.h +++ b/level_0/f_path/c/path_filesystem.h @@ -1,7 +1,7 @@ /** * FLL - Level 0 * - * Project: Paths + * Project: Path * API Version: 0.5 * Licenses: lgplv2.1 * @@ -9,17 +9,17 @@ * * FIXME: this is very outdated due to numerous structural changes while I was developing turtle kevux. */ -#ifndef _F_filesystem_paths_h -#define _F_filesystem_paths_h +#ifndef _F_path_filesystem_h +#define _F_path_filesystem_h #ifdef __cplusplus extern "C" { #endif // KFS Filesystem Paths -#ifdef _di_kevux_standard_paths_ +#ifdef _di_path_kevux_standard_ // disable the FHS default paths - #define _di_filesystem_hierarch_standard_paths_ + #define _di_path_filesystem_hierarchy_standard_ // KFS Root Level #define f_path_devices "/devices" @@ -83,12 +83,12 @@ extern "C" { #define f_path_user_data "data" #define f_path_user_temporary "temporary" #define f_path_user_shared "shared" -#endif // _di_kevux_standard_paths_ +#endif // _di_path_kevux_standard_ // FHS Filesystem Paths -#ifndef _di_filesystem_hierarch_standard_paths_ +#ifndef _di_path_filesystem_hierarchy_standard_ // disable the kevux standard default paths - #define _di_kevux_standard_paths_ + #define _di_path_kevux_standard_ // KFS Root Level #define f_path_devices "/" @@ -152,10 +152,10 @@ extern "C" { #define f_path_user_data "" #define f_path_user_temporary "" #define f_path_user_shared "" -#endif // _di_filesystem_hierarch_standard_paths_ +#endif // _di_path_filesystem_hierarchy_standard_ #ifdef __cplusplus } // extern "C" #endif -#endif // _F_filesystem_paths_h +#endif // _F_path_filesystem_h diff --git a/level_0/f_paths/c/fll_paths.h b/level_0/f_path/c/path_fll.h similarity index 91% rename from level_0/f_paths/c/fll_paths.h rename to level_0/f_path/c/path_fll.h index 03bf40c..5c115d1 100644 --- a/level_0/f_paths/c/fll_paths.h +++ b/level_0/f_path/c/path_fll.h @@ -1,7 +1,7 @@ /** * FLL - Level 0 * - * Project: Paths + * Project: Path * API Version: 0.5 * Licenses: lgplv2.1 * @@ -10,10 +10,11 @@ * * FIXME: this is very outdated due to numerous structural changes while I was developing turtle kevux. */ -#ifndef _F_fll_paths_h -#define _F_fll_paths_h +#ifndef _F_path_fll_h +#define _F_path_fll_h -#include +// fll-0 includes +#include #ifdef __cplusplus extern "C" { @@ -47,4 +48,4 @@ extern "C" { } // extern "C" #endif -#endif // _F_fll_paths_h +#endif // _F_path_fll_h diff --git a/level_0/f_paths/data/build/dependencies b/level_0/f_path/data/build/dependencies similarity index 100% rename from level_0/f_paths/data/build/dependencies rename to level_0/f_path/data/build/dependencies diff --git a/level_0/f_paths/data/build/settings b/level_0/f_path/data/build/settings similarity index 84% rename from level_0/f_paths/data/build/settings rename to level_0/f_path/data/build/settings index d49cebd..4b64799 100644 --- a/level_0/f_paths/data/build/settings +++ b/level_0/f_path/data/build/settings @@ -1,6 +1,6 @@ # fss-0000 -project_name f_paths +project_name f_path project_level 0 version_major 0 @@ -13,7 +13,7 @@ build_libraries build_libraries_fll build_sources_library build_sources_program -build_sources_headers fll_paths.h filesystem_paths.h +build_sources_headers path_fll.h path_filesystem.h build_sources_bash build_sources_settings build_shared yes diff --git a/level_0/f_pipe/c/pipe.h b/level_0/f_pipe/c/pipe.h index b09c8b3..3633e11 100644 --- a/level_0/f_pipe/c/pipe.h +++ b/level_0/f_pipe/c/pipe.h @@ -14,7 +14,7 @@ #include #include -// fll includes +// fll-0 includes #include #include diff --git a/level_0/f_socket/c/socket.h b/level_0/f_socket/c/socket.h index c99b7d5..5b6ef09 100644 --- a/level_0/f_socket/c/socket.h +++ b/level_0/f_socket/c/socket.h @@ -15,7 +15,7 @@ #include #include -// fll includes +// fll-0 includes #include #include #include diff --git a/level_0/f_string/c/string.h b/level_0/f_string/c/string.h index 3f0c889..fb87e24 100644 --- a/level_0/f_string/c/string.h +++ b/level_0/f_string/c/string.h @@ -13,7 +13,7 @@ // libc includes #include -// fll includes +// fll-0 includes #include #include #include diff --git a/level_0/f_types/c/types_array.h b/level_0/f_types/c/types_array.h index 3f786f7..c29a002 100644 --- a/level_0/f_types/c/types_array.h +++ b/level_0/f_types/c/types_array.h @@ -10,7 +10,7 @@ #ifndef _F_types_array_h #define _F_types_array_h -// fll includes +// fll-0 includes #include #include diff --git a/level_0/f_utf/c/utf.h b/level_0/f_utf/c/utf.h index 32fe7d7..f2f6c77 100644 --- a/level_0/f_utf/c/utf.h +++ b/level_0/f_utf/c/utf.h @@ -38,7 +38,7 @@ #include #include -// fll includes +// fll-0 includes #include #include #include diff --git a/level_1/fl_socket/c/socket.h b/level_1/fl_socket/c/socket.h index f04dae5..8c5aa8d 100644 --- a/level_1/fl_socket/c/socket.h +++ b/level_1/fl_socket/c/socket.h @@ -19,7 +19,7 @@ #include #include -// fll includes +// fll-0 includes #include #include #include diff --git a/level_1/fl_string/c/string.h b/level_1/fl_string/c/string.h index 5fde2d9..6c73a8f 100644 --- a/level_1/fl_string/c/string.h +++ b/level_1/fl_string/c/string.h @@ -14,7 +14,7 @@ #include #include -// fll includes +// fll-0 includes #include #include #include diff --git a/level_1/fl_utf/c/utf.h b/level_1/fl_utf/c/utf.h index 708074f..4695bc1 100644 --- a/level_1/fl_utf/c/utf.h +++ b/level_1/fl_utf/c/utf.h @@ -14,7 +14,7 @@ #include #include -// fll includes +// fll-0 includes #include #include #include diff --git a/level_3/init/c/init.h b/level_3/init/c/init.h index 4362233..f09356e 100644 --- a/level_3/init/c/init.h +++ b/level_3/init/c/init.h @@ -83,7 +83,7 @@ extern "C" { #endif // _di_init_default_allocation_step_ #ifndef _di_init_paths_ - // @todo: this will eventually be written to use the f_paths project. + // @todo: this will eventually be written to use the f_path project. #define init_paths_rootfs "/" #define init_paths_devices "/dev/" #define init_paths_devices_pts "/dev/pts/" -- 1.8.3.1