[Python-checkins] CVS: python/dist/src/Modules socketmodule.c,1.114,1.115
Fredrik Lundh
python-dev@python.org
Sun, 9 Jul 2000 08:09:58 -0700
Update of /cvsroot/python/python/dist/src/Modules
In directory slayer.i.sourceforge.net:/tmp/cvs-serv14488/Modules
Modified Files:
socketmodule.c
Log Message:
- ANSI-ification
(patch #100770 by Peter Schneider-Kamp)
Index: socketmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -r1.114 -r1.115
*** socketmodule.c 2000年07月09日 03:09:55 1.114
--- socketmodule.c 2000年07月09日 15:09:56 1.115
***************
*** 185,193 ****
#endif /* USE_SSL */
- /* Here we have some hacks to choose between K&R or ANSI style function
- definitions. For NT to build this as an extension module (ie, DLL)
- it must be compiled by the C++ compiler, as it takes the address of
- a static data item exported from the main Python DLL.
- */
#if defined(MS_WINDOWS) || defined(__BEOS__)
/* BeOS suffers from the same socket dichotomy as Win32... - [cjh] */
--- 185,188 ----
***************
*** 195,199 ****
#define SOCKETCLOSE closesocket
#define NO_DUP /* Actually it exists on NT 3.5, but what the heck... */
- #define FORCE_ANSI_FUNC_DEFS
#endif
--- 190,193 ----
***************
*** 215,219 ****
#define SOCKETCLOSE soclose
#define NO_DUP /* Sockets are Not Actual File Handles under OS/2 */
- #define FORCE_ANSI_FUNC_DEFS
#endif
--- 209,212 ----
***************
*** 222,263 ****
#endif
- #ifdef FORCE_ANSI_FUNC_DEFS
- #define BUILD_FUNC_DEF_1( fnname, arg1type, arg1name ) \
- fnname( arg1type arg1name )
-
- #define BUILD_FUNC_DEF_2( fnname, arg1type, arg1name, arg2type, arg2name ) \
- fnname( arg1type arg1name, arg2type arg2name )
-
- #define BUILD_FUNC_DEF_3( fnname, arg1type, arg1name, arg2type, arg2name , arg3type, arg3name ) \
- fnname( arg1type arg1name, arg2type arg2name, arg3type arg3name )
-
- #define BUILD_FUNC_DEF_4( fnname, arg1type, arg1name, arg2type, arg2name , arg3type, arg3name, arg4type, arg4name ) \
- fnname( arg1type arg1name, arg2type arg2name, arg3type arg3name, arg4type arg4name )
-
- #else /* !FORCE_ANSI_FN_DEFS */
- #define BUILD_FUNC_DEF_1( fnname, arg1type, arg1name ) \
- fnname( arg1name ) \
- arg1type arg1name;
-
- #define BUILD_FUNC_DEF_2( fnname, arg1type, arg1name, arg2type, arg2name ) \
- fnname( arg1name, arg2name ) \
- arg1type arg1name; \
- arg2type arg2name;
-
- #define BUILD_FUNC_DEF_3( fnname, arg1type, arg1name, arg2type, arg2name, arg3type, arg3name ) \
- fnname( arg1name, arg2name, arg3name ) \
- arg1type arg1name; \
- arg2type arg2name; \
- arg3type arg3name;
-
- #define BUILD_FUNC_DEF_4( fnname, arg1type, arg1name, arg2type, arg2name, arg3type, arg3name, arg4type, arg4name ) \
- fnname( arg1name, arg2name, arg3name, arg4name ) \
- arg1type arg1name; \
- arg2type arg2name; \
- arg3type arg3name; \
- arg4type arg4name;
-
- #endif /* !FORCE_ANSI_FN_DEFS */
-
/* Global variable holding the exception type for errors detected
by this module (but not argument type or memory errors, etc.). */
--- 215,218 ----
***************
*** 377,381 ****
static PySocketSockObject *
! BUILD_FUNC_DEF_4(PySocketSock_New,SOCKET_T,fd, int,family, int,type, int,proto)
{
PySocketSockObject *s;
--- 332,336 ----
static PySocketSockObject *
! PySocketSock_New(SOCKET_T fd, int family, int type, int proto)
{
PySocketSockObject *s;
***************
*** 406,410 ****
static int
! BUILD_FUNC_DEF_2(setipaddr, char*,name, struct sockaddr_in *,addr_ret)
{
struct hostent *hp;
--- 361,365 ----
static int
! setipaddr(char* name, struct sockaddr_in * addr_ret)
{
struct hostent *hp;
***************
*** 489,493 ****
static PyObject *
! BUILD_FUNC_DEF_1(makeipaddr, struct sockaddr_in *,addr)
{
long x = ntohl(addr->sin_addr.s_addr);
--- 444,448 ----
static PyObject *
! makeipaddr(struct sockaddr_in *addr)
{
long x = ntohl(addr->sin_addr.s_addr);
***************
*** 507,511 ****
/*ARGSUSED*/
static PyObject *
! BUILD_FUNC_DEF_2(makesockaddr,struct sockaddr *,addr, int,addrlen)
{
if (addrlen == 0) {
--- 462,466 ----
/*ARGSUSED*/
static PyObject *
! makesockaddr(struct sockaddr *addr, int addrlen)
{
if (addrlen == 0) {
***************
*** 562,567 ****
static int
! BUILD_FUNC_DEF_4(
! getsockaddrarg,PySocketSockObject *,s, PyObject *,args, struct sockaddr **,addr_ret, int *,len_ret)
{
switch (s->sock_family) {
--- 517,521 ----
static int
! getsockaddrarg(PySocketSockObject *s, PyObject *args, struct sockaddr **addr_ret, int *len_ret)
{
switch (s->sock_family) {
***************
*** 622,626 ****
static int
! BUILD_FUNC_DEF_2(getsockaddrlen,PySocketSockObject *,s, int *,len_ret)
{
switch (s->sock_family) {
--- 576,580 ----
static int
! getsockaddrlen(PySocketSockObject *s, int *len_ret)
{
switch (s->sock_family) {
***************
*** 653,657 ****
static PyObject *
! BUILD_FUNC_DEF_2(PySocketSock_accept,PySocketSockObject *,s, PyObject *,args)
{
char addrbuf[256];
--- 607,611 ----
static PyObject *
! PySocketSock_accept(PySocketSockObject *s, PyObject *args)
{
char addrbuf[256];
***************
*** 709,713 ****
static PyObject *
! BUILD_FUNC_DEF_2(PySocketSock_setblocking,PySocketSockObject*,s,PyObject*,args)
{
int block;
--- 663,667 ----
static PyObject *
! PySocketSock_setblocking(PySocketSockObject *s, PyObject *args)
{
int block;
***************
*** 759,763 ****
static PyObject *
! BUILD_FUNC_DEF_2(PySocketSock_setsockopt,PySocketSockObject *,s, PyObject *,args)
{
int level;
--- 713,717 ----
static PyObject *
! PySocketSock_setsockopt(PySocketSockObject *s, PyObject *args)
{
int level;
***************
*** 799,803 ****
static PyObject *
! BUILD_FUNC_DEF_2(PySocketSock_getsockopt,PySocketSockObject *,s, PyObject *,args)
{
int level;
--- 753,757 ----
static PyObject *
! PySocketSock_getsockopt(PySocketSockObject *s, PyObject *args)
{
int level;
***************
*** 856,860 ****
static PyObject *
! BUILD_FUNC_DEF_2(PySocketSock_bind,PySocketSockObject *,s, PyObject *,args)
{
struct sockaddr *addr;
--- 810,814 ----
static PyObject *
! PySocketSock_bind(PySocketSockObject *s, PyObject *args)
{
struct sockaddr *addr;
***************
*** 887,891 ****
static PyObject *
! BUILD_FUNC_DEF_2(PySocketSock_close,PySocketSockObject *,s, PyObject *,args)
{
if (!PyArg_ParseTuple(args, ":close"))
--- 841,845 ----
static PyObject *
! PySocketSock_close(PySocketSockObject *s, PyObject *args)
{
if (!PyArg_ParseTuple(args, ":close"))
***************
*** 910,914 ****
static PyObject *
! BUILD_FUNC_DEF_2(PySocketSock_connect,PySocketSockObject *,s, PyObject *,args)
{
struct sockaddr *addr;
--- 864,868 ----
static PyObject *
! PySocketSock_connect(PySocketSockObject *s, PyObject *args)
{
struct sockaddr *addr;
***************
*** 939,943 ****
static PyObject *
! BUILD_FUNC_DEF_2(PySocketSock_connect_ex,PySocketSockObject *,s, PyObject *,args)
{
struct sockaddr *addr;
--- 893,897 ----
static PyObject *
! PySocketSock_connect_ex(PySocketSockObject *s, PyObject *args)
{
struct sockaddr *addr;
***************
*** 967,971 ****
static PyObject *
! BUILD_FUNC_DEF_2(PySocketSock_fileno,PySocketSockObject *,s, PyObject *,args)
{
if (!PyArg_ParseTuple(args, ":fileno"))
--- 921,925 ----
static PyObject *
! PySocketSock_fileno(PySocketSockObject *s, PyObject *args)
{
if (!PyArg_ParseTuple(args, ":fileno"))
***************
*** 988,992 ****
static PyObject *
! BUILD_FUNC_DEF_2(PySocketSock_dup,PySocketSockObject *,s, PyObject *,args)
{
SOCKET_T newfd;
--- 942,946 ----
static PyObject *
! PySocketSock_dup(PySocketSockObject *s, PyObject *args)
{
SOCKET_T newfd;
***************
*** 1017,1021 ****
static PyObject *
! BUILD_FUNC_DEF_2(PySocketSock_getsockname,PySocketSockObject *,s, PyObject *,args)
{
char addrbuf[256];
--- 971,975 ----
static PyObject *
! PySocketSock_getsockname(PySocketSockObject *s, PyObject *args)
{
char addrbuf[256];
***************
*** 1047,1051 ****
static PyObject *
! BUILD_FUNC_DEF_2(PySocketSock_getpeername,PySocketSockObject *,s, PyObject *,args)
{
char addrbuf[256];
--- 1001,1005 ----
static PyObject *
! PySocketSock_getpeername(PySocketSockObject *s, PyObject *args)
{
char addrbuf[256];
***************
*** 1077,1081 ****
static PyObject *
! BUILD_FUNC_DEF_2(PySocketSock_listen,PySocketSockObject *,s, PyObject *,args)
{
int backlog;
--- 1031,1035 ----
static PyObject *
! PySocketSock_listen(PySocketSockObject *s, PyObject *args)
{
int backlog;
***************
*** 1111,1115 ****
static PyObject *
! BUILD_FUNC_DEF_2(PySocketSock_makefile,PySocketSockObject *,s, PyObject *,args)
{
extern int fclose(FILE *);
--- 1065,1069 ----
static PyObject *
! PySocketSock_makefile(PySocketSockObject *s, PyObject *args)
{
extern int fclose(FILE *);
***************
*** 1155,1159 ****
static PyObject *
! BUILD_FUNC_DEF_2(PySocketSock_recv,PySocketSockObject *,s, PyObject *,args)
{
int len, n, flags = 0;
--- 1109,1113 ----
static PyObject *
! PySocketSock_recv(PySocketSockObject *s, PyObject *args)
{
int len, n, flags = 0;
***************
*** 1188,1192 ****
static PyObject *
! BUILD_FUNC_DEF_2(PySocketSock_recvfrom,PySocketSockObject *,s, PyObject *,args)
{
char addrbuf[256];
--- 1142,1146 ----
static PyObject *
! PySocketSock_recvfrom(PySocketSockObject *s, PyObject *args)
{
char addrbuf[256];
***************
*** 1243,1247 ****
static PyObject *
! BUILD_FUNC_DEF_2(PySocketSock_send,PySocketSockObject *,s, PyObject *,args)
{
char *buf;
--- 1197,1201 ----
static PyObject *
! PySocketSock_send(PySocketSockObject *s, PyObject *args)
{
char *buf;
***************
*** 1267,1271 ****
static PyObject *
! BUILD_FUNC_DEF_2(PySocketSock_sendto,PySocketSockObject *,s, PyObject *,args)
{
PyObject *addro;
--- 1221,1225 ----
static PyObject *
! PySocketSock_sendto(PySocketSockObject *s, PyObject *args)
{
PyObject *addro;
***************
*** 1300,1304 ****
static PyObject *
! BUILD_FUNC_DEF_2(PySocketSock_shutdown,PySocketSockObject *,s, PyObject *,args)
{
int how;
--- 1254,1258 ----
static PyObject *
! PySocketSock_shutdown(PySocketSockObject *s, PyObject *args)
{
int how;
***************
*** 1377,1381 ****
static void
! BUILD_FUNC_DEF_1(PySocketSock_dealloc,PySocketSockObject *,s)
{
if (s->sock_fd != -1)
--- 1331,1335 ----
static void
! PySocketSock_dealloc(PySocketSockObject *s)
{
if (s->sock_fd != -1)
***************
*** 1388,1392 ****
static PyObject *
! BUILD_FUNC_DEF_2(PySocketSock_getattr,PySocketSockObject *,s, char *,name)
{
return Py_FindMethod(PySocketSock_methods, (PyObject *) s, name);
--- 1342,1346 ----
static PyObject *
! PySocketSock_getattr(PySocketSockObject *s, char *name)
{
return Py_FindMethod(PySocketSock_methods, (PyObject *) s, name);
***************
*** 1395,1399 ****
static PyObject *
! BUILD_FUNC_DEF_1(PySocketSock_repr,PySocketSockObject *,s)
{
char buf[512];
--- 1349,1353 ----
static PyObject *
! PySocketSock_repr(PySocketSockObject *s)
{
char buf[512];
***************
*** 1439,1443 ****
/*ARGSUSED*/
static PyObject *
! BUILD_FUNC_DEF_2(PySocket_gethostname,PyObject *,self, PyObject *,args)
{
char buf[1024];
--- 1393,1397 ----
/*ARGSUSED*/
static PyObject *
! PySocket_gethostname(PyObject *self, PyObject *args)
{
char buf[1024];
***************
*** 1464,1468 ****
/*ARGSUSED*/
static PyObject *
! BUILD_FUNC_DEF_2(PySocket_gethostbyname,PyObject *,self, PyObject *,args)
{
char *name;
--- 1418,1422 ----
/*ARGSUSED*/
static PyObject *
! PySocket_gethostbyname(PyObject *self, PyObject *args)
{
char *name;
***************
*** 1540,1544 ****
/*ARGSUSED*/
static PyObject *
! BUILD_FUNC_DEF_2(PySocket_gethostbyname_ex,PyObject *,self, PyObject *,args)
{
char *name;
--- 1494,1498 ----
/*ARGSUSED*/
static PyObject *
! PySocket_gethostbyname_ex(PyObject *self, PyObject *args)
{
char *name;
***************
*** 1599,1603 ****
/*ARGSUSED*/
static PyObject *
! BUILD_FUNC_DEF_2(PySocket_gethostbyaddr,PyObject *,self, PyObject *, args)
{
struct sockaddr_in addr;
--- 1553,1557 ----
/*ARGSUSED*/
static PyObject *
! PySocket_gethostbyaddr(PyObject *self, PyObject *args)
{
struct sockaddr_in addr;
***************
*** 1671,1675 ****
/*ARGSUSED*/
static PyObject *
! BUILD_FUNC_DEF_2(PySocket_getservbyname,PyObject *,self, PyObject *,args)
{
char *name, *proto;
--- 1625,1629 ----
/*ARGSUSED*/
static PyObject *
! PySocket_getservbyname(PyObject *self, PyObject *args)
{
char *name, *proto;
***************
*** 1700,1704 ****
/*ARGSUSED*/
static PyObject *
! BUILD_FUNC_DEF_2(PySocket_getprotobyname,PyObject *,self, PyObject *,args)
{
char *name;
--- 1654,1658 ----
/*ARGSUSED*/
static PyObject *
! PySocket_getprotobyname(PyObject *self, PyObject *args)
{
char *name;
***************
*** 1734,1738 ****
/*ARGSUSED*/
static PyObject *
! BUILD_FUNC_DEF_2(PySocket_socket,PyObject *,self, PyObject *,args)
{
PySocketSockObject *s;
--- 1688,1692 ----
/*ARGSUSED*/
static PyObject *
! PySocket_socket(PyObject *self, PyObject *args)
{
PySocketSockObject *s;
***************
*** 1780,1784 ****
/*ARGSUSED*/
static PyObject *
! BUILD_FUNC_DEF_2(PySocket_fromfd,PyObject *,self, PyObject *,args)
{
PySocketSockObject *s;
--- 1734,1738 ----
/*ARGSUSED*/
static PyObject *
! PySocket_fromfd(PyObject *self, PyObject *args)
{
PySocketSockObject *s;
***************
*** 1811,1815 ****
static PyObject *
! BUILD_FUNC_DEF_2(PySocket_ntohs, PyObject *, self, PyObject *, args)
{
int x1, x2;
--- 1765,1769 ----
static PyObject *
! PySocket_ntohs(PyObject *self, PyObject *args)
{
int x1, x2;
***************
*** 1829,1833 ****
static PyObject *
! BUILD_FUNC_DEF_2(PySocket_ntohl, PyObject *, self, PyObject *, args)
{
int x1, x2;
--- 1783,1787 ----
static PyObject *
! PySocket_ntohl(PyObject *self, PyObject *args)
{
int x1, x2;
***************
*** 1847,1851 ****
static PyObject *
! BUILD_FUNC_DEF_2(PySocket_htons, PyObject *, self, PyObject *, args)
{
int x1, x2;
--- 1801,1805 ----
static PyObject *
! PySocket_htons(PyObject *self, PyObject *args)
{
int x1, x2;
***************
*** 1865,1869 ****
static PyObject *
! BUILD_FUNC_DEF_2(PySocket_htonl, PyObject *, self, PyObject *, args)
{
int x1, x2;
--- 1819,1823 ----
static PyObject *
! PySocket_htonl(PyObject *self, PyObject *args)
{
int x1, x2;
***************
*** 1895,1899 ****
static PyObject*
! BUILD_FUNC_DEF_2(PySocket_inet_aton, PyObject *, self, PyObject *, args)
{
#ifndef INADDR_NONE
--- 1849,1853 ----
static PyObject*
! PySocket_inet_aton(PyObject *self, PyObject *args)
{
#ifndef INADDR_NONE
***************
*** 1930,1934 ****
static PyObject*
! BUILD_FUNC_DEF_2(PySocket_inet_ntoa, PyObject *, self, PyObject *, args)
{
char *packed_str;
--- 1884,1888 ----
static PyObject*
! PySocket_inet_ntoa(PyObject *self, PyObject *args)
{
char *packed_str;
***************
*** 1956,1961 ****
/* This is a C function to be called for new object initialization */
static SSLObject *
! BUILD_FUNC_DEF_3(newSSLObject,
! PySocketSockObject *,Sock, char*,key_file, char*,cert_file)
{
SSLObject *self;
--- 1910,1914 ----
/* This is a C function to be called for new object initialization */
static SSLObject *
! newSSLObject(PySocketSockObject *Sock, char *key_file, char *cert_file)
{
SSLObject *self;
***************
*** 2047,2051 ****
/* This is the Python function called for new object initialization */
static PyObject *
! BUILD_FUNC_DEF_2(PySocket_ssl, PyObject *, self, PyObject *, args)
{
SSLObject *rv;
--- 2000,2004 ----
/* This is the Python function called for new object initialization */
static PyObject *
! PySocket_ssl(PyObject *self, PyObject *args)
{
SSLObject *rv;
***************
*** 2069,2073 ****
static PyObject *
! BUILD_FUNC_DEF_2(SSL_server, SSLObject *, self, PyObject *, args)
{
return PyString_FromString(self->server);
--- 2022,2026 ----
static PyObject *
! SSL_server(SSLObject *self, PyObject *args)
{
return PyString_FromString(self->server);
***************
*** 2075,2079 ****
static PyObject *
! BUILD_FUNC_DEF_2(SSL_issuer, SSLObject *, self, PyObject *, args)
{
return PyString_FromString(self->issuer);
--- 2028,2032 ----
static PyObject *
! SSL_issuer(SSLObject *self, PyObject *args)
{
return PyString_FromString(self->issuer);
***************
*** 2218,2222 ****
*/
static void
! BUILD_FUNC_DEF_3(insint,PyObject *,d, char *,name, int,value)
{
PyObject *v = PyInt_FromLong((long) value);
--- 2171,2175 ----
*/
static void
! insint(PyObject *d, char *name, int value)
{
PyObject *v = PyInt_FromLong((long) value);