diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-12-04 10:22:51 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-12-04 10:22:51 +0000 |
commit | 3421e5201f845b479e4881e5468ecf8313728c5a (patch) | |
tree | 65b52d79fc14a002fab9a78f0e53c343bf4583d7 /cpukit/libmisc | |
parent | 2011-12-04 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-3421e5201f845b479e4881e5468ecf8313728c5a.tar.bz2 |
* libmisc/shell/main_help.c: Make rtems_shell_help_cmd,
rtems_shell_help static.
* libmisc/shell/main_hexdump.c: Make main_hexdump static.
* libmisc/shell/main_id.c: Make rtems_shell_main_id static.
* libmisc/shell/main_ifconfig.c: Make rtems_shell_main_ifconfig static.
* libmisc/shell/main_ln.c: Make rtems_shell_main_ln static.
* libmisc/shell/main_logoff.c: Make rtems_shell_main_logoff static.
* libmisc/shell/main_ls.c: Make rtems_shell_main_ls static.
* libmisc/shell/main_mallocinfo.c: Include <rtems/libcsupport.h>.
Remove private decls of malloc_info,
rtems_shell_print_unified_work_area_message.
Make rtems_shell_main_malloc_info static.
* libmisc/shell/main_medit.c: Remove private decl of
rtems_shell_main_mdump.
Make rtems_shell_main_medit static.
* libmisc/shell/main_mfill.c: Make rtems_shell_main_mfill static.
* libmisc/shell/main_mkdir.c: Make rtems_shell_main_mkdir static.
* libmisc/shell/main_mknod.c: Make rtems_shell_main_mknod static.
* libmisc/shell/main_mmove.c: Remove private decl of
rtems_shell_main_mdump.
Make rtems_shell_main_mmove static.
* libmisc/shell/main_mount.c: Make rtems_shell_main_mount static.
* libmisc/shell/main_msdosfmt.c: Make rtems_shell_main_msdos_format
static.
* libmisc/shell/main_mv.c: Include "internal.h".
Make rtems_shell_mv_exit, rtems_shell_main_mv static.
Remove private decls of strmode rtems_shell_main_cp,
rtems_shell_main_rm.
* libmisc/shell/main_mwdump.c: Make rtems_shell_main_mwdump static.
* libmisc/shell/main_netstats.c: Make rtems_shell_main_netstats
static.
* libmisc/shell/main_perioduse.c: Make rtems_shell_main_perioduse
static.
* libmisc/shell/main_pwd.c: Make rtems_shell_main_pwd static.
* libmisc/shell/main_rm.c: Include "internal.h".
Make rtems_shell_rm_exit static.
Remove private decl of strmode.
* libmisc/shell/main_rmdir.c: Make rtems_shell_main_rmdir static.
libmisc/shell/main_route.c: Make rtems_shell_main_route static.
* libmisc/shell/main_setenv.c: Make rtems_shell_main_setenv static.
* libmisc/shell/main_sleep.c: Make rtems_shell_main_sleep static.
* libmisc/shell/main_stackuse.c: Make rtems_shell_main_stackuse static.
* libmisc/shell/main_time.c: Make rtems_shell_main_time static.
* libmisc/shell/main_tty.c: Make rtems_shell_main_tty static.
* libmisc/shell/main_umask.c: Make rtems_shell_main_umask static.
* libmisc/shell/main_unmount.c: Make rtems_shell_main_unmount
static.
* libmisc/shell/main_unsetenv.c: Make rtems_shell_main_unsetenv
static.
* libmisc/shell/main_whoami.c: Make rtems_shell_main_whoami static.
* libmisc/shell/main_wkspaceinfo.c: Make
rtems_shell_main_wkspace_info static.
Diffstat (limited to 'cpukit/libmisc')
33 files changed, 41 insertions, 51 deletions
diff --git a/cpukit/libmisc/shell/main_help.c b/cpukit/libmisc/shell/main_help.c index 512eb60bbc..24ddad673d 100644 --- a/cpukit/libmisc/shell/main_help.c +++ b/cpukit/libmisc/shell/main_help.c @@ -27,7 +27,7 @@ /* * show the help for one command. */ -int rtems_shell_help_cmd( +static int rtems_shell_help_cmd( rtems_shell_cmd_t *shell_cmd ) { @@ -76,7 +76,7 @@ int rtems_shell_help_cmd( * Can you see the header of routine? Known? * The same with all the commands.... */ -int rtems_shell_help( +static int rtems_shell_help( int argc, char * argv[] ) diff --git a/cpukit/libmisc/shell/main_hexdump.c b/cpukit/libmisc/shell/main_hexdump.c index 8eb5a4e409..5cdb7d23cc 100644 --- a/cpukit/libmisc/shell/main_hexdump.c +++ b/cpukit/libmisc/shell/main_hexdump.c @@ -79,7 +79,7 @@ rtems_shell_hexdump_exit (rtems_shell_hexdump_globals* globals, int code) static int main_hexdump(rtems_shell_hexdump_globals* globals, int argc, char *argv[]); -int +static int rtems_shell_main_hexdump(int argc, char *argv[]) { rtems_shell_hexdump_globals hexdump_globals; diff --git a/cpukit/libmisc/shell/main_id.c b/cpukit/libmisc/shell/main_id.c index 8fa0914597..4acf502715 100644 --- a/cpukit/libmisc/shell/main_id.c +++ b/cpukit/libmisc/shell/main_id.c @@ -28,7 +28,7 @@ #include <rtems/shell.h> #include "internal.h" -int rtems_shell_main_id( +static int rtems_shell_main_id( int argc __attribute__((unused)), char *argv[] __attribute__((unused)) ) diff --git a/cpukit/libmisc/shell/main_ifconfig.c b/cpukit/libmisc/shell/main_ifconfig.c index 9f16207b10..f99e2f192f 100644 --- a/cpukit/libmisc/shell/main_ifconfig.c +++ b/cpukit/libmisc/shell/main_ifconfig.c @@ -29,7 +29,7 @@ #include <rtems/shell.h> #include "internal.h" -int rtems_shell_main_ifconfig( +static int rtems_shell_main_ifconfig( int argc, char *argv[] ) diff --git a/cpukit/libmisc/shell/main_ln.c b/cpukit/libmisc/shell/main_ln.c index aff1ffbf91..804004816a 100644 --- a/cpukit/libmisc/shell/main_ln.c +++ b/cpukit/libmisc/shell/main_ln.c @@ -102,8 +102,7 @@ rtems_shell_ln_exit (rtems_shell_ln_globals* globals, int code) static int main_ln(rtems_shell_ln_globals* globals, int argc, char *argv[]); -int -rtems_shell_main_ln(int argc, char *argv[]) +static int rtems_shell_main_ln(int argc, char *argv[]) { rtems_shell_ln_globals ln_globals; rtems_shell_ln_globals* globals = &ln_globals; diff --git a/cpukit/libmisc/shell/main_logoff.c b/cpukit/libmisc/shell/main_logoff.c index 7258724f04..9337abf11f 100644 --- a/cpukit/libmisc/shell/main_logoff.c +++ b/cpukit/libmisc/shell/main_logoff.c @@ -22,7 +22,7 @@ #include <rtems/shell.h> #include "internal.h" -int rtems_shell_main_logoff( +static int rtems_shell_main_logoff( int argc __attribute__((unused)), char *argv[] __attribute__((unused)) ) diff --git a/cpukit/libmisc/shell/main_ls.c b/cpukit/libmisc/shell/main_ls.c index 0b5703637a..1e881a2859 100644 --- a/cpukit/libmisc/shell/main_ls.c +++ b/cpukit/libmisc/shell/main_ls.c @@ -132,8 +132,7 @@ rtems_shell_ls_exit (rtems_shell_ls_globals* globals, int code) static int main_ls(rtems_shell_ls_globals* globals, int argc, char *argv[]); -int -rtems_shell_main_ls(int argc, char *argv[]) +static int rtems_shell_main_ls(int argc, char *argv[]) { rtems_shell_ls_globals ls_globals; rtems_shell_ls_globals* globals = &ls_globals; diff --git a/cpukit/libmisc/shell/main_mallocinfo.c b/cpukit/libmisc/shell/main_mallocinfo.c index 12423c7a73..97aa69620a 100644 --- a/cpukit/libmisc/shell/main_mallocinfo.c +++ b/cpukit/libmisc/shell/main_mallocinfo.c @@ -19,13 +19,12 @@ #include <rtems.h> #include <rtems/malloc.h> +#include <rtems/libcsupport.h> #include <rtems/shell.h> -#include "internal.h" -extern int malloc_info( region_information_block * ); -extern void rtems_shell_print_unified_work_area_message(void); +#include "internal.h" -int rtems_shell_main_malloc_info( +static int rtems_shell_main_malloc_info( int argc, char *argv[] ) diff --git a/cpukit/libmisc/shell/main_medit.c b/cpukit/libmisc/shell/main_medit.c index 7905fbe689..d37a1d9a97 100644 --- a/cpukit/libmisc/shell/main_medit.c +++ b/cpukit/libmisc/shell/main_medit.c @@ -25,9 +25,7 @@ #include <rtems/stringto.h> #include "internal.h" -extern int rtems_shell_main_mdump(int, char *); - -int rtems_shell_main_medit( +static int rtems_shell_main_medit( int argc, char *argv[] ) diff --git a/cpukit/libmisc/shell/main_mfill.c b/cpukit/libmisc/shell/main_mfill.c index ecbaec4878..5ff7dfd584 100644 --- a/cpukit/libmisc/shell/main_mfill.c +++ b/cpukit/libmisc/shell/main_mfill.c @@ -25,7 +25,7 @@ #include <rtems/stringto.h> #include "internal.h" -int rtems_shell_main_mfill( +static int rtems_shell_main_mfill( int argc, char *argv[] ) diff --git a/cpukit/libmisc/shell/main_mkdir.c b/cpukit/libmisc/shell/main_mkdir.c index e191818923..cd4bf757c2 100644 --- a/cpukit/libmisc/shell/main_mkdir.c +++ b/cpukit/libmisc/shell/main_mkdir.c @@ -27,7 +27,7 @@ #include <rtems/shell.h> #include "internal.h" -int rtems_shell_main_mkdir( +static int rtems_shell_main_mkdir( int argc, char *argv[] ) diff --git a/cpukit/libmisc/shell/main_mknod.c b/cpukit/libmisc/shell/main_mknod.c index e1ebb2a162..ace91aaa8f 100644 --- a/cpukit/libmisc/shell/main_mknod.c +++ b/cpukit/libmisc/shell/main_mknod.c @@ -100,7 +100,7 @@ rtems_shell_mknod_exit (rtems_shell_mknod_globals* globals, int code) #include "mknod-pack_dev.c" -int +static int rtems_shell_main_mknod(int argc, char *argv[]) { rtems_shell_mknod_globals mknod_globals; diff --git a/cpukit/libmisc/shell/main_mmove.c b/cpukit/libmisc/shell/main_mmove.c index 30c6629547..f5cc220026 100644 --- a/cpukit/libmisc/shell/main_mmove.c +++ b/cpukit/libmisc/shell/main_mmove.c @@ -25,9 +25,7 @@ #include <rtems/stringto.h> #include "internal.h" -extern int rtems_shell_main_mdump(int, char *); - -int rtems_shell_main_mmove( +static int rtems_shell_main_mmove( int argc, char *argv[] ) diff --git a/cpukit/libmisc/shell/main_mount.c b/cpukit/libmisc/shell/main_mount.c index b192a1668d..5bd1a03099 100644 --- a/cpukit/libmisc/shell/main_mount.c +++ b/cpukit/libmisc/shell/main_mount.c @@ -34,7 +34,7 @@ static bool print_filesystem(const rtems_filesystem_table_t *entry, void *arg) return false; } -int rtems_shell_main_mount( +static int rtems_shell_main_mount( int argc, char *argv[] ) diff --git a/cpukit/libmisc/shell/main_msdosfmt.c b/cpukit/libmisc/shell/main_msdosfmt.c index 86c74da6fe..d86212c136 100644 --- a/cpukit/libmisc/shell/main_msdosfmt.c +++ b/cpukit/libmisc/shell/main_msdosfmt.c @@ -24,7 +24,7 @@ #include <rtems/fsmount.h> #include "internal.h" -int rtems_shell_main_msdos_format( +static int rtems_shell_main_msdos_format( int argc, char *argv[] ) diff --git a/cpukit/libmisc/shell/main_mv.c b/cpukit/libmisc/shell/main_mv.c index 644900bc17..081f6845c6 100644 --- a/cpukit/libmisc/shell/main_mv.c +++ b/cpukit/libmisc/shell/main_mv.c @@ -74,6 +74,8 @@ __RCSID("$NetBSD: mv.c,v 1.41 2008/07/20 00:52:40 lukem Exp $"); #include <string.h> #include <unistd.h> +#include "internal.h" + #include "pathnames-mv.h" /* RTEMS specific changes */ @@ -100,23 +102,17 @@ int main(int, char *[]); #define exit(ec) rtems_shell_mv_exit(globals, ec) -void +static void rtems_shell_mv_exit (rtems_shell_mv_globals* globals, int code) { globals->exit_code = code; longjmp (globals->exit_jmp, 1); } -void strmode(mode_t mode, char *p); const char *user_from_uid(uid_t uid, int nouser); char *group_from_gid(gid_t gid, int nogroup); -static int main_mv(rtems_shell_mv_globals* globals, int argc, char *argv[]); - -int rtems_shell_main_cp(int argc, char *argv[]); -int rtems_shell_main_rm(int argc, char *argv[]); - -int +static int rtems_shell_main_mv(int argc, char *argv[]) { rtems_shell_mv_globals mv_globals; diff --git a/cpukit/libmisc/shell/main_mwdump.c b/cpukit/libmisc/shell/main_mwdump.c index f3e3cfc27b..b2b184a1db 100644 --- a/cpukit/libmisc/shell/main_mwdump.c +++ b/cpukit/libmisc/shell/main_mwdump.c @@ -26,7 +26,7 @@ #include <rtems/stringto.h> #include "internal.h" -int rtems_shell_main_mwdump( +static int rtems_shell_main_mwdump( int argc, char *argv[] ) diff --git a/cpukit/libmisc/shell/main_netstats.c b/cpukit/libmisc/shell/main_netstats.c index cc9b95a52c..7fe9325dc6 100644 --- a/cpukit/libmisc/shell/main_netstats.c +++ b/cpukit/libmisc/shell/main_netstats.c @@ -39,7 +39,7 @@ static void netstats_usage(void) ); } -int rtems_shell_main_netstats( /* command */ +static int rtems_shell_main_netstats( /* command */ int argc, char *argv[] ) diff --git a/cpukit/libmisc/shell/main_perioduse.c b/cpukit/libmisc/shell/main_perioduse.c index d0f123af1c..c515a9f9db 100644 --- a/cpukit/libmisc/shell/main_perioduse.c +++ b/cpukit/libmisc/shell/main_perioduse.c @@ -21,7 +21,7 @@ #include <rtems/shell.h> #include "internal.h" -int rtems_shell_main_perioduse( +static int rtems_shell_main_perioduse( int argc, char *argv[] ) diff --git a/cpukit/libmisc/shell/main_pwd.c b/cpukit/libmisc/shell/main_pwd.c index 3a298f8242..ecdd849061 100644 --- a/cpukit/libmisc/shell/main_pwd.c +++ b/cpukit/libmisc/shell/main_pwd.c @@ -23,7 +23,7 @@ #include <rtems/shell.h> #include "internal.h" -int rtems_shell_main_pwd( +static int rtems_shell_main_pwd( int argc __attribute__((unused)), char *argv[] __attribute__((unused)) ) diff --git a/cpukit/libmisc/shell/main_rm.c b/cpukit/libmisc/shell/main_rm.c index 465a0daf46..a136d2bd7e 100644 --- a/cpukit/libmisc/shell/main_rm.c +++ b/cpukit/libmisc/shell/main_rm.c @@ -67,6 +67,8 @@ __FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.58 2006/10/31 02:22:36 delphij Exp $"); #include <string.h> #include <unistd.h> +#include "internal.h" + #define rindex(s,c) strrchr(s,c) /* RTEMS specific changes */ @@ -94,7 +96,7 @@ typedef struct { #include <setjmp.h> #define exit(ec) rtems_shell_rm_exit(globals, ec) -void +static void rtems_shell_rm_exit (rtems_shell_rm_globals* globals, int code) { globals->exit_code = code; @@ -535,7 +537,6 @@ err: eval = 1; return (0); } -void strmode(mode_t mode, char *p); char *fflagstostr(u_long flags); const char *user_from_uid(uid_t uid, int nouser); diff --git a/cpukit/libmisc/shell/main_rmdir.c b/cpukit/libmisc/shell/main_rmdir.c index df94a7efbf..8c0a7f6172 100644 --- a/cpukit/libmisc/shell/main_rmdir.c +++ b/cpukit/libmisc/shell/main_rmdir.c @@ -25,7 +25,7 @@ #include <rtems/shell.h> #include "internal.h" -int rtems_shell_main_rmdir (int argc, char *argv[]) +static int rtems_shell_main_rmdir (int argc, char *argv[]) { char *dir; int n; diff --git a/cpukit/libmisc/shell/main_route.c b/cpukit/libmisc/shell/main_route.c index ea503b4ef2..533e7e6386 100644 --- a/cpukit/libmisc/shell/main_route.c +++ b/cpukit/libmisc/shell/main_route.c @@ -27,7 +27,7 @@ #include <rtems/shell.h> #include "internal.h" -int rtems_shell_main_route( +static int rtems_shell_main_route( int argc, char *argv[] ) diff --git a/cpukit/libmisc/shell/main_setenv.c b/cpukit/libmisc/shell/main_setenv.c index 5b7c92920f..a50f1a609c 100644 --- a/cpukit/libmisc/shell/main_setenv.c +++ b/cpukit/libmisc/shell/main_setenv.c @@ -16,7 +16,7 @@ #include <rtems/shell.h> #include "internal.h" -int rtems_shell_main_setenv(int argc, char *argv[]) +static int rtems_shell_main_setenv(int argc, char *argv[]) { char* env = NULL; char* string = NULL; diff --git a/cpukit/libmisc/shell/main_sleep.c b/cpukit/libmisc/shell/main_sleep.c index 2dbb66a996..4571392222 100644 --- a/cpukit/libmisc/shell/main_sleep.c +++ b/cpukit/libmisc/shell/main_sleep.c @@ -23,7 +23,7 @@ #include <rtems/stringto.h> #include "internal.h" -int rtems_shell_main_sleep( +static int rtems_shell_main_sleep( int argc, char *argv[] ) diff --git a/cpukit/libmisc/shell/main_stackuse.c b/cpukit/libmisc/shell/main_stackuse.c index 4d1d944ceb..bc9ffa9a4c 100644 --- a/cpukit/libmisc/shell/main_stackuse.c +++ b/cpukit/libmisc/shell/main_stackuse.c @@ -22,7 +22,7 @@ #include <rtems/shell.h> #include "internal.h" -int rtems_shell_main_stackuse( +static int rtems_shell_main_stackuse( int argc __attribute__((unused)), char *argv[] __attribute__((unused)) ) diff --git a/cpukit/libmisc/shell/main_time.c b/cpukit/libmisc/shell/main_time.c index fac90ae855..237cc720bb 100644 --- a/cpukit/libmisc/shell/main_time.c +++ b/cpukit/libmisc/shell/main_time.c @@ -35,7 +35,7 @@ #error "PRIdtime_t: unsupported size of time_t" #endif -int rtems_shell_main_time( +static int rtems_shell_main_time( int argc, char *argv[] ) diff --git a/cpukit/libmisc/shell/main_tty.c b/cpukit/libmisc/shell/main_tty.c index f8313b55f8..958aebe9f0 100644 --- a/cpukit/libmisc/shell/main_tty.c +++ b/cpukit/libmisc/shell/main_tty.c @@ -25,7 +25,7 @@ #include <rtems/shell.h> #include "internal.h" -int rtems_shell_main_tty( +static int rtems_shell_main_tty( int argc __attribute__((unused)), char *argv[] __attribute__((unused)) ) diff --git a/cpukit/libmisc/shell/main_umask.c b/cpukit/libmisc/shell/main_umask.c index 8bfbe7e443..21d4f15afe 100644 --- a/cpukit/libmisc/shell/main_umask.c +++ b/cpukit/libmisc/shell/main_umask.c @@ -28,7 +28,7 @@ #include <rtems/stringto.h> #include "internal.h" -int rtems_shell_main_umask( +static int rtems_shell_main_umask( int argc, char *argv[] ) diff --git a/cpukit/libmisc/shell/main_unmount.c b/cpukit/libmisc/shell/main_unmount.c index ba101dc014..5d44ae1802 100644 --- a/cpukit/libmisc/shell/main_unmount.c +++ b/cpukit/libmisc/shell/main_unmount.c @@ -27,7 +27,7 @@ #include <rtems/fsmount.h> #include "internal.h" -int rtems_shell_main_unmount( +static int rtems_shell_main_unmount( int argc, char *argv[] ) diff --git a/cpukit/libmisc/shell/main_unsetenv.c b/cpukit/libmisc/shell/main_unsetenv.c index 8805ba4341..af350c9283 100644 --- a/cpukit/libmisc/shell/main_unsetenv.c +++ b/cpukit/libmisc/shell/main_unsetenv.c @@ -16,7 +16,7 @@ #include <rtems/shell.h> #include "internal.h" -int rtems_shell_main_unsetenv(int argc, char *argv[]) +static int rtems_shell_main_unsetenv(int argc, char *argv[]) { if (argc != 2) { diff --git a/cpukit/libmisc/shell/main_whoami.c b/cpukit/libmisc/shell/main_whoami.c index ce34ed95ca..8db1f00a56 100644 --- a/cpukit/libmisc/shell/main_whoami.c +++ b/cpukit/libmisc/shell/main_whoami.c @@ -26,7 +26,7 @@ #include <rtems/shell.h> #include "internal.h" -int rtems_shell_main_whoami( +static int rtems_shell_main_whoami( int argc __attribute__((unused)), char *argv[] __attribute__((unused)) ) diff --git a/cpukit/libmisc/shell/main_wkspaceinfo.c b/cpukit/libmisc/shell/main_wkspaceinfo.c index 9f7be701b6..cb316337c7 100644 --- a/cpukit/libmisc/shell/main_wkspaceinfo.c +++ b/cpukit/libmisc/shell/main_wkspaceinfo.c @@ -31,7 +31,7 @@ void rtems_shell_print_unified_work_area_message(void) ); } -int rtems_shell_main_wkspace_info( +static int rtems_shell_main_wkspace_info( int argc __attribute__((unused)), char *argv[] __attribute__((unused)) ) |