[ros-diffs] [sginsberg] 38304: - Kill oskittcp warnings. Somewhat hacky? Yes indeed.

Author: sginsberg
Date: Tue Dec 23 12:16:48 2008
New Revision: 38304

URL: http://svn.reactos.org/svn/reactos?rev=38304&view=rev
Log:
- Kill oskittcp warnings. Somewhat hacky? Yes indeed.

Modified:
    trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/queue.h
    trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/systm.h
    trunk/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h
    trunk/reactos/lib/drivers/oskittcp/oskittcp.rbuild
    trunk/reactos/lib/drivers/oskittcp/oskittcp/in_pcb.c
    trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c
    trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c
    trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c

Modified: trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/queue.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu…
==============================================================================
--- trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/queue.h [iso-8859-1]
(original)
+++ trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/queue.h [iso-8859-1]
Tue Dec 23 12:16:48 2008
@@ -98,10 +98,12 @@
 	struct type *slh_first;	/* first element */			\
 }
 
+#if 0
 #define SLIST_ENTRY(type)						\
 struct {								\
 	struct type *sle_next;	/* next element */			\
 }
+#endif
 
 /*
  * Singly-linked List functions.

Modified: trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/systm.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu…
==============================================================================
--- trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/systm.h [iso-8859-1]
(original)
+++ trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/systm.h [iso-8859-1]
Tue Dec 23 12:16:48 2008
@@ -132,7 +132,7 @@
 static __inline int bsd_log ( int blah, const char* fmt, ... )
 {
 	va_list arg;
-	int i;
+	int i = 0;
 	va_start(arg, fmt);
 #ifndef __NTDRIVER__
 	i = vprintf ( fmt, arg );
@@ -238,10 +238,14 @@
 	char	**envv;
 };
 int	execve __P((struct proc *, struct execve_args *, int *retval));
+
+#if 0
 struct fork_args {
 	int	dummy;
 };
 int	fork __P((struct proc *, struct fork_args *, int retval[]));
+#endif
+
 struct sync_args {
 	int	dummy;
 };

Modified: trunk/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu…
==============================================================================
--- trunk/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h [iso-8859-1] Tue Dec 23
12:16:48 2008
@@ -1,6 +1,8 @@
 #ifndef _OSKITFREEBSD_H
 #define _OSKITFREEBSD_H
 
+#undef PAGE_SIZE
+#undef PAGE_SHIFT
 #include <ntddk.h>
 
 #ifdef linux

Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit…
==============================================================================
--- trunk/reactos/lib/drivers/oskittcp/oskittcp.rbuild [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/oskittcp/oskittcp.rbuild [iso-8859-1] Tue Dec 23 12:16:48
2008
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="oskittcp" type="staticlibrary"
allowwarnings="true">
+<module name="oskittcp" type="staticlibrary">
 	<define name="__NTDRIVER__"/>
 	<define name="KERNEL"/>
 	<define name="_DISABLE_TIDENTS"/>

Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/in_pcb.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit…
==============================================================================
--- trunk/reactos/lib/drivers/oskittcp/oskittcp/in_pcb.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/oskittcp/oskittcp/in_pcb.c [iso-8859-1] Tue Dec 23 12:16:48
2008
@@ -102,7 +102,7 @@
 
 	OS_DbgPrint(OSK_MID_TRACE,("Called\n"));
 
-	if( nam ) OskitDumpBuffer( nam->m_data, nam->m_len );
+	if( nam ) OskitDumpBuffer((OSK_PCHAR)nam->m_data, nam->m_len );
 
 #ifndef __REACTOS__
 	if (in_ifaddr == 0) {

Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit…
==============================================================================
--- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Tue Dec 23
12:16:48 2008
@@ -35,12 +35,12 @@
 void *fbsd_malloc( unsigned int bytes, char *file, unsigned line, ... ) {
     if( !OtcpEvent.TCPMalloc ) panic("no malloc");
     return OtcpEvent.TCPMalloc
-	( OtcpEvent.ClientData, (OSK_UINT)bytes, file, line );
+	( OtcpEvent.ClientData, (OSK_UINT)bytes, (OSK_PCHAR)file, line );
 }
 
 void fbsd_free( void *data, char *file, unsigned line, ... ) {
     if( !OtcpEvent.TCPFree ) panic("no free");
-    OtcpEvent.TCPFree( OtcpEvent.ClientData, data, file, line );
+    OtcpEvent.TCPFree( OtcpEvent.ClientData, data, (OSK_PCHAR)file, line );
 }
 
 void InitOskitTCP() {
@@ -155,7 +155,7 @@
     uio.uio_rw = UIO_READ;
     uio.uio_iovcnt = 1;
     iov.iov_len = Len;
-    iov.iov_base = Data;
+    iov.iov_base = (char *)Data;
 
     OS_DbgPrint(OSK_MID_TRACE,("Reading %d bytes from TCP:\n", Len));
 
@@ -260,7 +260,7 @@
     struct iovec iov;
 
     iov.iov_len = Len;
-    iov.iov_base = Data;
+    iov.iov_base = (char *)Data;
     uio.uio_iov = &iov;
     uio.uio_iovcnt = 1;
     uio.uio_offset = 0;
@@ -406,7 +406,7 @@
 
 void OskitTCPReceiveDatagram( OSK_PCHAR Data, OSK_UINT Len,
 			      OSK_UINT IpHeaderLen ) {
-    struct mbuf *Ip = m_devget( Data, Len, 0, NULL, NULL );
+    struct mbuf *Ip = m_devget( (char *)Data, Len, 0, NULL, NULL );
     struct ip *iph;
 
     if( !Ip ) return; /* drop the segment */

Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit…
==============================================================================
--- trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c [iso-8859-1] Tue Dec 23
12:16:48 2008
@@ -88,7 +88,7 @@
 #endif
 	register struct mbuf *m = m0;
 	register int hlen = sizeof (struct ip);
-	int len, off, error = 0;
+	int len = 0, off, error = 0;
 	/*
 	 * It might seem obvious at first glance that one could easily
 	 * make a one-behind cache out of this by simply making `iproute'
@@ -108,7 +108,7 @@
 	 */
 	struct route iproute;
 	struct sockaddr_in *dst;
-	struct in_ifaddr *ia;
+	struct in_ifaddr *ia = NULL;
 
 #ifdef	DIAGNOSTIC
 	if ((m->m_flags & M_PKTHDR) == 0)
@@ -380,7 +380,7 @@
 		m_copydata( m, 0, htons(ip->ip_len), new_m->m_data );
 		new_m->m_len = htons(ip->ip_len);
 		error = OtcpEvent.PacketSend( OtcpEvent.ClientData,
-					      new_m->m_data, new_m->m_len );
+					      (OSK_PCHAR)new_m->m_data, new_m->m_len );
 		m_free( new_m );
 		goto done;
 	    }
@@ -520,7 +520,7 @@
 	    m_copydata( m, 0, htons(ip->ip_len), new_m->m_data );
 	    new_m->m_len = htons(ip->ip_len);
 	    error = OtcpEvent.PacketSend( OtcpEvent.ClientData,
-					  new_m->m_data, new_m->m_len );
+					  (OSK_PCHAR)new_m->m_data, new_m->m_len );
 	    m_free( new_m );
 	    goto done;
 	}

Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit…
==============================================================================
--- trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c [iso-8859-1] Tue Dec 23
12:16:48 2008
@@ -486,7 +486,7 @@
 	 * else do it below (after getting remote address).
 	 */
 	if (tp->t_state != TCPS_LISTEN)
-		tcp_dooptions(tp, optp, optlen, ti, &to);
+		tcp_dooptions(tp, (u_char *)optp, optlen, ti, &to);
 
 	/*
 	 * Header prediction: check for the two common cases
@@ -687,7 +687,7 @@
 			taop = &tao_noncached;
 			bzero(taop, sizeof(*taop));
 		}
-		tcp_dooptions(tp, optp, optlen, ti, &to);
+		tcp_dooptions(tp, (u_char *)optp, optlen, ti, &to);
 		if (iss)
 			tp->iss = iss;
 		else
@@ -1974,7 +1974,7 @@
 	int offer;
 {
 	register struct rtentry *rt;
-	struct ifnet *ifp;
+	struct ifnet *ifp = NULL;
 	register int rtt, mss;
 	u_long bufsize;
 	struct inpcb *inp;