[PATCH 2/2] emulator: add support of void parameters in CMER

[=?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis <frederic.danis@linux.intel.com>]

[-- Attachment #1: Type: text/plain, Size: 2519 bytes --]

---
 src/emulator.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/emulator.c b/src/emulator.c
index 9cd3252..20a575f 100644
--- a/src/emulator.c
+++ b/src/emulator.c
@@ -312,7 +312,7 @@ static void cmer_cb(GAtServer *server, GAtServerRequestType type,
 	case G_AT_SERVER_REQUEST_TYPE_SET:
 	{
 		GAtResultIter iter;
-		int mode;
+		int mode = em->events_mode;
 		int ind = em->events_ind;
 		int val;
 
@@ -320,15 +320,15 @@ static void cmer_cb(GAtServer *server, GAtServerRequestType type,
 		g_at_result_iter_next(&iter, "");
 
 		/* mode */
-		if (g_at_result_iter_next_number(&iter, &mode) == FALSE)
+		if (!g_at_result_iter_next_number_default(&iter, mode, &mode))
 			goto fail;
 
 		if (mode != 0 && mode != 3)
 			goto fail;
 
 		/* keyp */
-		if (g_at_result_iter_next_number(&iter, &val) == FALSE) {
-			if (g_at_result_iter_skip_next(&iter) == FALSE)
+		if (!g_at_result_iter_next_number_default(&iter, 0, &val)) {
+			if (!g_at_result_iter_skip_next(&iter))
 				goto done;
 			goto fail;
 		}
@@ -337,8 +337,8 @@ static void cmer_cb(GAtServer *server, GAtServerRequestType type,
 			goto fail;
 
 		/* disp */
-		if (g_at_result_iter_next_number(&iter, &val) == FALSE) {
-			if (g_at_result_iter_skip_next(&iter) == FALSE)
+		if (!g_at_result_iter_next_number_default(&iter, 0, &val)) {
+			if (!g_at_result_iter_skip_next(&iter))
 				goto done;
 			goto fail;
 		}
@@ -347,18 +347,18 @@ static void cmer_cb(GAtServer *server, GAtServerRequestType type,
 			goto fail;
 
 		/* ind */
-		if (g_at_result_iter_next_number(&iter, &ind) == FALSE) {
-			if (g_at_result_iter_skip_next(&iter) == FALSE)
+		if (!g_at_result_iter_next_number_default(&iter, ind, &ind)) {
+			if (!g_at_result_iter_skip_next(&iter))
 				goto done;
 			goto fail;
 		}
 
-		if ((ind != 0) && (ind != 1))
+		if (ind != 0 && ind != 1)
 			goto fail;
 
 		/* bfr */
-		if (g_at_result_iter_next_number(&iter, &val) == FALSE) {
-			if (g_at_result_iter_skip_next(&iter) == FALSE)
+		if (!g_at_result_iter_next_number_default(&iter, 0, &val)) {
+			if (!g_at_result_iter_skip_next(&iter))
 				goto done;
 			goto fail;
 		}
@@ -367,7 +367,7 @@ static void cmer_cb(GAtServer *server, GAtServerRequestType type,
 			goto fail;
 
 		/* check that bfr is last parameter */
-		if (g_at_result_iter_skip_next(&iter) == TRUE)
+		if (g_at_result_iter_skip_next(&iter))
 			goto fail;
 
 done:
-- 
1.7.1