Whitespace cleanup

7 files changed, 24 insertions, 33 deletions

diff --git a/hcid/adapter.c b/hcid/adapter.c
index c3fa8d1c..08fecda7 100644
--- a/hcid/adapter.c
+++ b/hcid/adapter.c
@@ -1845,7 +1845,7 @@ static DBusHandlerResult adapter_clear_remote_alias(DBusConnection *conn,
 	str2ba(addr_ptr, &bdaddr);
 
 	ecode = get_device_alias(adapter->dev_id, &bdaddr, NULL, 0);
-	if (ecode == -ENXIO) 
+	if (ecode == -ENXIO)
 		had_alias = 0;
 
 	ecode = set_device_alias(adapter->dev_id, &bdaddr, NULL);
@@ -2820,10 +2820,8 @@ static DBusHandlerResult adapter_cancel_discovery(DBusConnection *conn,
 			strcmp(adapter->discov_requestor, dbus_message_get_sender(msg)))
 		return error_not_authorized(conn, msg);
 
-	/* 
-	 * Cleanup the discovered devices list and send the cmd
-	 * to cancel inquiry or cancel remote name request
-	 */
+	/* Cleanup the discovered devices list and send the cmd to cancel
+	 * inquiry or cancel remote name request */
 	err = cancel_discovery(adapter);
 	if (err < 0) {
 		if (err == -ENODEV)
diff --git a/hcid/dbus-api.txt b/hcid/dbus-api.txt
index 51a2eff7..feeb8130 100644
--- a/hcid/dbus-api.txt
+++ b/hcid/dbus-api.txt
@@ -52,9 +52,9 @@ Error hierarchy
 Interface	org.bluez.Error
 
 Shared Errors (Can be thrown by hcid or any bluetooth service)
-		
+
 		DeviceUnreachable
-		
+
 			The remote device is either powered down or out of range.
 
 		AlreadyConnected
@@ -82,7 +82,7 @@ Shared Errors (Can be thrown by hcid or any bluetooth service)
 		InvalidArguments
 
 			The DBUS request does not contain the right number of
-			arguments with the right type, or the arguments are there 
+			arguments with the right type, or the arguments are there
 			but their value is wrong, or does not makes sense in the
 			current context.
 
@@ -96,8 +96,8 @@ Shared Errors (Can be thrown by hcid or any bluetooth service)
 			Error returned when a specified record is not
 			available.
 
-		NotSupported 
-			
+		NotSupported
+
 			The remote device does not support the expected
 			feature.
 
@@ -123,7 +123,7 @@ Hcid specific Errors (Can be thrown by hcid only)
 			Error returned when the adapter is DOWN.
 
 		UnknwownMethod
-		
+
 			This is an experimental method.
 
 		NotAuthorized
@@ -140,9 +140,9 @@ Hcid specific Errors (Can be thrown by hcid only)
 			exists. This error is similar to ENODEV.
 
 		NoSuchService
-		
+
 		RequestDeferred
-		
+
 		NotInProgress
 
 		UnsupportedMajorClass
@@ -1164,7 +1164,7 @@ Signals		void ModeChanged(string mode)
 			Signals that a bonding was removed.
 
 		void TrustAdded(string address)
-			
+
 			Sent when SetTrusted() is called.
 
 		void TrustRemoved(string address)
@@ -1261,7 +1261,7 @@ Signals		void Started()
 			was stopped.
 
 		void TrustAdded(string address)
-			
+
 			Sent when SetTrusted() is called.
 
 		void TrustRemoved(string address)
diff --git a/hcid/dbus-database.c b/hcid/dbus-database.c
index 8b4060b4..a954d11f 100644
--- a/hcid/dbus-database.c
+++ b/hcid/dbus-database.c
@@ -491,7 +491,7 @@ static DBusHandlerResult cancel_authorization_request(DBusConnection *conn,
 }
 
 static DBusMethodVTable database_methods[] = {
-	{ "AddServiceRecord",			add_service_record,		"ay",	"u"	},	
+	{ "AddServiceRecord",			add_service_record,		"ay",	"u"	},
 	{ "AddServiceRecordFromXML",		add_service_record_from_xml,	"s",	"u"	},
 	{ "UpdateServiceRecord",		update_service_record,		"uay",	""	},
 	{ "UpdateServiceRecordFromXML",		update_service_record_from_xml,	"us",	""	},
diff --git a/hcid/dbus-error.c b/hcid/dbus-error.c
index 26a0ffa6..10a201f7 100644
--- a/hcid/dbus-error.c
+++ b/hcid/dbus-error.c
@@ -54,7 +54,7 @@ DBusHandlerResult error_unknown_method(DBusConnection *conn, DBusMessage *msg)
 
 	snprintf(error, 128, "Method \"%s\" with signature \"%s\" on interface \"%s\" doesn't exist",
 			method, signature, interface);
-	
+
 	return send_message_and_unref(conn,
 		dbus_message_new_error(msg, ERROR_INTERFACE ".UnknownMethod",
 							error));
diff --git a/hcid/dbus-hci.c b/hcid/dbus-hci.c
index 1a21af4b..e5114517 100644
--- a/hcid/dbus-hci.c
+++ b/hcid/dbus-hci.c
@@ -1451,10 +1451,8 @@ void hcid_dbus_remote_name(bdaddr_t *local, bdaddr_t *peer, uint8_t status,
 	g_slist_free(adapter->found_devices);
 	adapter->found_devices = NULL;
 
-	/*
-	 * The discovery completed signal must be sent only for discover 
-	 * devices request WITH name resolving
-	 */
+	/* The discovery completed signal must be sent only for discover
+	 * devices request WITH name resolving */
 	if (adapter->discov_requestor) {
 		name_listener_remove(connection, adapter->discov_requestor,
 				(name_cb_t) discover_devices_req_exit, adapter);
@@ -2016,11 +2014,8 @@ void discover_devices_req_exit(const char *name, struct adapter *adapter)
 {
 	debug("DiscoverDevices requestor (%s) exited", name);
 
-	/* 
-	 * Cleanup the discovered devices list and send the command to
-	 * cancel inquiry or cancel remote name request. The return
-	 * can be ignored.
-	 */
+	/* Cleanup the discovered devices list and send the command to cancel
+	 * inquiry or cancel remote name request. The return can be ignored. */
 	cancel_discovery(adapter);
 }
 
@@ -2139,11 +2134,9 @@ void periodic_discover_req_exit(const char *name, struct adapter *adapter)
 {
 	debug("PeriodicDiscovery requestor (%s) exited", name);
 
-	/* 
-	 * Cleanup the discovered devices list and send the cmd to exit from
+	/* Cleanup the discovered devices list and send the cmd to exit from
 	 * periodic inquiry or cancel remote name request. The return value can
-	 * be ignored.
-	 */
+	 * be ignored. */
 
 	cancel_periodic_discovery(adapter);
 }
diff --git a/hcid/dbus-sdp.c b/hcid/dbus-sdp.c
index 4036f4fd..f456cebf 100644
--- a/hcid/dbus-sdp.c
+++ b/hcid/dbus-sdp.c
@@ -163,7 +163,7 @@ static int get_bdaddrs(int sock, bdaddr_t *sba, bdaddr_t *dba)
 		error("getsockname: %s (%d)", strerror(errno), errno);
 		return -1;
 	}
-	
+
 	bacpy(sba, &a.l2_bdaddr);
 
 	len = sizeof(a);
@@ -562,7 +562,7 @@ static void remote_svc_rec_completed_xml_cb(uint8_t type, uint16_t err,
 	src = get_address_from_message(ctxt->conn, ctxt->rq);
 
 	reply = dbus_message_new_method_return(ctxt->rq);
-	
+
 	rec = sdp_extract_pdu(rsp, &scanned);
 	if (rec == NULL || size != scanned) {
 		error("Invalid service record!");
diff --git a/hcid/security.c b/hcid/security.c
index 03907d9d..404ff93c 100644
--- a/hcid/security.c
+++ b/hcid/security.c
@@ -110,7 +110,7 @@ static void hci_req_queue_process(int dev_id)
 
 		data = l->data;
 		data->status = REQ_SENT;
-		
+
 		ret_val = hci_send_cmd(dd, data->ogf, data->ocf, data->clen, data->cparam);
 		if (ret_val < 0) {
 			hci_req_queue = g_slist_remove(hci_req_queue, data);