Mercurial > ecos
changeset 2041:9ea31f9f2254
* src/ppp_io.c (cyg_ppp_pppread): caddrt_t to stop compiler warnings.
* src/cbcp.c (cbcp_recvack, cbcp_recvreq): u_char to stop compiler
warnigs
* src/sys-ecos.c (set_up_tty):
* include/pppd.h: Remove incorrect declaration of ifunit which
the compiler complains about.
| author | asl |
|---|---|
| date | Sat, 30 Jul 2005 13:21:01 +0000 |
| parents | cb271f992ffd |
| children | 5bcbb50b501e |
| files | packages/net/ppp/current/ChangeLog packages/net/ppp/current/include/pppd.h packages/net/ppp/current/src/cbcp.c packages/net/ppp/current/src/chap.c packages/net/ppp/current/src/ppp_io.c packages/net/ppp/current/src/pppd.c packages/net/ppp/current/src/slcompress.c packages/net/ppp/current/src/sys-ecos.c packages/net/ppp/current/src/upap.c |
| diffstat | 9 files changed, 30 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/net/ppp/current/ChangeLog +++ b/packages/net/ppp/current/ChangeLog @@ -1,5 +1,9 @@ 2005-07-30 Andrew Lunn <andrew.lunn@ascom.ch> + * src/ppp_io.c (cyg_ppp_pppread): caddrt_t to stop compiler warnings. + * src/cbcp.c (cbcp_recvack, cbcp_recvreq): u_char to stop compiler + warnigs + * src/sys-ecos.c (set_up_tty): * include/pppd.h: Remove incorrect declaration of ifunit which the compiler complains about.
--- a/packages/net/ppp/current/include/pppd.h +++ b/packages/net/ppp/current/include/pppd.h @@ -251,7 +251,7 @@ void format_packet __P((u_char *, int, v void *)); /* Format a packet in human-readable form */ void log_packet __P((u_char *, int, char *, int)); /* Format a packet and log it with syslog */ -void print_string __P((char *, int, void (*) (void *, char *, ...), +void print_string __P((unsigned char *, int, void (*) (void *, char *, ...), void *)); /* Format a string for output */ int fmtmsg __P((char *, int, char *, ...)); /* sprintf++ */ int vfmtmsg __P((char *, int, char *, va_list)); /* vsprintf++ */
--- a/packages/net/ppp/current/src/cbcp.c +++ b/packages/net/ppp/current/src/cbcp.c @@ -116,10 +116,10 @@ cbcp_state cbcp[NUM_PPP]; /* internal prototypes */ -static void cbcp_recvreq __P((cbcp_state *us, char *pckt, int len)); +static void cbcp_recvreq __P((cbcp_state *us, u_char *pckt, int len)); static void cbcp_resp __P((cbcp_state *us)); static void cbcp_up __P((cbcp_state *us)); -static void cbcp_recvack __P((cbcp_state *us, char *pckt, int len)); +static void cbcp_recvack __P((cbcp_state *us, u_char *pckt, int len)); static void cbcp_send __P((cbcp_state *us, u_char code, u_char *buf, int len)); /* init state */ @@ -310,7 +310,7 @@ cbcp_printpkt(p, plen, printer, arg) static void cbcp_recvreq(us, pckt, pcktlen) cbcp_state *us; - char *pckt; + u_char *pckt; int pcktlen; { u_char type, opt_len, delay, addr_type; @@ -440,7 +440,7 @@ cbcp_send(us, code, buf, len) static void cbcp_recvack(us, pckt, len) cbcp_state *us; - char *pckt; + u_char *pckt; int len; { u_char type, delay, addr_type;
--- a/packages/net/ppp/current/src/chap.c +++ b/packages/net/ppp/current/src/chap.c @@ -501,7 +501,7 @@ ChapReceiveChallenge(cstate, inp, id, le case CHAP_DIGEST_MD5: MD5Init(&mdContext); MD5Update(&mdContext, &cstate->resp_id, 1); - MD5Update(&mdContext, secret, secret_len); + MD5Update(&mdContext, (u_char *)secret, secret_len); MD5Update(&mdContext, rchallenge, rchallenge_len); MD5Final(hash, &mdContext); BCOPY(hash, cstate->response, MD5_SIGNATURE_SIZE); @@ -611,7 +611,7 @@ ChapReceiveResponse(cstate, inp, id, len break; /* it's not even the right length */ MD5Init(&mdContext); MD5Update(&mdContext, &cstate->chal_id, 1); - MD5Update(&mdContext, secret, secret_len); + MD5Update(&mdContext, (u_char *)secret, secret_len); MD5Update(&mdContext, cstate->challenge, cstate->chal_len); MD5Final(hash, &mdContext); @@ -901,12 +901,12 @@ ChapPrintPkt(p, plen, printer, arg) printer(arg, "%.2x", x); } printer(arg, ">, name = "); - print_string((char *)p, nlen, printer, arg); + print_string(p, nlen, printer, arg); break; case CHAP_FAILURE: case CHAP_SUCCESS: printer(arg, " "); - print_string((char *)p, len, printer, arg); + print_string(p, len, printer, arg); break; default: for (clen = len; clen > 0; --clen) {
--- a/packages/net/ppp/current/src/ppp_io.c +++ b/packages/net/ppp/current/src/ppp_io.c @@ -373,7 +373,7 @@ cyg_ppp_pppread(tp, uio, flag) for (m = m0; m && uio->uio_resid; m = m->m_next) { - if ((error = uiomove(mtod(m, u_char *), m->m_len, uio)) != 0) + if ((error = uiomove(mtod(m, caddr_t), m->m_len, uio)) != 0) break; } m_freem(m0); @@ -413,7 +413,7 @@ cyg_ppp_pppwrite(tp, uio, flag) len = M_TRAILINGSPACE(m); if (len > uio->uio_resid) len = uio->uio_resid; - if ((error = uiomove(mtod(m, u_char *), len, uio)) != 0) { + if ((error = uiomove(mtod(m, caddr_t), len, uio)) != 0) { m_freem(m0); splx(s); return (error); @@ -597,9 +597,10 @@ pppasyncstart(sc) { register struct tty *tp = (struct tty *) sc->sc_devp; register struct mbuf *m; - register int len; + register unsigned int len; register u_char *start, *stop, *cp; - int n, ndone, done, idle; + int n, done, idle; + cyg_uint32 ndone; struct mbuf *m2; int s; idle = 0; @@ -697,7 +698,7 @@ pppasyncstart(sc) info.tx_bufsize-info.tx_count >= 2 ) { char buf[2]; - int blen = 2; + cyg_uint32 blen = 2; buf[0] = PPP_ESCAPE; buf[1] = *start ^ PPP_TRANS; if( cyg_io_write( tp->t_handle, buf, &blen) != 0 ) { @@ -764,7 +765,7 @@ pppasyncstart(sc) } #else { - int elen = p-endseq; + cyg_uint32 elen = p-endseq; cyg_serial_buf_info_t info; cyg_uint32 ilen = sizeof(info); q = p; @@ -788,7 +789,7 @@ pppasyncstart(sc) if (!done) { /* remember where we got to */ - m->m_data = start; + m->m_data = (char *)start; m->m_len = len; break; }
--- a/packages/net/ppp/current/src/pppd.c +++ b/packages/net/ppp/current/src/pppd.c @@ -782,7 +782,7 @@ pr_log __V((void *arg, char *fmt, ...)) */ void print_string(p, len, printer, arg) - char *p; + unsigned char *p; int len; void (*printer) __P((void *, char *, ...)); void *arg;
--- a/packages/net/ppp/current/src/slcompress.c +++ b/packages/net/ppp/current/src/slcompress.c @@ -476,7 +476,8 @@ sl_uncompress_tcp(bufp, len, type, comp) struct slcompress *comp; { u_char *hdr, *cp; - int hlen, vjlen; + unsigned int hlen; + int vjlen; cp = bufp? *bufp: NULL; vjlen = sl_uncompress_tcp_core(cp, len, len, type, comp, &hdr, &hlen);
--- a/packages/net/ppp/current/src/sys-ecos.c +++ b/packages/net/ppp/current/src/sys-ecos.c @@ -388,7 +388,7 @@ set_up_tty(cyg_io_handle_t handle, int l { cyg_serial_info_t cfg; int err; - int len = sizeof(cfg); + cyg_uint32 len = sizeof(cfg); err = cyg_io_get_config( handle, CYG_IO_GET_CONFIG_SERIAL_INFO, @@ -624,7 +624,7 @@ wait_input(timo) for(;;) { int s; - int len = 1; + cyg_uint32 len = 1; Cyg_ErrNo err; cyg_serial_buf_info_t info; cyg_uint32 ilen = sizeof(info);
--- a/packages/net/ppp/current/src/upap.c +++ b/packages/net/ppp/current/src/upap.c @@ -604,7 +604,7 @@ upap_printpkt(p, plen, printer, arg) { int code, id, len; int mlen, ulen, wlen; - char *user, *pwd, *msg; + u_char *user, *pwd, *msg; u_char *pstart; if (plen < UPAP_HEADERLEN) @@ -632,8 +632,8 @@ upap_printpkt(p, plen, printer, arg) wlen = p[ulen + 1]; if (len < ulen + wlen + 2) break; - user = (char *) (p + 1); - pwd = (char *) (p + ulen + 2); + user = (p + 1); + pwd = (p + ulen + 2); p += ulen + wlen + 2; len -= ulen + wlen + 2; printer(arg, " user="); @@ -648,7 +648,7 @@ upap_printpkt(p, plen, printer, arg) mlen = p[0]; if (len < mlen + 1) break; - msg = (char *) (p + 1); + msg = (p + 1); p += mlen + 1; len -= mlen + 1; printer(arg, " ");