cvs: php4 /main fopen-wrappers.c network.c php_network.h

venaas Tue Sep 5 09:36:56 2000 EDT Modified files: /php4/main fopen-wrappers.c network.c php_network.h Log: renamed hostconnect() to php_hostconnect() Index: php4/main/fopen-wrappers.c diff -u php4/main/fopen-wrappers.c:1.87 php4/main/fopen-wrappers.c:1.88 --- php4/main/fopen-wrappers.c:1.87 Tue Sep 5 08:59:08 2000 +++ php4/main/fopen-wrappers.c Tue Sep 5 09:36:56 2000 @@ -16,7 +16,7 @@ | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen-wrappers.c,v 1.87 2000/09/05 15:59:08 venaas Exp $ */ +/* $Id: fopen-wrappers.c,v 1.88 2000/09/05 16:36:56 venaas Exp $ */ #include "php.h" #include "php_globals.h" @@ -496,7 +496,7 @@ if (resource->port == 0) resource->port = 80; - *socketd = hostconnect(resource->host, resource->port, SOCK_STREAM, 0); + *socketd = php_hostconnect(resource->host, resource->port, SOCK_STREAM, 0); if (*socketd == -1) { SOCK_FCLOSE(*socketd); *socketd = 0; Index: php4/main/network.c diff -u php4/main/network.c:1.4 php4/main/network.c:1.5 --- php4/main/network.c:1.4 Tue Sep 5 06:56:11 2000 +++ php4/main/network.c Tue Sep 5 09:36:56 2000 @@ -15,7 +15,7 @@ | Authors: Stig Venaas <venaas@uninett.no> | +----------------------------------------------------------------------+ */ -/* $Id: network.c,v 1.4 2000/09/05 13:56:11 venaas Exp $ */ +/* $Id: network.c,v 1.5 2000/09/05 16:36:56 venaas Exp $ */ #include "php.h" @@ -150,7 +150,7 @@ * port, returns the created socket on success, else returns -1. * timeout gives timeout in seconds, 0 means blocking mode. */ -int hostconnect(char *host, int port, int socktype, int timeout) +int php_hostconnect(char *host, int port, int socktype, int timeout) { int s; struct sockaddr **sal, **psal; Index: php4/main/php_network.h diff -u php4/main/php_network.h:1.2 php4/main/php_network.h:1.3 --- php4/main/php_network.h:1.2 Sun Sep 3 12:12:28 2000 +++ php4/main/php_network.h Tue Sep 5 09:36:56 2000 @@ -15,9 +15,9 @@ | Authors: Stig Venaas <venaas@uninett.no> | +----------------------------------------------------------------------+ */ -/* $Id: php_network.h,v 1.2 2000/09/03 19:12:28 venaas Exp $ */ +/* $Id: php_network.h,v 1.3 2000/09/05 16:36:56 venaas Exp $ */ -int hostconnect(char *host, int port, int socktype, int timeout); +int php_hostconnect(char *host, int port, int socktype, int timeout); /* * Local variables: