Skip to content
Snippets Groups Projects
Commit 634a5711 authored by Henrik (Grubba) Grubbström's avatar Henrik (Grubba) Grubbström
Browse files

Now uses PIKE_ACCEPT_TYPE.

Rev: src/modules/files/file.c:1.118
Rev: src/modules/files/socket.c:1.37
parent 790b68f8
No related branches found
No related tags found
No related merge requests found
......@@ -5,7 +5,7 @@
\*/
#include "global.h"
RCSID("$Id: file.c,v 1.117 1998/08/06 16:43:14 grubba Exp $");
RCSID("$Id: file.c,v 1.118 1998/08/06 23:11:06 grubba Exp $");
#include "fdlib.h"
#include "interpret.h"
#include "svalue.h"
......@@ -1351,7 +1351,7 @@ int my_socketpair(int family, int type, int protocol, int sv[2])
*
* FIXME: Configure-test?
*/
int len;
PIKE_ACCEPT_TYPE len;
MEMSET((char *)&addr,0,sizeof(struct sockaddr_in));
......@@ -1422,7 +1422,9 @@ retry_connect:
int tmp2;
for(tmp2=0;tmp2<20;tmp2++)
{
int tmp, len2;
int tmp;
PIKE_ACCEPT_TYPE len2;
len2=sizeof(addr);
tmp=fd_accept(fd,(struct sockaddr *)&addr,&len2);
......@@ -1446,7 +1448,8 @@ retry_connect:
*/
do
{
int len3;
PIKE_ACCEPT_TYPE len3;
len3=sizeof(addr);
retry_accept:
sv[0]=fd_accept(fd,(struct sockaddr *)&addr,&len3);
......@@ -1905,11 +1908,11 @@ static void file_query_address(INT32 args)
{
struct sockaddr_in addr;
int i;
/* Solaris thinks this variable should a size_t, everybody else thinks
* it should be an int.
*/
int len;
char buffer[496],*q;
/* XOPEN GROUP think this variable should a size_t, BSD thinks it should
* be an int.
*/
PIKE_ACCEPT_TYPE len;
if(FD <0)
error("file->query_address(): Connection not open.\n");
......
......@@ -18,7 +18,7 @@
#include "file_machine.h"
#include "file.h"
RCSID("$Id: socket.c,v 1.36 1998/07/15 23:26:59 hubbe Exp $");
RCSID("$Id: socket.c,v 1.37 1998/08/06 23:12:24 grubba Exp $");
#ifdef HAVE_SYS_TYPE_H
#include <sys/types.h>
......@@ -307,13 +307,12 @@ static void port_accept(INT32 args)
struct sockaddr_in addr;
struct port *this=THIS;
int fd,tmp;
int len=0;
struct object *o;
PIKE_ACCEPT_TYPE len=0;
if(THIS->fd < 0)
error("port->accept(): Port not open.\n");
THREADS_ALLOW();
len=sizeof(addr);
fd=fd_accept(this->fd, (struct sockaddr *)&addr, &len);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment