From: Martin v. Löwis <martin@v.loewis.de>
Date: Wed, 14 Feb 2007 11:30:07 +0000 (+0000)
Subject: Update 1432399 to removal of _BT_SOCKADDR_MEMB.
X-Git-Tag: v2.6a1~2175
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f22848273505e74af301aa6ccc10d978d32afabc;p=python

Update 1432399 to removal of _BT_SOCKADDR_MEMB.
---

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index d79db2735c..cc54098f6a 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1362,14 +1362,13 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
 		}
 		case BTPROTO_HCI:
 		{
-			struct sockaddr_hci *addr = (struct sockaddr_hci *) _BT_SOCKADDR_MEMB(s, hci);
+			struct sockaddr_hci *addr = (struct sockaddr_hci *)addr_ret;
 			_BT_HCI_MEMB(addr, family) = AF_BLUETOOTH;
 			if (!PyArg_ParseTuple(args, "i", &_BT_HCI_MEMB(addr, dev))) {
 				PyErr_SetString(socket_error, "getsockaddrarg: "
 						"wrong format");
 				return 0;
 			}
-			*addr_ret = (struct sockaddr *) addr;
 			*len_ret = sizeof *addr;
 			return 1;
 		}