diff options
| author | Jordan K. Hubbard <jkh@FreeBSD.org> | 2000-09-20 04:40:57 +0000 |
|---|---|---|
| committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 2000-09-20 04:40:57 +0000 |
| commit | ace4f3086617e9b6efcfb61e97491ec16cfbb8cd (patch) | |
| tree | 1b26b17573e3e511a240f8e4d224a975bc9f67d4 /lib/libalias | |
| parent | 06c6272fec9082e461826a0985c5caba0f48a767 (diff) | |
Notes
Diffstat (limited to 'lib/libalias')
| -rw-r--r-- | lib/libalias/Makefile | 4 | ||||
| -rw-r--r-- | lib/libalias/alias_proxy.c | 9 | ||||
| -rw-r--r-- | lib/libalias/alias_smedia.c | 9 |
3 files changed, 14 insertions, 8 deletions
diff --git a/lib/libalias/Makefile b/lib/libalias/Makefile index 14ace0fc03d1..c5bd11dec9e4 100644 --- a/lib/libalias/Makefile +++ b/lib/libalias/Makefile @@ -3,11 +3,11 @@ LIB= alias SHLIB_MAJOR= 4 SHLIB_MINOR= 0 -CFLAGS+= -Wall -I${.CURDIR} +CFLAGS+= -Wall -Wmissing-prototypes SRCS= alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \ alias_nbt.c alias_pptp.c alias_proxy.c alias_smedia.c \ alias_util.c INCS= alias.h -MAN3= libalias.3 +MAN3= libalias.3 .include <bsd.lib.mk> diff --git a/lib/libalias/alias_proxy.c b/lib/libalias/alias_proxy.c index 02e176532232..08627fa13425 100644 --- a/lib/libalias/alias_proxy.c +++ b/lib/libalias/alias_proxy.c @@ -520,6 +520,7 @@ PacketAliasProxyRule(const char *cmd) char buffer[256]; char str_port[sizeof(buffer)]; char str_server_port[sizeof(buffer)]; + char *res = buffer; int rule_index; int proto; @@ -540,7 +541,7 @@ PacketAliasProxyRule(const char *cmd) /* Convert to lower case */ len = strlen(buffer); for (i=0; i<len; i++) - buffer[i] = tolower(buffer[i]); + buffer[i] = tolower((unsigned char)buffer[i]); /* Set default proxy type */ @@ -570,7 +571,7 @@ PacketAliasProxyRule(const char *cmd) #define STATE_READ_SRC 7 #define STATE_READ_DST 8 state = STATE_READ_KEYWORD; - token = strtok(buffer, " \t"); + token = strsep(&res, " \t"); token_count = 0; while (token != NULL) { @@ -739,7 +740,9 @@ PacketAliasProxyRule(const char *cmd) break; } - token = strtok(NULL, " \t"); + do { + token = strsep(&res, " \t"); + } while (token != NULL && !*token); } #undef STATE_READ_KEYWORD #undef STATE_READ_TYPE diff --git a/lib/libalias/alias_smedia.c b/lib/libalias/alias_smedia.c index 2b9ca5f4af6b..9df0578a7548 100644 --- a/lib/libalias/alias_smedia.c +++ b/lib/libalias/alias_smedia.c @@ -114,7 +114,8 @@ #define ISDIGIT(a) (((a) >= '0') && ((a) <= '9')) -int search_string(char *data, int dlen, char *search_str) +static int +search_string(char *data, int dlen, char *search_str) { int i, j, k; int search_str_len; @@ -134,7 +135,8 @@ int search_string(char *data, int dlen, char *search_str) return -1; } -int alias_rtsp_out(struct ip *pip, +static int +alias_rtsp_out(struct ip *pip, struct alias_link *link, char *data, char *port_str) @@ -315,7 +317,8 @@ int alias_rtsp_out(struct ip *pip, /* Support the protocol used by early versions of RealPlayer */ -int alias_pna_out(struct ip *pip, +static int +alias_pna_out(struct ip *pip, struct alias_link *link, char *data, int dlen) |