From dea60a442b7640d5bbe5d94a3d370f8c3e812883 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sat, 9 Jun 2012 11:21:09 -0500 Subject: [PATCH] Cleanup: rename/move f_output to f_print Be consinstent with the project+names wherever possible. In this case, it is very much possible. The functions area already called f_print*, so change the name of the project to f_print. --- level_0/{f_output/c/output.c => f_print/c/print.c} | 2 +- level_0/{f_output/c/output.h => f_print/c/print.h} | 8 ++++---- level_0/{f_output => f_print}/data/build/settings | 10 +++++----- level_3/firewall/c/firewall.h | 2 +- level_3/firewall/data/build/settings | 2 +- level_3/fss_basic_list_read/c/fss_basic_list_read.h | 2 +- level_3/fss_basic_list_read/data/build/settings | 2 +- level_3/fss_basic_list_write/c/fss_basic_list_write.h | 2 +- level_3/fss_basic_list_write/data/build/settings | 2 +- level_3/fss_basic_read/c/fss_basic_read.h | 2 +- level_3/fss_basic_read/data/build/settings | 2 +- level_3/fss_basic_write/c/fss_basic_write.h | 2 +- level_3/fss_basic_write/data/build/settings | 2 +- level_3/fss_extended_read/c/fss_extended_read.h | 2 +- level_3/fss_extended_read/data/build/settings | 2 +- level_3/fss_extended_write/c/fss_extended_write.h | 2 +- level_3/fss_extended_write/data/build/settings | 2 +- level_3/fss_return_code/c/fss_return_code.h | 2 +- level_3/fss_return_code/data/build/settings | 2 +- level_3/return_code/c/return_code.h | 2 +- level_3/return_code/data/build/settings | 2 +- 21 files changed, 28 insertions(+), 28 deletions(-) rename level_0/{f_output/c/output.c => f_print/c/print.c} (98%) rename level_0/{f_output/c/output.h => f_print/c/print.h} (94%) rename level_0/{f_output => f_print}/data/build/settings (60%) diff --git a/level_0/f_output/c/output.c b/level_0/f_print/c/print.c similarity index 98% rename from level_0/f_output/c/output.c rename to level_0/f_print/c/print.c index 0c229d1..5606af6 100644 --- a/level_0/f_output/c/output.c +++ b/level_0/f_print/c/print.c @@ -4,7 +4,7 @@ * Licenses: lgplv2.1 * Programmers: Kevin Day */ -#include +#include #ifdef __cplusplus extern "C"{ diff --git a/level_0/f_output/c/output.h b/level_0/f_print/c/print.h similarity index 94% rename from level_0/f_output/c/output.h rename to level_0/f_print/c/print.h index f1e13da..e63774d 100644 --- a/level_0/f_output/c/output.h +++ b/level_0/f_print/c/print.h @@ -5,10 +5,10 @@ * Programmers: Kevin Day * Documentation: * - * Provides some standard I/O functions not available in a libc + * Provides some standard printing functions not available in a libc */ -#ifndef _F_output_h -#define _F_output_h +#ifndef _F_print_h +#define _F_print_h // libc includes #include @@ -56,4 +56,4 @@ extern "C"{ } // extern "C" #endif -#endif // _F_output_h +#endif // _F_print_h diff --git a/level_0/f_output/data/build/settings b/level_0/f_print/data/build/settings similarity index 60% rename from level_0/f_output/data/build/settings rename to level_0/f_print/data/build/settings index c077e3a..dc43fbb 100644 --- a/level_0/f_output/data/build/settings +++ b/level_0/f_print/data/build/settings @@ -1,6 +1,6 @@ # fss-0000 -project_name f_output +project_name f_print project_level 0 version_major 0 @@ -8,10 +8,10 @@ version_minor 3 version_micro 0 build_compiler gcc -build_libraries -lc -build_sources_library output.c -build_sources_program -build_sources_headers output.h +build_libraries -lc +build_sources_library print.c +build_sources_program +build_sources_headers print.h build_shared yes flags_all -z now diff --git a/level_3/firewall/c/firewall.h b/level_3/firewall/c/firewall.h index 80407d2..204d466 100644 --- a/level_3/firewall/c/firewall.h +++ b/level_3/firewall/c/firewall.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include // fll-1 includes #include diff --git a/level_3/firewall/data/build/settings b/level_3/firewall/data/build/settings index 957966a..c59d2ff 100644 --- a/level_3/firewall/data/build/settings +++ b/level_3/firewall/data/build/settings @@ -8,7 +8,7 @@ version_minor 3 version_micro 0 build_compiler gcc -build_libraries -lc -lf_memory -lf_console -lf_conversion -lf_output -lf_file -lfl_fss -lfl_console -lfl_file -lfl_strings -lfl_colors -lfl_directory -lfll_execute -lfll_fss -lfll_colors -lf_pipe +build_libraries -lc -lf_memory -lf_console -lf_conversion -lf_print -lf_file -lfl_fss -lfl_console -lfl_file -lfl_strings -lfl_colors -lfl_directory -lfll_execute -lfll_fss -lfll_colors -lf_pipe build_sources_library firewall.c private-firewall.c build_sources_program main.c build_sources_headers firewall.h diff --git a/level_3/fss_basic_list_read/c/fss_basic_list_read.h b/level_3/fss_basic_list_read/c/fss_basic_list_read.h index b8920bd..0979e86 100644 --- a/level_3/fss_basic_list_read/c/fss_basic_list_read.h +++ b/level_3/fss_basic_list_read/c/fss_basic_list_read.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include // fll-1 includes diff --git a/level_3/fss_basic_list_read/data/build/settings b/level_3/fss_basic_list_read/data/build/settings index f7c8387..3a97bae 100644 --- a/level_3/fss_basic_list_read/data/build/settings +++ b/level_3/fss_basic_list_read/data/build/settings @@ -8,7 +8,7 @@ version_minor 3 version_micro 0 build_compiler gcc -build_libraries -lc -lf_memory -lf_console -lf_conversion -lf_output -lf_file -lfl_fss -lfl_console -lfl_file -lfl_strings -lfl_colors -lfl_directory -lfll_execute -lfll_fss -lfll_colors -lf_pipe +build_libraries -lc -lf_memory -lf_console -lf_conversion -lf_print -lf_file -lfl_fss -lfl_console -lfl_file -lfl_strings -lfl_colors -lfl_directory -lfll_execute -lfll_fss -lfll_colors -lf_pipe build_sources_library fss_basic_list_read.c build_sources_program main.c build_sources_headers fss_basic_list_read.h diff --git a/level_3/fss_basic_list_write/c/fss_basic_list_write.h b/level_3/fss_basic_list_write/c/fss_basic_list_write.h index 2274b7e..7e9b23f 100644 --- a/level_3/fss_basic_list_write/c/fss_basic_list_write.h +++ b/level_3/fss_basic_list_write/c/fss_basic_list_write.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include // fll-1 includes diff --git a/level_3/fss_basic_list_write/data/build/settings b/level_3/fss_basic_list_write/data/build/settings index fa1c84b..c81f049 100644 --- a/level_3/fss_basic_list_write/data/build/settings +++ b/level_3/fss_basic_list_write/data/build/settings @@ -8,7 +8,7 @@ version_minor 3 version_micro 0 build_compiler gcc -build_libraries -lc -lf_memory -lf_console -lfl_console -lf_conversion -lf_pipe -lf_output -lf_file -lfl_colors -lfll_colors -lfl_errors -lfl_fss -lfll_fss -lfl_file +build_libraries -lc -lf_memory -lf_console -lfl_console -lf_conversion -lf_pipe -lf_print -lf_file -lfl_colors -lfll_colors -lfl_errors -lfl_fss -lfll_fss -lfl_file build_sources_library fss_basic_list_write.c build_sources_program main.c build_sources_headers fss_basic_list_write.h diff --git a/level_3/fss_basic_read/c/fss_basic_read.h b/level_3/fss_basic_read/c/fss_basic_read.h index 6151ceb..238a7cb 100644 --- a/level_3/fss_basic_read/c/fss_basic_read.h +++ b/level_3/fss_basic_read/c/fss_basic_read.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include // fll-1 includes diff --git a/level_3/fss_basic_read/data/build/settings b/level_3/fss_basic_read/data/build/settings index 301c57b..124c1c5 100644 --- a/level_3/fss_basic_read/data/build/settings +++ b/level_3/fss_basic_read/data/build/settings @@ -8,7 +8,7 @@ version_minor 3 version_micro 0 build_compiler gcc -build_libraries -lc -lf_memory -lf_console -lf_conversion -lf_output -lf_file -lfl_fss -lfl_console -lfl_file -lfl_strings -lfl_colors -lfl_directory -lfll_execute -lfll_fss -lfll_colors -lf_pipe +build_libraries -lc -lf_memory -lf_console -lf_conversion -lf_print -lf_file -lfl_fss -lfl_console -lfl_file -lfl_strings -lfl_colors -lfl_directory -lfll_execute -lfll_fss -lfll_colors -lf_pipe build_sources_library fss_basic_read.c build_sources_program main.c build_sources_headers fss_basic_read.h diff --git a/level_3/fss_basic_write/c/fss_basic_write.h b/level_3/fss_basic_write/c/fss_basic_write.h index 9c5402f..2b1cd53 100644 --- a/level_3/fss_basic_write/c/fss_basic_write.h +++ b/level_3/fss_basic_write/c/fss_basic_write.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include // fll-1 includes diff --git a/level_3/fss_basic_write/data/build/settings b/level_3/fss_basic_write/data/build/settings index 8c1425d..540b3b3 100644 --- a/level_3/fss_basic_write/data/build/settings +++ b/level_3/fss_basic_write/data/build/settings @@ -8,7 +8,7 @@ version_minor 3 version_micro 0 build_compiler gcc -build_libraries -lc -lf_memory -lf_console -lfl_console -lf_conversion -lf_pipe -lf_output -lf_file -lfl_colors -lfll_colors -lfl_errors -lfl_fss -lfll_fss -lfl_file +build_libraries -lc -lf_memory -lf_console -lfl_console -lf_conversion -lf_pipe -lf_print -lf_file -lfl_colors -lfll_colors -lfl_errors -lfl_fss -lfll_fss -lfl_file build_sources_library fss_basic_write.c build_sources_program main.c build_sources_headers fss_basic_write.h diff --git a/level_3/fss_extended_read/c/fss_extended_read.h b/level_3/fss_extended_read/c/fss_extended_read.h index a95a939..b848724 100644 --- a/level_3/fss_extended_read/c/fss_extended_read.h +++ b/level_3/fss_extended_read/c/fss_extended_read.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include // fll-1 includes diff --git a/level_3/fss_extended_read/data/build/settings b/level_3/fss_extended_read/data/build/settings index acfd7fa..0138a9e 100644 --- a/level_3/fss_extended_read/data/build/settings +++ b/level_3/fss_extended_read/data/build/settings @@ -8,7 +8,7 @@ version_minor 3 version_micro 0 build_compiler gcc -build_libraries -lc -lf_memory -lf_console -lf_conversion -lf_output -lf_file -lfl_fss -lfl_console -lfl_file -lfl_strings -lfl_colors -lfl_directory -lfll_execute -lfll_fss -lfll_colors -lf_pipe +build_libraries -lc -lf_memory -lf_console -lf_conversion -lf_print -lf_file -lfl_fss -lfl_console -lfl_file -lfl_strings -lfl_colors -lfl_directory -lfll_execute -lfll_fss -lfll_colors -lf_pipe build_sources_library fss_extended_read.c build_sources_program main.c build_sources_headers fss_extended_read.h diff --git a/level_3/fss_extended_write/c/fss_extended_write.h b/level_3/fss_extended_write/c/fss_extended_write.h index ea14489..a477009 100644 --- a/level_3/fss_extended_write/c/fss_extended_write.h +++ b/level_3/fss_extended_write/c/fss_extended_write.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include // fll-1 includes diff --git a/level_3/fss_extended_write/data/build/settings b/level_3/fss_extended_write/data/build/settings index 031006f..993a7d5 100644 --- a/level_3/fss_extended_write/data/build/settings +++ b/level_3/fss_extended_write/data/build/settings @@ -8,7 +8,7 @@ version_minor 3 version_micro 0 build_compiler gcc -build_libraries -lc -lf_memory -lf_console -lfl_console -lf_conversion -lf_pipe -lf_output -lf_file -lfl_colors -lfll_colors -lfl_errors -lfl_fss -lfll_fss -lfl_file +build_libraries -lc -lf_memory -lf_console -lfl_console -lf_conversion -lf_pipe -lf_print -lf_file -lfl_colors -lfll_colors -lfl_errors -lfl_fss -lfll_fss -lfl_file build_sources_library fss_extended_write.c build_sources_program main.c build_sources_headers fss_extended_write.h diff --git a/level_3/fss_return_code/c/fss_return_code.h b/level_3/fss_return_code/c/fss_return_code.h index f5910b2..b9e44fc 100644 --- a/level_3/fss_return_code/c/fss_return_code.h +++ b/level_3/fss_return_code/c/fss_return_code.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include // fll-1 includes diff --git a/level_3/fss_return_code/data/build/settings b/level_3/fss_return_code/data/build/settings index 443f053..f7d9270 100644 --- a/level_3/fss_return_code/data/build/settings +++ b/level_3/fss_return_code/data/build/settings @@ -8,7 +8,7 @@ version_minor 3 version_micro 0 build_compiler gcc -build_libraries -lc -lf_memory -lf_console -lfl_console -lf_conversion -lf_pipe -lf_output -lfl_colors -lfll_colors -lfl_errors -lfl_fss -lfll_fss +build_libraries -lc -lf_memory -lf_console -lfl_console -lf_conversion -lf_pipe -lf_print -lfl_colors -lfll_colors -lfl_errors -lfl_fss -lfll_fss build_sources_library fss_return_code.c build_sources_program main.c build_sources_headers fss_return_code.h diff --git a/level_3/return_code/c/return_code.h b/level_3/return_code/c/return_code.h index 396ee22..b5b47af 100644 --- a/level_3/return_code/c/return_code.h +++ b/level_3/return_code/c/return_code.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include // fll-1 includes diff --git a/level_3/return_code/data/build/settings b/level_3/return_code/data/build/settings index a4a4071..55f3b3e 100644 --- a/level_3/return_code/data/build/settings +++ b/level_3/return_code/data/build/settings @@ -8,7 +8,7 @@ version_minor 3 version_micro 0 build_compiler gcc -build_libraries -lc -lf_memory -lf_console -lfl_console -lf_conversion -lf_pipe -lf_output -lfl_colors -lfll_colors -lfl_errors +build_libraries -lc -lf_memory -lf_console -lfl_console -lf_conversion -lf_pipe -lf_print -lfl_colors -lfll_colors -lfl_errors build_sources_library return_code.c build_sources_program main.c build_sources_headers return_code.h -- 1.8.3.1