[PATCH BlueZ 1/1] src/agent.c : parse_io_capability Function optimization

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: luokai <luokai@xxxxxxxxxxxxx>

---
 src/agent.c | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/agent.c b/src/agent.c
index e0ffcd22f..82baf608f 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -957,20 +957,24 @@ static void agent_destroy(gpointer data)
 	agent_unref(agent);
 }
 
+static struct capability g_cap[]  = {
+	{"", IO_CAPABILITY_KEYBOARDDISPLAY},
+	{"DisplayOnly", IO_CAPABILITY_DISPLAYONLY},
+	{"DisplayYesNo", IO_CAPABILITY_DISPLAYYESNO},
+	{"KeyboardOnly", IO_CAPABILITY_KEYBOARDONLY},
+	{"NoInputNoOutput", IO_CAPABILITY_NOINPUTNOOUTPUT},
+	{"KeyboardDisplay", IO_CAPABILITY_KEYBOARDDISPLAY}
+};
+
 static uint8_t parse_io_capability(const char *capability)
 {
-	if (g_str_equal(capability, ""))
-		return IO_CAPABILITY_KEYBOARDDISPLAY;
-	if (g_str_equal(capability, "DisplayOnly"))
-		return IO_CAPABILITY_DISPLAYONLY;
-	if (g_str_equal(capability, "DisplayYesNo"))
-		return IO_CAPABILITY_DISPLAYYESNO;
-	if (g_str_equal(capability, "KeyboardOnly"))
-		return IO_CAPABILITY_KEYBOARDONLY;
-	if (g_str_equal(capability, "NoInputNoOutput"))
-		return IO_CAPABILITY_NOINPUTNOOUTPUT;
-	if (g_str_equal(capability, "KeyboardDisplay"))
-		return IO_CAPABILITY_KEYBOARDDISPLAY;
+	size_t count = sizeof(g_cap) / sizeof(g_cap[0]); 
+	for (size_t i = 0; i < count; i++)
+	{
+		if(g_str_equal(capability, g_cap[i].cap)) {
+			return g_cap[i].parse_capability;
+		}
+	}
 	return IO_CAPABILITY_INVALID;
 }
 
-- 
2.20.1






[Index of Archives]     [Bluez Devel]     [Linux Wireless Networking]     [Linux Wireless Personal Area Networking]     [Linux ATH6KL]     [Linux USB Devel]     [Linux Media Drivers]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux