mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Cal get*Str*arg() instead of get*str*arg(), until the code is fixed.

Browse source
This commit is contained in:
Guido van Rossum 1992-01-27 16:49:54 +00:00
parent 9db23a8c5f
commit 9c16d7fbac
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Modules/socketmodule.c
View file

@ -24,6 +24,8 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
/* Socket module */ /* Socket module */
/* XXX Ought to fix getStr*arg calls to use getargs(args, "s#", ...) */
/* /*
This module provides an interface to Berkeley socket IPC. This module provides an interface to Berkeley socket IPC.
@ -275,7 +277,7 @@ getsockaddrarg(s, args, addr_ret, len_ret)
static struct sockaddr_un addr; static struct sockaddr_un addr;
object *path; object *path;
int len; int len;
if (!getstrarg(args, &path)) if (!getStrarg(args, &path))
return 0; return 0;
if ((len = getstringsize(path)) > sizeof addr.sun_path) { if ((len = getstringsize(path)) > sizeof addr.sun_path) {
err_setstr(SocketError, "AF_UNIX path too long"); err_setstr(SocketError, "AF_UNIX path too long");
@ -293,7 +295,7 @@ getsockaddrarg(s, args, addr_ret, len_ret)
static struct sockaddr_in addr; static struct sockaddr_in addr;
object *host; object *host;
int port; int port;
if (!getstrintarg(args, &host, &port)) if (!getStrintarg(args, &host, &port))
return 0; return 0;
if (setipaddr(getstringvalue(host), &addr) < 0) if (setipaddr(getstringvalue(host), &addr) < 0)
return 0; return 0;
@ -471,7 +473,7 @@ sock_makefile(s, args)
object *mode; object *mode;
int fd; int fd;
FILE *fp; FILE *fp;
if (!getstrarg(args, &mode)) if (!getStrarg(args, &mode))
return NULL; return NULL;
if ((fd = dup(s->sock_fd)) < 0 || if ((fd = dup(s->sock_fd)) < 0 ||
(fp = fdopen(fd, getstringvalue(mode))) == NULL) (fp = fdopen(fd, getstringvalue(mode))) == NULL)
@ -540,9 +542,9 @@ sock_send(s, args)
{ {
object *buf; object *buf;
int len, n, flags; int len, n, flags;
if (!getstrintarg(args, &buf, &flags)) { if (!getStrintarg(args, &buf, &flags)) {
err_clear(); err_clear();
if (!getstrarg(args, &buf)) if (!getStrarg(args, &buf))
return NULL; return NULL;
flags = 0; flags = 0;
} }
@ -569,7 +571,7 @@ sock_sendto(s, args)
err_badarg(); err_badarg();
return NULL; return NULL;
} }
if (!getstrarg(gettupleitem(args, 0), &buf) || if (!getStrarg(gettupleitem(args, 0), &buf) ||
!getsockaddrarg(s, gettupleitem(args, 1), &addr, &addrlen)) !getsockaddrarg(s, gettupleitem(args, 1), &addr, &addrlen))
return NULL; return NULL;
len = getstringsize(buf); len = getstringsize(buf);
@ -691,7 +693,7 @@ socket_gethostbyname(self, args)
object *name; object *name;
struct hostent *hp; struct hostent *hp;
struct sockaddr_in addrbuf; struct sockaddr_in addrbuf;
if (!getstrarg(args, &name)) if (!getStrarg(args, &name))
return NULL; return NULL;
if (setipaddr(getstringvalue(name), &addrbuf) < 0) if (setipaddr(getstringvalue(name), &addrbuf) < 0)
return NULL; return NULL;
@ -711,7 +713,7 @@ socket_getservbyname(self, args)
{ {
object *name, *proto; object *name, *proto;
struct servent *sp; struct servent *sp;
if (!getstrstrarg(args, &name, &proto)) if (!getStrStrarg(args, &name, &proto))
return NULL; return NULL;
sp = getservbyname(getstringvalue(name), getstringvalue(proto)); sp = getservbyname(getstringvalue(name), getstringvalue(proto));
if (sp == NULL) { if (sp == NULL) {