From 480ff6961d288f3589d42dd8bc272c0f2d0c14c4 Mon Sep 17 00:00:00 2001
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Date: Thu, 1 Mar 2018 12:21:04 +0200
Subject: [PATCH] mesh: Fix lines going beyond 80 columns

---
 mesh/config-client.c |  3 ++-
 mesh/config-server.c |  3 ++-
 mesh/main.c          | 23 ++++++++++++++---------
 mesh/onoff-model.c   | 11 ++++++-----
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/mesh/config-client.c b/mesh/config-client.c
index 5490de304..19e617d62 100644
--- a/mesh/config-client.c
+++ b/mesh/config-client.c
@@ -627,7 +627,8 @@ static bool verify_config_target(uint32_t dst)
 
 	node = node_find_by_addr(dst);
 	if (!node) {
-		bt_shell_printf("Node with unicast address %4.4x unknown\n", dst);
+		bt_shell_printf("Node with unicast address %4.4x unknown\n",
+				dst);
 		return false;
 	}
 
diff --git a/mesh/config-server.c b/mesh/config-server.c
index 10fead6e2..2d6576375 100644
--- a/mesh/config-server.c
+++ b/mesh/config-server.c
@@ -129,7 +129,8 @@ static bool server_msg_recvd(uint16_t src, uint8_t *data,
 
 		pub.retransmit = data[8];
 		bt_shell_printf("Retransmit count: %d\n", data[8] >> 5);
-		bt_shell_printf("Retransmit Interval Steps: %d\n", data[8] & 0x1f);
+		bt_shell_printf("Retransmit Interval Steps: %d\n",
+				data[8] & 0x1f);
 
 		ele_idx = ele_addr - node_get_primary(node);
 
diff --git a/mesh/main.c b/mesh/main.c
index d96de75db..7c72f4979 100644
--- a/mesh/main.c
+++ b/mesh/main.c
@@ -923,8 +923,10 @@ static GDBusProxy *get_characteristic(GDBusProxy *device, const char *char_uuid)
 	for (l = char_list; l; l = l->next) {
 		if (mesh_gatt_is_child(l->data, service, "Service") &&
 					char_is_mesh(l->data, char_uuid)) {
-			bt_shell_printf("Found matching char: path %s, uuid %s\n",
-				g_dbus_proxy_get_path(l->data), char_uuid);
+			bt_shell_printf("Found matching char: path %s,"
+					" uuid %s\n",
+					g_dbus_proxy_get_path(l->data),
+					char_uuid);
 			return l->data;
 		}
 	}
@@ -984,13 +986,15 @@ static void proxy_added(GDBusProxy *proxy, void *user_data)
 	} else if (!strcmp(interface, "org.bluez.GattService1") &&
 						service_is_mesh(proxy, NULL)) {
 
-		bt_shell_printf("Service added %s\n", g_dbus_proxy_get_path(proxy));
+		bt_shell_printf("Service added %s\n",
+				g_dbus_proxy_get_path(proxy));
 		service_list = g_list_append(service_list, proxy);
 
 	} else if (!strcmp(interface, "org.bluez.GattCharacteristic1") &&
 						char_is_mesh(proxy, NULL)) {
 
-		bt_shell_printf("Char added %s:\n", g_dbus_proxy_get_path(proxy));
+		bt_shell_printf("Char added %s:\n",
+				g_dbus_proxy_get_path(proxy));
 
 		char_list = g_list_append(char_list, proxy);
 	}
@@ -1010,7 +1014,8 @@ static void start_discovery_reply(DBusMessage *message, void *user_data)
 		return bt_shell_noninteractive_quit(EXIT_FAILURE);
 	}
 
-	bt_shell_printf("Discovery %s\n", enable == TRUE ? "started" : "stopped");
+	bt_shell_printf("Discovery %s\n",
+			enable == TRUE ? "started" : "stopped");
 
 	return bt_shell_noninteractive_quit(EXIT_SUCCESS);
 }
@@ -1210,8 +1215,8 @@ static void property_changed(GDBusProxy *proxy, const char *name,
 
 				dbus_message_iter_get_basic(iter, &resolved);
 
-				bt_shell_printf("Services resolved %s\n", resolved ?
-								"yes" : "no");
+				bt_shell_printf("Services resolved %s\n",
+						resolved ? "yes" : "no");
 
 				if (resolved)
 					mesh_session_setup(connection.device);
@@ -1909,8 +1914,8 @@ int main(int argc, char *argv[])
 		bt_shell_printf("Local config directory not provided.\n");
 		mesh_config_dir = "";
 	} else {
-		bt_shell_printf("Reading prov_db.json and local_node.json from %s\n",
-							mesh_config_dir);
+		bt_shell_printf("Reading prov_db.json and local_node.json from"
+				" %s\n", mesh_config_dir);
 	}
 
 	len = strlen(mesh_config_dir);
diff --git a/mesh/onoff-model.c b/mesh/onoff-model.c
index 016a6ea28..49be089aa 100644
--- a/mesh/onoff-model.c
+++ b/mesh/onoff-model.c
@@ -58,8 +58,8 @@ static int client_bind(uint16_t app_idx, int action)
 			return MESH_STATUS_INSUFF_RESOURCES;
 		} else {
 			onoff_app_idx = app_idx;
-			bt_shell_printf("On/Off client model: new binding %4.4x\n",
-								app_idx);
+			bt_shell_printf("On/Off client model: new binding"
+					" %4.4x\n", app_idx);
 		}
 	} else {
 		if (onoff_app_idx == app_idx)
@@ -101,8 +101,8 @@ static void print_remaining_time(uint8_t remaining_time)
 		break;
 	}
 
-	bt_shell_printf("\n\t\tRemaining time: %d hrs %d mins %d secs %d msecs\n",
-						hours, minutes, secs, msecs);
+	bt_shell_printf("\n\t\tRemaining time: %d hrs %d mins %d secs %d"
+			" msecs\n", hours, minutes, secs, msecs);
 
 }
 
@@ -134,7 +134,8 @@ static bool client_msg_recvd(uint16_t src, uint8_t *data,
 						src, data[0] ? "ON" : "OFF");
 
 		if (len == 3) {
-			bt_shell_printf(", target = %s", data[1] ? "ON" : "OFF");
+			bt_shell_printf(", target = %s",
+					data[1] ? "ON" : "OFF");
 			print_remaining_time(data[2]);
 		} else
 			bt_shell_printf("\n");
-- 
2.47.3