[Python-checkins] CVS: python/dist/src/Modules socketmodule.c,1.175,1.176
Jeremy Hylton
jhylton@users.sourceforge.net
Thu, 11 Oct 2001 09:36:37 -0700
Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv15275
Modified Files:
socketmodule.c
Log Message:
Convert socket methods to use METH_O and METH_NOARGS where possible.
Index: socketmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v
retrieving revision 1.175
retrieving revision 1.176
diff -C2 -d -r1.175 -r1.176
*** socketmodule.c 2001/10/11 00:00:17 1.175
--- socketmodule.c 2001/10/11 16:36:35 1.176
***************
*** 926,930 ****
static PyObject *
! PySocketSock_accept(PySocketSockObject *s, PyObject *args)
{
char addrbuf[256];
--- 926,930 ----
static PyObject *
! PySocketSock_accept(PySocketSockObject *s)
{
char addrbuf[256];
***************
*** 935,940 ****
PyObject *res = NULL;
- if (!PyArg_ParseTuple(args, ":accept"))
- return NULL;
if (!getsockaddrlen(s, &addrlen))
return NULL;
--- 935,938 ----
***************
*** 984,988 ****
static PyObject *
! PySocketSock_setblocking(PySocketSockObject *s, PyObject *args)
{
int block;
--- 982,986 ----
static PyObject *
! PySocketSock_setblocking(PySocketSockObject *s, PyObject *arg)
{
int block;
***************
*** 992,996 ****
#endif
#endif
! if (!PyArg_ParseTuple(args, "i:setblocking", &block))
return NULL;
Py_BEGIN_ALLOW_THREADS
--- 990,995 ----
#endif
#endif
! block = PyInt_AsLong(arg);
! if (block == -1 && PyErr_Occurred())
return NULL;
Py_BEGIN_ALLOW_THREADS
***************
*** 1159,1170 ****
static PyObject *
! PySocketSock_bind(PySocketSockObject *s, PyObject *args)
{
struct sockaddr *addr;
int addrlen;
int res;
! PyObject *addro;
! if (!PyArg_ParseTuple(args, "O:bind", &addro))
! return NULL;
if (!getsockaddrarg(s, addro, &addr, &addrlen))
return NULL;
--- 1158,1167 ----
static PyObject *
! PySocketSock_bind(PySocketSockObject *s, PyObject *addro)
{
struct sockaddr *addr;
int addrlen;
int res;
!
if (!getsockaddrarg(s, addro, &addr, &addrlen))
return NULL;
***************
*** 1191,1199 ****
static PyObject *
! PySocketSock_close(PySocketSockObject *s, PyObject *args)
{
SOCKET_T fd;
! if (!PyArg_ParseTuple(args, ":close"))
! return NULL;
if ((fd = s->sock_fd) != -1) {
s->sock_fd = -1;
--- 1188,1195 ----
static PyObject *
! PySocketSock_close(PySocketSockObject *s)
{
SOCKET_T fd;
!
if ((fd = s->sock_fd) != -1) {
s->sock_fd = -1;
***************
*** 1215,1226 ****
static PyObject *
! PySocketSock_connect(PySocketSockObject *s, PyObject *args)
{
struct sockaddr *addr;
int addrlen;
int res;
! PyObject *addro;
! if (!PyArg_ParseTuple(args, "O:connect", &addro))
! return NULL;
if (!getsockaddrarg(s, addro, &addr, &addrlen))
return NULL;
--- 1211,1220 ----
static PyObject *
! PySocketSock_connect(PySocketSockObject *s, PyObject *addro)
{
struct sockaddr *addr;
int addrlen;
int res;
!
if (!getsockaddrarg(s, addro, &addr, &addrlen))
return NULL;
***************
*** 1244,1255 ****
static PyObject *
! PySocketSock_connect_ex(PySocketSockObject *s, PyObject *args)
{
struct sockaddr *addr;
int addrlen;
int res;
! PyObject *addro;
! if (!PyArg_ParseTuple(args, "O:connect_ex", &addro))
! return NULL;
if (!getsockaddrarg(s, addro, &addr, &addrlen))
return NULL;
--- 1238,1247 ----
static PyObject *
! PySocketSock_connect_ex(PySocketSockObject *s, PyObject *addro)
{
struct sockaddr *addr;
int addrlen;
int res;
!
if (!getsockaddrarg(s, addro, &addr, &addrlen))
return NULL;
***************
*** 1272,1279 ****
static PyObject *
! PySocketSock_fileno(PySocketSockObject *s, PyObject *args)
{
- if (!PyArg_ParseTuple(args, ":fileno"))
- return NULL;
#if SIZEOF_SOCKET_T <= SIZEOF_LONG
return PyInt_FromLong((long) s->sock_fd);
--- 1264,1269 ----
static PyObject *
! PySocketSock_fileno(PySocketSockObject *s)
{
#if SIZEOF_SOCKET_T <= SIZEOF_LONG
return PyInt_FromLong((long) s->sock_fd);
***************
*** 1293,1302 ****
static PyObject *
! PySocketSock_dup(PySocketSockObject *s, PyObject *args)
{
SOCKET_T newfd;
PyObject *sock;
! if (!PyArg_ParseTuple(args, ":dup"))
! return NULL;
newfd = dup(s->sock_fd);
if (newfd < 0)
--- 1283,1291 ----
static PyObject *
! PySocketSock_dup(PySocketSockObject *s)
{
SOCKET_T newfd;
PyObject *sock;
!
newfd = dup(s->sock_fd);
if (newfd < 0)
***************
*** 1322,1326 ****
static PyObject *
! PySocketSock_getsockname(PySocketSockObject *s, PyObject *args)
{
char addrbuf[256];
--- 1311,1315 ----
static PyObject *
! PySocketSock_getsockname(PySocketSockObject *s)
{
char addrbuf[256];
***************
*** 1328,1333 ****
socklen_t addrlen;
- if (!PyArg_ParseTuple(args, ":getsockname"))
- return NULL;
if (!getsockaddrlen(s, &addrlen))
return NULL;
--- 1317,1320 ----
***************
*** 1352,1356 ****
static PyObject *
! PySocketSock_getpeername(PySocketSockObject *s, PyObject *args)
{
char addrbuf[256];
--- 1339,1343 ----
static PyObject *
! PySocketSock_getpeername(PySocketSockObject *s)
{
char addrbuf[256];
***************
*** 1358,1363 ****
socklen_t addrlen;
- if (!PyArg_ParseTuple(args, ":getpeername"))
- return NULL;
if (!getsockaddrlen(s, &addrlen))
return NULL;
--- 1345,1348 ----
***************
*** 1383,1391 ****
static PyObject *
! PySocketSock_listen(PySocketSockObject *s, PyObject *args)
{
int backlog;
int res;
! if (!PyArg_ParseTuple(args, "i:listen", &backlog))
return NULL;
Py_BEGIN_ALLOW_THREADS
--- 1368,1378 ----
static PyObject *
! PySocketSock_listen(PySocketSockObject *s, PyObject *arg)
{
int backlog;
int res;
!
! backlog = PyInt_AsLong(arg);
! if (backlog == -1 && PyErr_Occurred())
return NULL;
Py_BEGIN_ALLOW_THREADS
***************
*** 1607,1615 ****
static PyObject *
! PySocketSock_shutdown(PySocketSockObject *s, PyObject *args)
{
int how;
int res;
! if (!PyArg_ParseTuple(args, "i:shutdown", &how))
return NULL;
Py_BEGIN_ALLOW_THREADS
--- 1594,1604 ----
static PyObject *
! PySocketSock_shutdown(PySocketSockObject *s, PyObject *arg)
{
int how;
int res;
!
! how = PyInt_AsLong(arg);
! if (how == -1 && PyErr_Occurred())
return NULL;
Py_BEGIN_ALLOW_THREADS
***************
*** 1632,1660 ****
static PyMethodDef PySocketSock_methods[] = {
! {"accept", (PyCFunction)PySocketSock_accept, METH_VARARGS,
accept_doc},
! {"bind", (PyCFunction)PySocketSock_bind, METH_VARARGS,
bind_doc},
! {"close", (PyCFunction)PySocketSock_close, METH_VARARGS,
close_doc},
! {"connect", (PyCFunction)PySocketSock_connect, METH_VARARGS,
connect_doc},
! {"connect_ex", (PyCFunction)PySocketSock_connect_ex, METH_VARARGS,
connect_ex_doc},
#ifndef NO_DUP
! {"dup", (PyCFunction)PySocketSock_dup, METH_VARARGS,
dup_doc},
#endif
! {"fileno", (PyCFunction)PySocketSock_fileno, METH_VARARGS,
fileno_doc},
#ifdef HAVE_GETPEERNAME
! {"getpeername", (PyCFunction)PySocketSock_getpeername, METH_VARARGS,
! getpeername_doc},
#endif
! {"getsockname", (PyCFunction)PySocketSock_getsockname, METH_VARARGS,
! getsockname_doc},
{"getsockopt", (PyCFunction)PySocketSock_getsockopt, METH_VARARGS,
getsockopt_doc},
! {"listen", (PyCFunction)PySocketSock_listen, METH_VARARGS,
listen_doc},
#ifndef NO_DUP
--- 1621,1649 ----
static PyMethodDef PySocketSock_methods[] = {
! {"accept", (PyNoArgsFunction)PySocketSock_accept, METH_NOARGS,
accept_doc},
! {"bind", (PyCFunction)PySocketSock_bind, METH_O,
bind_doc},
! {"close", (PyNoArgsFunction)PySocketSock_close, METH_NOARGS,
close_doc},
! {"connect", (PyCFunction)PySocketSock_connect, METH_O,
connect_doc},
! {"connect_ex", (PyCFunction)PySocketSock_connect_ex, METH_O,
connect_ex_doc},
#ifndef NO_DUP
! {"dup", (PyNoArgsFunction)PySocketSock_dup, METH_NOARGS,
dup_doc},
#endif
! {"fileno", (PyNoArgsFunction)PySocketSock_fileno, METH_NOARGS,
fileno_doc},
#ifdef HAVE_GETPEERNAME
! {"getpeername", (PyNoArgsFunction)PySocketSock_getpeername,
! METH_NOARGS, getpeername_doc},
#endif
! {"getsockname", (PyNoArgsFunction)PySocketSock_getsockname,
! METH_NOARGS, getsockname_doc},
{"getsockopt", (PyCFunction)PySocketSock_getsockopt, METH_VARARGS,
getsockopt_doc},
! {"listen", (PyCFunction)PySocketSock_listen, METH_O,
listen_doc},
#ifndef NO_DUP
***************
*** 1670,1678 ****
{"sendto", (PyCFunction)PySocketSock_sendto, METH_VARARGS,
sendto_doc},
! {"setblocking", (PyCFunction)PySocketSock_setblocking, METH_VARARGS,
setblocking_doc},
{"setsockopt", (PyCFunction)PySocketSock_setsockopt, METH_VARARGS,
setsockopt_doc},
! {"shutdown", (PyCFunction)PySocketSock_shutdown, METH_VARARGS,
shutdown_doc},
#ifdef RISCOS
--- 1659,1667 ----
{"sendto", (PyCFunction)PySocketSock_sendto, METH_VARARGS,
sendto_doc},
! {"setblocking", (PyCFunction)PySocketSock_setblocking, METH_O,
setblocking_doc},
{"setsockopt", (PyCFunction)PySocketSock_setsockopt, METH_VARARGS,
setsockopt_doc},
! {"shutdown", (PyCFunction)PySocketSock_shutdown, METH_O,
shutdown_doc},
#ifdef RISCOS