|
From: Peter K. <pk...@us...> - 2001-10-15 13:50:39
|
The following file was modified in apps/bluetooth/experimental:
Name Old version New version Comment
---- ----------- ----------- -------
btd.c 1.30 1.31=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Removed a couple of unnecessary &.
The diff of the modified file(s):
--- btd.c 2001/10/05 14:14:16 1.30
+++ btd.c 2001/10/15 13:50:39 1.31
@@ -426,8 +426,7 @@
PEER(line).ipset =3D &IPSET(line);
=20=20=20=20=20=20=20=20=20
STATE(line) =3D WAITING_PPPCONF;
- if (ipa_sendrequest(line, (unsigned char *)&PEER(line).remote_bd,=
=20
- IPAREQ_GETIPSET) < 0)
+ if (ipa_sendrequest(line, PEER(line).remote_bd, IPAREQ_GETIPSET) <=
0)
{
syslog(LOG_INFO, "IPA request failed or no IPA server");
=20=20=20=20=20=20=20=20=20=20=20
@@ -758,8 +757,7 @@
{=20
STATE(line) =3D WAITING_RETURN_PPPCONF;
=20=20=20=20=20=20=20
- if (ipa_sendrequest(line, (unsigned char *)&PEER(line).remote_bd,=20
- IPAREQ_RELEASEIPSET) < 0)
+ if (ipa_sendrequest(line, PEER(line).remote_bd, IPAREQ_RELEASEIPSET)=
< 0)
{
syslog(LOG_INFO, "IPA request failed or no IPA server");
/* put peer into state NOCONNECTION, if still connected this
@@ -923,7 +921,7 @@
msg->len =3D sizeof(struct ipa_request);
req =3D (struct ipa_request*)msg->msg;
req->id =3D line;
- memcpy(&req->remote_bd, bd, 6);=20
+ memcpy(req->remote_bd, bd, 6);=20
return ipa_write(ipa_fd, msg);
}
=20
@@ -933,7 +931,7 @@
{
case IPARSP_STATUS:
{
- ipa_status *rsp =3D (struct ipa_status*)(msg->msg);
+ ipa_status *rsp =3D (struct ipa_status*)msg->msg;
D(syslog(LOG_INFO, __FUNCTION__ ": Got status %d on line %d",=20
rsp->status, rsp->id));
=20
@@ -964,7 +962,7 @@
=20=20=20=20=20
case IPARSP_PEERSETTINGS:
{
- ipa_response* rsp =3D (struct ipa_response*)(msg->msg);
+ ipa_response* rsp =3D (struct ipa_response*)msg->msg;
D(syslog(LOG_INFO, __FUNCTION__ ": Got client settings"));
=20=20=20=20=20=20=20
/* Check state */
|