aboutsummaryrefslogtreecommitdiffstats
path: root/sap
diff options
context:
space:
mode:
authorWaldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>2011-05-31 12:46:49 +0200
committerJohan Hedberg <johan.hedberg@intel.com>2011-06-01 14:47:04 +0300
commitd77b3e021a04ffa8a171565967f29e9f9d5518f3 (patch)
tree7926494494aa7b156069d4ab8945c5d893b535c8 /sap
parent6890d5129112d537a77709a65918a4ba445fc07d (diff)
downloadbluez-d77b3e021a04ffa8a171565967f29e9f9d5518f3.tar.gz
bluez-d77b3e021a04ffa8a171565967f29e9f9d5518f3.tar.xz
bluez-d77b3e021a04ffa8a171565967f29e9f9d5518f3.zip
Coding style cleanup in sap server
Diffstat (limited to 'sap')
-rw-r--r--sap/server.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/sap/server.c b/sap/server.c
index aa8ba237..a6712354 100644
--- a/sap/server.c
+++ b/sap/server.c
@@ -257,7 +257,7 @@ static int send_message(struct sap_connection *conn, void *buf, size_t size)
DBG("conn %p, size %zu", conn, size);
gstatus = g_io_channel_write_chars(conn->io, buf, size, &written,
- &gerr);
+ &gerr);
if (gstatus != G_IO_STATUS_NORMAL) {
if (gerr)
g_error_free(gerr);
@@ -1095,7 +1095,7 @@ static gboolean sap_io_cb(GIOChannel *io, GIOCondition cond, gpointer data)
}
gstatus = g_io_channel_read_chars(io, buf, sizeof(buf) - 1,
- &bytes_read, &gerr);
+ &bytes_read, &gerr);
if (gstatus != G_IO_STATUS_NORMAL) {
if (gerr)
g_error_free(gerr);
@@ -1239,8 +1239,8 @@ static void connect_confirm_cb(GIOChannel *io, gpointer data)
static inline DBusMessage *message_failed(DBusMessage *msg,
const char *description)
{
- return g_dbus_create_error(msg, ERROR_INTERFACE ".Failed",
- "%s", description);
+ return g_dbus_create_error(msg, ERROR_INTERFACE ".Failed", "%s",
+ description);
}
static DBusMessage *disconnect(DBusConnection *conn, DBusMessage *msg,
@@ -1258,7 +1258,7 @@ static DBusMessage *disconnect(DBusConnection *conn, DBusMessage *msg,
if (disconnect_req(server->conn, SAP_DISCONNECTION_TYPE_GRACEFUL) < 0)
return g_dbus_create_error(msg, ERROR_INTERFACE ".Failed",
- "There is no active connection");
+ "There is no active connection");
return dbus_message_new_method_return(msg);
}
@@ -1287,7 +1287,7 @@ static DBusMessage *get_properties(DBusConnection *c,
DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
connected = (conn->state == SAP_STATE_CONNECTED ||
- conn->state == SAP_STATE_GRACEFUL_DISCONNECT);
+ conn->state == SAP_STATE_GRACEFUL_DISCONNECT);
dict_append_entry(&dict, "Connected", DBUS_TYPE_BOOLEAN, &connected);
dbus_message_iter_close_container(&iter, &dict);
@@ -1380,8 +1380,8 @@ int sap_server_register(const char *path, bdaddr_t *src)
server->conn = NULL;
if (!g_dbus_register_interface(connection, path, SAP_SERVER_INTERFACE,
- server_methods, server_signals, NULL,
- server, destroy_sap_interface)) {
+ server_methods, server_signals, NULL,
+ server, destroy_sap_interface)) {
error("D-Bus failed to register %s interface",
SAP_SERVER_INTERFACE);
goto server_err;