2004-03-05 Joel Sherrill <joel@OARcorp.com>

	* libnetworking/rtems_webserver/ejparse.c,
	libnetworking/rtems_webserver/emfdb.c,
	libnetworking/rtems_webserver/sock.c,
	libnetworking/rtems_webserver/socket.c,
	libnetworking/rtems_webserver/sym.c,
	libnetworking/rtems_webserver/webs.c,
	libnetworking/rtems_webserver/websuemf.c: Remove warnings.

7 files changed, 24 insertions, 19 deletions

diff --git a/cpukit/httpd/ejparse.c b/cpukit/httpd/ejparse.c
index 383984e88f..fdbb9c1d8a 100644
--- a/cpukit/httpd/ejparse.c
+++ b/cpukit/httpd/ejparse.c
@@ -60,7 +60,7 @@ int ejOpenEngine(sym_fd_t variables, sym_fd_t functions)
 	ej_t	*ep;
 	int		eid, vid;
 
-	if ((eid = hAllocEntry((void***) &ejHandles, &ejMax, sizeof(ej_t))) < 0) {
+	if ((eid = hAllocEntry((void*) &ejHandles, &ejMax, sizeof(ej_t))) < 0) {
 		return -1;
 	}
 	ep = ejHandles[eid];
@@ -72,7 +72,7 @@ int ejOpenEngine(sym_fd_t variables, sym_fd_t functions)
  *	declarations so we use hAlloc to manage a list of variable tables.
  */
 	if ((vid = hAlloc((void***) &ep->variables)) < 0) {
-		ejMax = hFree((void***) &ejHandles, ep->eid);
+		ejMax = hFree((void*) &ejHandles, ep->eid);
 		return -1;
 	}
 	if (vid >= ep->variableMax) {
@@ -142,7 +142,7 @@ void ejCloseEngine(int eid)
 		symClose(ep->functions);
 	}
 
-	ejMax = hFree((void***) &ejHandles, ep->eid);
+	ejMax = hFree((void*) &ejHandles, ep->eid);
 	bfree(B_L, ep);
 }
 
diff --git a/cpukit/httpd/emfdb.c b/cpukit/httpd/emfdb.c
index ae3e9a362e..708b51106b 100644
--- a/cpukit/httpd/emfdb.c
+++ b/cpukit/httpd/emfdb.c
@@ -63,7 +63,7 @@ int dbRegisterDBSchema(dbTable_t *pTableRegister)
 /*
  *	Bump up the size of the table array
  */
-	tid = hAllocEntry((void***) &dbListTables, 
+	tid = hAllocEntry((void*) &dbListTables, 
 		&dbMaxTables, sizeof(dbTable_t));	
 
 /*
@@ -167,7 +167,7 @@ void dbClose(int did)
  *			Free the table
  */
 			bfreeSafe(B_L, pTable);
-			hFree((void ***) &dbListTables, table);
+			hFree((void *) &dbListTables, table);
 		}
 	}
 
diff --git a/cpukit/httpd/sock.c b/cpukit/httpd/sock.c
index 7c603230a8..fce0b692cb 100644
--- a/cpukit/httpd/sock.c
+++ b/cpukit/httpd/sock.c
@@ -577,7 +577,7 @@ int socketAlloc(char *host, int port, socketAccept_t accept, int flags)
 	socket_t	*sp;
 	int			sid;
 
-	if ((sid = hAllocEntry((void***) &socketList, &socketMax,
+	if ((sid = hAllocEntry((void*) &socketList, &socketMax,
 			sizeof(socket_t))) < 0) {
 		return -1;
 	}
@@ -652,7 +652,7 @@ void socketFree(int sid)
 	ringqClose(&sp->lineBuf);
 
 	bfree(B_L, sp);
-	socketMax = hFree((void***) &socketList, sid);
+	socketMax = hFree((void*) &socketList, sid);
 
 /*
  *	Calculate the new highest socket number
diff --git a/cpukit/httpd/socket.c b/cpukit/httpd/socket.c
index 8a145fe520..bca64741d5 100644
--- a/cpukit/httpd/socket.c
+++ b/cpukit/httpd/socket.c
@@ -348,19 +348,24 @@ void socketCloseConnection(int sid)
 
 static void socketAccept(socket_t *sp)
 {
-	struct sockaddr_in	addr;
+	union {
+	  struct sockaddr	addr;
+	  struct sockaddr_in	addr_in;
+        } overlay;
+	struct sockaddr_in	*addr;
 	socket_t 			*nsp;
-	size_t				len;
+	int				len;
 	char				*pString;
 	int 				newSock, nid;
 
 	a_assert(sp);
+	addr = &overlay.addr_in;
 
 /*
  *	Accept the connection and prevent inheriting by children (F_SETFD)
  */
 	len = sizeof(struct sockaddr_in);
-	if ((newSock = accept(sp->sock, (struct sockaddr *) &addr, (int *)&len)) < 0) {
+	if ((newSock = accept(sp->sock, &overlay.addr, &len)) < 0) {
 		return;
 	}
 #ifndef __NO_FCNTL
@@ -390,8 +395,8 @@ static void socketAccept(socket_t *sp)
  *	to register for further events of interest.
  */
 	if (sp->accept != NULL) {
-		pString = inet_ntoa(addr.sin_addr);
-		if ((sp->accept)(nid, pString, ntohs(addr.sin_port), sp->sid) < 0) {
+		pString = inet_ntoa(addr->sin_addr);
+		if ((sp->accept)(nid, pString, ntohs(addr->sin_port), sp->sid) < 0) {
 			socketFree(nid);
 		}
 #if VXWORKS
diff --git a/cpukit/httpd/sym.c b/cpukit/httpd/sym.c
index 35e6ff8299..e26b6278bd 100644
--- a/cpukit/httpd/sym.c
+++ b/cpukit/httpd/sym.c
@@ -88,7 +88,7 @@ sym_fd_t symOpen(int hash_size)
 /*
  *	Create a new handle for this symbol table
  */
-	if ((sd = hAlloc((void***) &sym)) < 0) {
+	if ((sd = hAlloc((void*) &sym)) < 0) {
 		return -1;
 	}
 
@@ -96,7 +96,7 @@ sym_fd_t symOpen(int hash_size)
  *	Create a new symbol table structure and zero
  */
 	if ((tp = (sym_tabent_t*) balloc(B_L, sizeof(sym_tabent_t))) == NULL) {
-		symMax = hFree((void***) &sym, sd);
+		symMax = hFree((void*) &sym, sd);
 		return -1;
 	}
 	memset(tp, 0, sizeof(sym_tabent_t));
@@ -147,7 +147,7 @@ void symClose(sym_fd_t sd)
 	}
 	bfree(B_L, (void*) tp->hash_table);
 
-	symMax = hFree((void***) &sym, sd);
+	symMax = hFree((void*) &sym, sd);
 	bfree(B_L, (void*) tp);
 }
 
diff --git a/cpukit/httpd/webs.c b/cpukit/httpd/webs.c
index ae6730dfb2..9073fe8b7c 100644
--- a/cpukit/httpd/webs.c
+++ b/cpukit/httpd/webs.c
@@ -1861,7 +1861,7 @@ int websAlloc(int sid)
 /*
  *	Allocate a new handle for this connection
  */
-	if ((wid = hAllocEntry((void***) &webs, &websMax,
+	if ((wid = hAllocEntry((void*) &webs, &websMax,
 			sizeof(struct websRec))) < 0) {
 		return -1;
 	}
@@ -1972,7 +1972,7 @@ void websFree(webs_t wp)
 		ringqClose(&wp->header);
 	}
 
-	websMax = hFree((void***) &webs, wp->wid);
+	websMax = hFree((void*) &webs, wp->wid);
 	bfree(B_L, wp);
 	a_assert(websMax >= 0);
 }
diff --git a/cpukit/httpd/websuemf.c b/cpukit/httpd/websuemf.c
index a59bca1a18..4ff1b92a7e 100644
--- a/cpukit/httpd/websuemf.c
+++ b/cpukit/httpd/websuemf.c
@@ -121,7 +121,7 @@ int emfSchedCallback(int delay, emfSchedProc *proc, void *arg)
 	sched_t	*s;
 	int		schedid;
 
-	if ((schedid = hAllocEntry((void***) &sched, &schedMax,
+	if ((schedid = hAllocEntry((void*) &sched, &schedMax,
 		sizeof(sched_t))) < 0) {
 		return -1;
 	}
@@ -165,7 +165,7 @@ void emfUnschedCallback(int schedid)
 		return;
 	}
 	bfree(B_L, s);
-	schedMax = hFree((void***) &sched, schedid);
+	schedMax = hFree((void*) &sched, schedid);
 }
 
 /******************************************************************************/