diff options
| -rw-r--r-- | cpukit/ChangeLog | 11 | ||||
| -rw-r--r-- | cpukit/libmisc/shell/print-ls.c | 1 | ||||
| -rw-r--r-- | cpukit/libmisc/shell/pwcache.c | 2 | ||||
| -rw-r--r-- | cpukit/libmisc/shell/shell.c | 10 | ||||
| -rw-r--r-- | cpukit/libmisc/shell/shell_cmdset.c | 2 | ||||
| -rw-r--r-- | cpukit/libmisc/shell/shell_makeargs.c | 1 | ||||
| -rw-r--r-- | cpukit/libmisc/shell/write_file.c | 2 |
7 files changed, 22 insertions, 7 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 7773497e9d..3819d9d72f 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,16 @@ 2011-12-04 Ralf Corsépius <ralf.corsepius@rtems.org> + * libmisc/shell/print-ls.c: Include "internal.h". + * libmisc/shell/pwcache.c: Make user_from_uid static. + * libmisc/shell/shell.c: Make rtems_shell_init_env, + rtems_shell_env_free, rtems_shell_line_editor, + rtems_shell_init_issue, rtems_shell_task static. + * libmisc/shell/shell_cmdset.c: Make rtems_shell_add_topic static. + * libmisc/shell/shell_makeargs.c: Include <rtems/shell.h>. + * libmisc/shell/write_file.c: Include <rtems/shell.h>. + +2011-12-04 Ralf Corsépius <ralf.corsepius@rtems.org> + * libmisc/shell/main_help.c: Make rtems_shell_help_cmd, rtems_shell_help static. * libmisc/shell/main_hexdump.c: Make main_hexdump static. diff --git a/cpukit/libmisc/shell/print-ls.c b/cpukit/libmisc/shell/print-ls.c index c19ce9009c..e83ed300d7 100644 --- a/cpukit/libmisc/shell/print-ls.c +++ b/cpukit/libmisc/shell/print-ls.c @@ -68,6 +68,7 @@ __RCSID("$NetBSD: print.c,v 1.40 2004/11/17 17:00:00 mycroft Exp $"); #include <unistd.h> //#include <util.h> +#include "internal.h" #include "extern-ls.h" #define DAYSPERNYEAR ((time_t)365) diff --git a/cpukit/libmisc/shell/pwcache.c b/cpukit/libmisc/shell/pwcache.c index 47b8e96fc6..0f0512f0cf 100644 --- a/cpukit/libmisc/shell/pwcache.c +++ b/cpukit/libmisc/shell/pwcache.c @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD: src/lib/libc/gen/pwcache.c,v 1.11 2007/01/09 00:27:55 imp Ex #define NCACHE 64 /* power of 2 */ #define MASK (NCACHE - 1) /* bits to store with */ -const char * +static const char * user_from_uid(uid_t uid, int nouser) { static struct ncache { diff --git a/cpukit/libmisc/shell/shell.c b/cpukit/libmisc/shell/shell.c index bcc146731b..14b609bc4e 100644 --- a/cpukit/libmisc/shell/shell.c +++ b/cpukit/libmisc/shell/shell.c @@ -61,7 +61,7 @@ rtems_shell_env_t *rtems_current_shell_env = &rtems_global_shell_env; /* * Initialize the shell user/process environment information */ -rtems_shell_env_t *rtems_shell_init_env( +static rtems_shell_env_t *rtems_shell_init_env( rtems_shell_env_t *shell_env_p ) { @@ -83,7 +83,7 @@ rtems_shell_env_t *rtems_shell_init_env( /* * Completely free a shell_env_t and all associated memory */ -void rtems_shell_env_free( +static void rtems_shell_env_free( void *ptr ) { @@ -103,7 +103,7 @@ void rtems_shell_env_free( /* * Get a line of user input with modest features */ -int rtems_shell_line_editor( +static int rtems_shell_line_editor( char *cmds[], int count, int size, @@ -384,7 +384,7 @@ int rtems_shell_line_editor( * TODO: Redirection. Tty Signals. ENVVARs. Shell language. * ----------------------------------------------- */ -void rtems_shell_init_issue(void) +static void rtems_shell_init_issue(void) { static bool issue_inited=false; struct stat buf; @@ -550,7 +550,7 @@ void rtems_shell_print_env( } #endif -rtems_task rtems_shell_task(rtems_task_argument task_argument) +static rtems_task rtems_shell_task(rtems_task_argument task_argument) { rtems_shell_env_t *shell_env = (rtems_shell_env_t*) task_argument; rtems_id wake_on_end = shell_env->wake_on_end; diff --git a/cpukit/libmisc/shell/shell_cmdset.c b/cpukit/libmisc/shell/shell_cmdset.c index 8b48847a17..df0b8c2239 100644 --- a/cpukit/libmisc/shell/shell_cmdset.c +++ b/cpukit/libmisc/shell/shell_cmdset.c @@ -65,7 +65,7 @@ rtems_shell_topic_t * rtems_shell_lookup_topic(const char * topic) { /* * Add a new topic to the list of topics */ -rtems_shell_topic_t * rtems_shell_add_topic(const char * topic) { +static rtems_shell_topic_t * rtems_shell_add_topic(const char * topic) { rtems_shell_topic_t * current,*aux; if (!rtems_shell_first_topic) { diff --git a/cpukit/libmisc/shell/shell_makeargs.c b/cpukit/libmisc/shell/shell_makeargs.c index 727ea829c9..8b99661661 100644 --- a/cpukit/libmisc/shell/shell_makeargs.c +++ b/cpukit/libmisc/shell/shell_makeargs.c @@ -17,6 +17,7 @@ #include <string.h> #include <ctype.h> +#include <rtems/shell.h> int rtems_shell_make_args( char *commandLine, diff --git a/cpukit/libmisc/shell/write_file.c b/cpukit/libmisc/shell/write_file.c index f9e72f4645..499252aa7c 100644 --- a/cpukit/libmisc/shell/write_file.c +++ b/cpukit/libmisc/shell/write_file.c @@ -22,6 +22,8 @@ #include <unistd.h> #include <string.h> +#include <rtems/shell.h> + void rtems_shell_write_file( const char *name, const char *content |