summaryrefslogtreecommitdiffstats
path: root/pand
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2005-07-05 21:15:41 +0000
committerMarcel Holtmann <marcel@holtmann.org>2005-07-05 21:15:41 +0000
commit1f422e5f2b343d35a8c77ce4be16f74b2819b2bf (patch)
treee24bdebe86afcff3ce29cc0f47f05caec7ab7bc0 /pand
parent952e7cc56afa29f77a828aa256985ba38a06fa80 (diff)
Fix some GCC 4.0 warnings
Diffstat (limited to 'pand')
-rw-r--r--pand/main.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/pand/main.c b/pand/main.c
index 98b1720d..20fbec19 100644
--- a/pand/main.c
+++ b/pand/main.c
@@ -127,7 +127,8 @@ static int do_listen(void)
{
struct l2cap_options l2o;
struct sockaddr_l2 l2a;
- int sk, olen, lm;
+ socklen_t olen;
+ int sk, lm;
if (use_sdp)
bnep_sdp_register(role);
@@ -185,7 +186,7 @@ static int do_listen(void)
listen(sk, 10);
while (!terminate) {
- int alen = sizeof(l2a);
+ socklen_t alen = sizeof(l2a);
int nsk;
nsk = accept(sk, (struct sockaddr *) &l2a, &alen);
if (nsk < 0) {
@@ -243,7 +244,8 @@ static int w4_hup(int sk)
}
if (n) {
- int err = 0, olen = sizeof(err);
+ int err = 0;
+ socklen_t olen = sizeof(err);
getsockopt(sk, SOL_SOCKET, SO_ERROR, &err, &olen);
syslog(LOG_INFO, "%s disconnected%s%s", netdev,
err ? " : " : "", err ? strerror(err) : "");
@@ -265,7 +267,8 @@ static int create_connection(char *dst, bdaddr_t *bdaddr)
{
struct l2cap_options l2o;
struct sockaddr_l2 l2a;
- int sk, olen, r = 0;
+ socklen_t olen;
+ int sk, r = 0;
syslog(LOG_INFO, "Connecting to %s", dst);