Mercurial > cpython-lru_cache-weakref

comparison Modules/socketmodule.c @ 61086:e918b84ef968 3.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged revisions 80612 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r80612 | antoine.pitrou | 2010-04-29 12:11:46 +0200 (jeu., 29 avril 2010) | 10 lines Merged revisions 80610 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80610 | antoine.pitrou | 2010-04-29 12:05:40 +0200 (jeu., 29 avril 2010) | 4 lines Issue #7834: Fix connect() of Bluetooth L2CAP sockets with recent versions of the Linux kernel. Patch by Yaniv Aknin. ........ ................
author Antoine Pitrou <solipsis@pitrou.net>
date Thu, 29 Apr 2010 10:18:33 +0000
parents 32e0f1aa34bc
children f197407bdba2
comparison
equal deleted inserted replaced
61077:007319a9c888 61086:e918b84ef968
1288 { 1288 {
1289 struct sockaddr_l2 *addr; 1289 struct sockaddr_l2 *addr;
1290 char *straddr; 1290 char *straddr;
1291 1291
1292 addr = (struct sockaddr_l2 *)addr_ret; 1292 addr = (struct sockaddr_l2 *)addr_ret;
1293 memset(addr, 0, sizeof(struct sockaddr_l2));
1293 _BT_L2_MEMB(addr, family) = AF_BLUETOOTH; 1294 _BT_L2_MEMB(addr, family) = AF_BLUETOOTH;
1294 if (!PyArg_ParseTuple(args, "si", &straddr, 1295 if (!PyArg_ParseTuple(args, "si", &straddr,
1295 &_BT_L2_MEMB(addr, psm))) { 1296 &_BT_L2_MEMB(addr, psm))) {
1296 PyErr_SetString(socket_error, "getsockaddrarg: " 1297 PyErr_SetString(socket_error, "getsockaddrarg: "
1297 "wrong format"); 1298 "wrong format");