diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2005-04-28 21:49:50 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2005-04-28 21:49:50 +0000 |
commit | 3274c87676e11cfbf1f6d3d554762ecdea47fe79 (patch) | |
tree | 4824c477c358154c6bb33d0e8379ff36f0039b20 | |
parent | 2005-04-28 Jennifer Averett <jennifer.averett@oarcorp.com> (diff) | |
download | rtems-3274c87676e11cfbf1f6d3d554762ecdea47fe79.tar.bz2 |
2005-04-28 Joel Sherrill <joel@OARcorp.com>
* libnetworking/kern/kern_sysctl.c, libnetworking/libc/inet_ntop.c,
libnetworking/net/if_ppp.c, libnetworking/net/pppcompress.c,
libnetworking/net/slcompress.c, libnetworking/netinet/ip_output.c,
libnetworking/netinet/udp_usrreq.c, libnetworking/nfs/bootp_subr.c,
libnetworking/rtems/rtems_select.c,
libnetworking/rtems/rtems_showifstat.c,
libnetworking/rtems/rtems_showroute.c,
libnetworking/rtems/rtems_syscall.c: Fixed type mismatch and
uninitialized variable warnings.
Diffstat (limited to '')
-rw-r--r-- | cpukit/ChangeLog | 12 | ||||
-rw-r--r-- | cpukit/libnetworking/kern/kern_sysctl.c | 2 | ||||
-rw-r--r-- | cpukit/libnetworking/libc/inet_ntop.c | 2 | ||||
-rw-r--r-- | cpukit/libnetworking/net/if_ppp.c | 5 | ||||
-rw-r--r-- | cpukit/libnetworking/net/pppcompress.c | 3 | ||||
-rw-r--r-- | cpukit/libnetworking/net/slcompress.c | 3 | ||||
-rw-r--r-- | cpukit/libnetworking/netinet/ip_output.c | 2 | ||||
-rw-r--r-- | cpukit/libnetworking/netinet/udp_usrreq.c | 1 | ||||
-rw-r--r-- | cpukit/libnetworking/nfs/bootp_subr.c | 18 | ||||
-rw-r--r-- | cpukit/libnetworking/rtems/rtems_select.c | 2 | ||||
-rw-r--r-- | cpukit/libnetworking/rtems/rtems_showifstat.c | 2 | ||||
-rw-r--r-- | cpukit/libnetworking/rtems/rtems_showroute.c | 2 | ||||
-rw-r--r-- | cpukit/libnetworking/rtems/rtems_syscall.c | 3 |
13 files changed, 40 insertions, 17 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 5433b98219..87bc1aa924 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,17 @@ 2005-04-28 Joel Sherrill <joel@OARcorp.com> + * libnetworking/kern/kern_sysctl.c, libnetworking/libc/inet_ntop.c, + libnetworking/net/if_ppp.c, libnetworking/net/pppcompress.c, + libnetworking/net/slcompress.c, libnetworking/netinet/ip_output.c, + libnetworking/netinet/udp_usrreq.c, libnetworking/nfs/bootp_subr.c, + libnetworking/rtems/rtems_select.c, + libnetworking/rtems/rtems_showifstat.c, + libnetworking/rtems/rtems_showroute.c, + libnetworking/rtems/rtems_syscall.c: Fixed type mismatch and + uninitialized variable warnings. + +2005-04-28 Joel Sherrill <joel@OARcorp.com> + * score/src/objectidtoname.c: Fixed spacing. 2005-04-28 Jennifer Averett <jennifer.averett@oarcorp.com> diff --git a/cpukit/libnetworking/kern/kern_sysctl.c b/cpukit/libnetworking/kern/kern_sysctl.c index 82a9171653..6b32c82c6b 100644 --- a/cpukit/libnetworking/kern/kern_sysctl.c +++ b/cpukit/libnetworking/kern/kern_sysctl.c @@ -1010,6 +1010,8 @@ kernel_sysctlbyname(struct thread *td, char *name, void *old, size_t *oldlenp, size_t oidlen, plen; int error; + plen = 0; /* RTEMS - to avoid warnings */ + oid[0] = 0; /* sysctl internal magic */ oid[1] = 3; /* name2oid */ oidlen = sizeof(oid); diff --git a/cpukit/libnetworking/libc/inet_ntop.c b/cpukit/libnetworking/libc/inet_ntop.c index 76a538755a..896aafe88d 100644 --- a/cpukit/libnetworking/libc/inet_ntop.c +++ b/cpukit/libnetworking/libc/inet_ntop.c @@ -126,7 +126,9 @@ inet_ntop6(src, dst, size) for (i = 0; i < NS_IN6ADDRSZ; i++) words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3)); best.base = -1; + best.len = 0; cur.base = -1; + cur.len = 0; for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) { if (words[i] == 0) { if (cur.base == -1) diff --git a/cpukit/libnetworking/net/if_ppp.c b/cpukit/libnetworking/net/if_ppp.c index 3e617a423f..13d75c0ca3 100644 --- a/cpukit/libnetworking/net/if_ppp.c +++ b/cpukit/libnetworking/net/if_ppp.c @@ -1169,7 +1169,10 @@ struct mbuf * ppp_dequeue(sc) struct ppp_softc *sc; { - struct mbuf *m, *mp; +#ifdef PPP_COMPRESS + struct mbuf *mp; +#endif + struct mbuf *m; u_char *cp; int address, control, protocol; diff --git a/cpukit/libnetworking/net/pppcompress.c b/cpukit/libnetworking/net/pppcompress.c index e68d7c4e91..b87c662c18 100644 --- a/cpukit/libnetworking/net/pppcompress.c +++ b/cpukit/libnetworking/net/pppcompress.c @@ -405,7 +405,8 @@ vj_uncompress_tcp(bufp, len, type, comp) struct vjcompress *comp; { u_char *hdr, *cp; - int hlen, vjlen; + u_int hlen; + int vjlen; cp = bufp? *bufp: NULL; vjlen = vj_uncompress_tcp_core(cp, len, len, type, comp, &hdr, &hlen); diff --git a/cpukit/libnetworking/net/slcompress.c b/cpukit/libnetworking/net/slcompress.c index f9e1050b93..11b4678c0a 100644 --- a/cpukit/libnetworking/net/slcompress.c +++ b/cpukit/libnetworking/net/slcompress.c @@ -423,7 +423,8 @@ sl_uncompress_tcp(bufp, len, type, comp) struct slcompress *comp; { u_char *hdr, *cp; - int hlen, vjlen; + u_int hlen; + int vjlen; cp = bufp? *bufp: NULL; vjlen = sl_uncompress_tcp_core(cp, len, len, type, comp, &hdr, &hlen); diff --git a/cpukit/libnetworking/netinet/ip_output.c b/cpukit/libnetworking/netinet/ip_output.c index 810f6c7479..8d4a2e8a7f 100644 --- a/cpukit/libnetworking/netinet/ip_output.c +++ b/cpukit/libnetworking/netinet/ip_output.c @@ -100,7 +100,7 @@ ip_output(m0, opt, ro, flags, imo) struct ifnet *ifp; struct mbuf *m = m0; int hlen = sizeof (struct ip); - int len, off, error = 0; + int len = 0, off, error = 0; struct sockaddr_in *dst; struct in_ifaddr *ia; int isbroadcast; diff --git a/cpukit/libnetworking/netinet/udp_usrreq.c b/cpukit/libnetworking/netinet/udp_usrreq.c index 6fdb8d17bd..767565a6ea 100644 --- a/cpukit/libnetworking/netinet/udp_usrreq.c +++ b/cpukit/libnetworking/netinet/udp_usrreq.c @@ -367,6 +367,7 @@ udp_output(inp, m, addr, control) struct in_addr laddr; int s = 0, error = 0; + laddr.s_addr = 0; if (control) m_freem(control); /* XXX */ diff --git a/cpukit/libnetworking/nfs/bootp_subr.c b/cpukit/libnetworking/nfs/bootp_subr.c index b00fe6264b..90f9a8ac9c 100644 --- a/cpukit/libnetworking/nfs/bootp_subr.c +++ b/cpukit/libnetworking/nfs/bootp_subr.c @@ -736,7 +736,7 @@ processOptions (unsigned char *optbuf, int optbufSize) int j = 0; int len; int code, ncode; - char *p; + unsigned char *p; ncode = optbuf[0]; while (j < optbufSize) { @@ -832,10 +832,10 @@ processOptions (unsigned char *optbuf, int optbufSize) /* Host name */ if (len>=MAXHOSTNAMELEN) panic ("bootpc: hostname >=%d bytes", MAXHOSTNAMELEN); - if (sethostname (p, len) < 0) + if (sethostname ((char *)p, len) < 0) panic("Can't set host name"); printf("Hostname is %s\n", p); - dhcp_hostname = bootp_strdup_realloc(dhcp_hostname,p); + dhcp_hostname = bootp_strdup_realloc(dhcp_hostname,(char *)p); break; case 7: @@ -852,7 +852,7 @@ processOptions (unsigned char *optbuf, int optbufSize) /* Domain name */ if (p[0]) { rtems_bsdnet_domain_name = - bootp_strdup_realloc(rtems_bsdnet_domain_name,p); + bootp_strdup_realloc(rtems_bsdnet_domain_name,(char *)p); printf("Domain name is %s\n", rtems_bsdnet_domain_name); } break; @@ -888,14 +888,14 @@ processOptions (unsigned char *optbuf, int optbufSize) /* DHCP server name option */ if (p[0]) rtems_bsdnet_bootp_server_name = - bootp_strdup_realloc(rtems_bsdnet_bootp_server_name,p); + bootp_strdup_realloc(rtems_bsdnet_bootp_server_name,(char *)p); break; case 67: /* DHCP bootfile option */ if (p[0]) rtems_bsdnet_bootp_boot_file_name = - bootp_strdup_realloc(rtems_bsdnet_bootp_boot_file_name,p); + bootp_strdup_realloc(rtems_bsdnet_bootp_boot_file_name,(char *)p); break; case 129: @@ -903,7 +903,7 @@ processOptions (unsigned char *optbuf, int optbufSize) * a 'command line string' */ if (p[0]) - rtems_bsdnet_bootp_cmdline = strdup(p); + rtems_bsdnet_bootp_cmdline = strdup((char *)p); break; default: @@ -1054,7 +1054,7 @@ bootpc_init(int update_files) processOptions (&reply.vend[4], sizeof(reply.vend) - 4); } if (dhcpOptionOverload & 1) { - processOptions (reply.file, sizeof reply.file); + processOptions ((unsigned char *)reply.file, sizeof reply.file); } else { if (reply.file[0]) @@ -1062,7 +1062,7 @@ bootpc_init(int update_files) bootp_strdup_realloc(rtems_bsdnet_bootp_boot_file_name,reply.file); } if (dhcpOptionOverload & 2) { - processOptions (reply.sname, sizeof reply.sname); + processOptions ((unsigned char *)reply.sname, sizeof reply.sname); } else { if (reply.sname[0]) diff --git a/cpukit/libnetworking/rtems/rtems_select.c b/cpukit/libnetworking/rtems/rtems_select.c index 6992e0c438..9b69cc0455 100644 --- a/cpukit/libnetworking/rtems/rtems_select.c +++ b/cpukit/libnetworking/rtems/rtems_select.c @@ -119,7 +119,7 @@ select (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct t fd_mask *ibits[3], *obits[3]; fd_set ob[3]; int error, timo; - int retval; + int retval = 0; rtems_id tid; rtems_interval then, now; rtems_event_set events; diff --git a/cpukit/libnetworking/rtems/rtems_showifstat.c b/cpukit/libnetworking/rtems/rtems_showifstat.c index e673a7c5a5..a44137ed0e 100644 --- a/cpukit/libnetworking/rtems/rtems_showifstat.c +++ b/cpukit/libnetworking/rtems/rtems_showifstat.c @@ -59,7 +59,7 @@ rtems_bsdnet_show_if_stats (void) case AF_LINK: { struct sockaddr_dl *sdl = (struct sockaddr_dl *)ifa->ifa_addr; - unsigned char *cp = LLADDR(sdl); + char *cp = LLADDR(sdl); int i; switch ( sdl->sdl_type ) { diff --git a/cpukit/libnetworking/rtems/rtems_showroute.c b/cpukit/libnetworking/rtems/rtems_showroute.c index 1cb5887768..ea63ae8e36 100644 --- a/cpukit/libnetworking/rtems/rtems_showroute.c +++ b/cpukit/libnetworking/rtems/rtems_showroute.c @@ -147,7 +147,7 @@ link_ascii (struct sockaddr_dl *sdl, char *buf, int bufsize) int i; int first = 1; int nleft = sdl->sdl_alen; - unsigned char *ap = LLADDR (sdl); + char *ap = LLADDR (sdl); static const char hextab[16] = "0123456789ABCDEF"; cp = buf; diff --git a/cpukit/libnetworking/rtems/rtems_syscall.c b/cpukit/libnetworking/rtems/rtems_syscall.c index 8580c6425b..30de3ca3da 100644 --- a/cpukit/libnetworking/rtems/rtems_syscall.c +++ b/cpukit/libnetworking/rtems/rtems_syscall.c @@ -289,7 +289,8 @@ sendmsg (int s, const struct msghdr *mp, int flags) struct uio auio; struct iovec *iov; struct socket *so; - struct mbuf *to, *control; + struct mbuf *to; + struct mbuf *control = NULL; int i; int len; |