From f81fb8098142dfe33f7669b918836173b027381b Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 6 Feb 2003 22:19:11 +0000 Subject: 2003-02-06 Joel Sherrill * pppd/chat.c: Convert routines with common names to static. This included get_char(), put_char(), and character() among others. --- c/src/libnetworking/ChangeLog | 5 +++++ c/src/libnetworking/pppd/chat.c | 28 ++++++++++++++-------------- cpukit/pppd/chat.c | 28 ++++++++++++++-------------- 3 files changed, 33 insertions(+), 28 deletions(-) diff --git a/c/src/libnetworking/ChangeLog b/c/src/libnetworking/ChangeLog index b073459f9d..e5890efec2 100644 --- a/c/src/libnetworking/ChangeLog +++ b/c/src/libnetworking/ChangeLog @@ -1,3 +1,8 @@ +2003-02-06 Joel Sherrill + + * pppd/chat.c: Convert routines with common names to static. This + included get_char(), put_char(), and character() among others. + 2003-01-15 Ralf Corsepius * wrapup/Makefile.am: Don't include @RTEMS_BSP@.cfg. diff --git a/c/src/libnetworking/pppd/chat.c b/c/src/libnetworking/pppd/chat.c index 51f79ccc83..74be1b06f0 100644 --- a/c/src/libnetworking/pppd/chat.c +++ b/c/src/libnetworking/pppd/chat.c @@ -183,15 +183,15 @@ int say_next = 0, hup_next = 0; void *dup_mem __P((void *b, size_t c)); void *copy_of __P((char *s)); void break_sequence __P((void)); -int get_string __P((register char *string)); -int put_string __P((register char *s)); -int write_char __P((int c)); -int put_char __P((int c)); -int get_char __P((void)); +static int get_string __P((register char *string)); +static int put_string __P((register char *s)); +static int write_char __P((int c)); +static int put_char __P((int c)); +static int get_char __P((void)); void chat_send __P((register char *s)); -char *character __P((int c)); +static char *character __P((int c)); void chat_expect __P((register char *s)); -char *clean __P((register char *s, int sending)); +static char *clean __P((register char *s, int sending)); char *expect_strtok __P((char *, char *)); int chatmain __P((int, int, char *)); @@ -267,7 +267,7 @@ void break_sequence() /* * 'Clean up' this string. */ -char *clean(s, sending) +static char *clean(s, sending) register char *s; int sending; /* set to 1 when sending (putting) this string. */ { @@ -573,7 +573,7 @@ char *s; * the data. */ -char *character(c) +static char *character(c) int c; { static char string[10]; @@ -669,7 +669,7 @@ register char *s; } } -int get_char() +static int get_char() { int status; char c; @@ -688,7 +688,7 @@ int get_char() return -1; } -int put_char(c) +static int put_char(c) int c; { char ch = c; @@ -698,7 +698,7 @@ int c; return 0; } -int write_char (c) +static int write_char (c) int c; { if (put_char(c) < 0) { @@ -707,7 +707,7 @@ int c; return (1); } -int put_string (s) +static int put_string (s) register char *s; { quiet = 0; @@ -752,7 +752,7 @@ register char *s; /* * 'Wait for' this string to appear on this file descriptor. */ -int get_string(string) +static int get_string(string) register char *string; { int c, len, minlen; diff --git a/cpukit/pppd/chat.c b/cpukit/pppd/chat.c index 51f79ccc83..74be1b06f0 100644 --- a/cpukit/pppd/chat.c +++ b/cpukit/pppd/chat.c @@ -183,15 +183,15 @@ int say_next = 0, hup_next = 0; void *dup_mem __P((void *b, size_t c)); void *copy_of __P((char *s)); void break_sequence __P((void)); -int get_string __P((register char *string)); -int put_string __P((register char *s)); -int write_char __P((int c)); -int put_char __P((int c)); -int get_char __P((void)); +static int get_string __P((register char *string)); +static int put_string __P((register char *s)); +static int write_char __P((int c)); +static int put_char __P((int c)); +static int get_char __P((void)); void chat_send __P((register char *s)); -char *character __P((int c)); +static char *character __P((int c)); void chat_expect __P((register char *s)); -char *clean __P((register char *s, int sending)); +static char *clean __P((register char *s, int sending)); char *expect_strtok __P((char *, char *)); int chatmain __P((int, int, char *)); @@ -267,7 +267,7 @@ void break_sequence() /* * 'Clean up' this string. */ -char *clean(s, sending) +static char *clean(s, sending) register char *s; int sending; /* set to 1 when sending (putting) this string. */ { @@ -573,7 +573,7 @@ char *s; * the data. */ -char *character(c) +static char *character(c) int c; { static char string[10]; @@ -669,7 +669,7 @@ register char *s; } } -int get_char() +static int get_char() { int status; char c; @@ -688,7 +688,7 @@ int get_char() return -1; } -int put_char(c) +static int put_char(c) int c; { char ch = c; @@ -698,7 +698,7 @@ int c; return 0; } -int write_char (c) +static int write_char (c) int c; { if (put_char(c) < 0) { @@ -707,7 +707,7 @@ int c; return (1); } -int put_string (s) +static int put_string (s) register char *s; { quiet = 0; @@ -752,7 +752,7 @@ register char *s; /* * 'Wait for' this string to appear on this file descriptor. */ -int get_string(string) +static int get_string(string) register char *string; { int c, len, minlen; -- cgit v1.2.3