summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2006-08-23 12:44:49 +0000
committerJohan Hedberg <johan.hedberg@nokia.com>2006-08-23 12:44:49 +0000
commitebcff2a749d72573e8ed562dcfb274c81dc64311 (patch)
tree3c26817cab61e6e8ca1e9b1a71b1dc4d1a7b1561
parent9f869d17dd2d72945923dd933b372bea68768098 (diff)
More coding style fixes
-rw-r--r--hcid/dbus-adapter.c2
-rw-r--r--hcid/dbus-rfcomm.c8
-rw-r--r--hcid/dbus-sdp.c12
-rw-r--r--hcid/dbus-security.c4
-rw-r--r--hcid/dbus.c2
5 files changed, 14 insertions, 14 deletions
diff --git a/hcid/dbus-adapter.c b/hcid/dbus-adapter.c
index 0c405b2a..75232a7b 100644
--- a/hcid/dbus-adapter.c
+++ b/hcid/dbus-adapter.c
@@ -2354,7 +2354,7 @@ struct slist *service_classes_str(uint32_t class)
if (!(services & (1 << i)))
continue;
- l = slist_append(l, (void *)service_cls[i]);
+ l = slist_append(l, (void *) service_cls[i]);
}
return l;
diff --git a/hcid/dbus-rfcomm.c b/hcid/dbus-rfcomm.c
index f5c5708a..f4215f92 100644
--- a/hcid/dbus-rfcomm.c
+++ b/hcid/dbus-rfcomm.c
@@ -308,7 +308,7 @@ static gboolean rfcomm_connect_cb(GIOChannel *chan, GIOCondition cond,
node->io = g_io_channel_unix_new(fd);
node->io_id = g_io_add_watch(node->io, G_IO_ERR | G_IO_HUP,
- (GIOFunc)rfcomm_disconnect_cb, node);
+ (GIOFunc) rfcomm_disconnect_cb, node);
send_reply_and_unref(c->conn, reply);
@@ -371,7 +371,7 @@ static int rfcomm_connect(DBusConnection *conn, DBusMessage *msg, bdaddr_t *src,
goto failed;
}
- if (bind(sk, (struct sockaddr *)&c->laddr, sizeof(c->laddr)) < 0) {
+ if (bind(sk, (struct sockaddr *) &c->laddr, sizeof(c->laddr)) < 0) {
if (err)
*err = errno;
goto failed;
@@ -386,7 +386,7 @@ static int rfcomm_connect(DBusConnection *conn, DBusMessage *msg, bdaddr_t *src,
c->io = g_io_channel_unix_new(sk);
- if (connect(sk, (struct sockaddr *)&c->raddr, sizeof(c->raddr)) < 0) {
+ if (connect(sk, (struct sockaddr *) &c->raddr, sizeof(c->raddr)) < 0) {
/* BlueZ returns EAGAIN eventhough it should return EINPROGRESS */
if (!(errno == EAGAIN || errno == EINPROGRESS)) {
if (err)
@@ -396,7 +396,7 @@ static int rfcomm_connect(DBusConnection *conn, DBusMessage *msg, bdaddr_t *src,
}
debug("Connect in progress");
- g_io_add_watch(c->io, G_IO_OUT, (GIOFunc)rfcomm_connect_cb, c);
+ g_io_add_watch(c->io, G_IO_OUT, (GIOFunc) rfcomm_connect_cb, c);
pending_connects = slist_append(pending_connects, c);
} else {
debug("Connect succeeded with first try");
diff --git a/hcid/dbus-sdp.c b/hcid/dbus-sdp.c
index 2b0b2fef..c86d5fcb 100644
--- a/hcid/dbus-sdp.c
+++ b/hcid/dbus-sdp.c
@@ -405,8 +405,8 @@ static int sdp_cache_append(const char *owner, const char *prov, sdp_record_t *r
return -1;
memset(&psearch, 0, sizeof(psearch));
- psearch.owner = (char *)owner;
- psearch.prov = (char *)prov;
+ psearch.owner = (char *) owner;
+ psearch.prov = (char *) prov;
lp = slist_find(sdp_cache, &psearch, service_provider_cmp);
if (!lp) {
@@ -799,7 +799,7 @@ static DBusHandlerResult get_identifiers_by_service(DBusConnection *conn,
if (sdp_get_service_classes(r->record, &ls))
continue;
- puuid = (uuid_t *)ls->data;
+ puuid = (uuid_t *) ls->data;
if (sdp_uuid16_cmp(puuid, &uuid) == 0) {
snprintf(identifier, MAX_IDENTIFIER_LEN, "%s/%d", p->prov, r->id);
@@ -930,7 +930,7 @@ static DBusHandlerResult get_name(DBusConnection *conn,
return error_failed(conn, msg, errno);
}
- puuid = (uuid_t *)ls->data;
+ puuid = (uuid_t *) ls->data;
ptr = sdp_svclass2str(puuid->value.uuid16);
sdp_list_free(ls, free);
@@ -987,7 +987,7 @@ static DBusHandlerResult register_rfcomm(DBusConnection *conn,
/* Only add a D-Bus unique name listener if there isn't one already registered */
memset(&psearch, 0, sizeof(psearch));
- psearch.owner = (char *)owner;
+ psearch.owner = (char *) owner;
if (!slist_find(sdp_cache, &psearch, service_provider_cmp))
name_listener_add(conn, owner, (name_cb_t) owner_exited, dbus_data);
@@ -1033,7 +1033,7 @@ static DBusHandlerResult unregister_rfcomm(DBusConnection *conn,
memset(&psearch, 0, sizeof(psearch));
psearch.prov = address;
- psearch.owner = (char *)owner;
+ psearch.owner = (char *) owner;
lp = slist_find(sdp_cache, &psearch, service_provider_cmp);
if (!lp)
diff --git a/hcid/dbus-security.c b/hcid/dbus-security.c
index 8fd723fd..08f6f48c 100644
--- a/hcid/dbus-security.c
+++ b/hcid/dbus-security.c
@@ -229,7 +229,7 @@ static DBusHandlerResult register_agent(DBusConnection *conn,
memset(&ref, 0, sizeof(ref));
- ref.name = (char *)dbus_message_get_sender(msg);
+ ref.name = (char *) dbus_message_get_sender(msg);
ref.addr = addr;
ref.path = path;
@@ -284,7 +284,7 @@ static DBusHandlerResult unregister_agent(DBusConnection *conn,
memset(&ref, 0, sizeof(ref));
- ref.name = (char *)dbus_message_get_sender(msg);
+ ref.name = (char *) dbus_message_get_sender(msg);
ref.path = path;
ref.addr = addr;
diff --git a/hcid/dbus.c b/hcid/dbus.c
index 29a81cef..cc541825 100644
--- a/hcid/dbus.c
+++ b/hcid/dbus.c
@@ -1803,7 +1803,7 @@ void hcid_dbus_setname_complete(bdaddr_t *local)
int dd = -1;
read_local_name_rp rp;
struct hci_request rq;
- const char *pname = (char*) rp.name;
+ const char *pname = (char *) rp.name;
char name[249];
baswap(&tmp, local); local_addr = batostr(&tmp);