Change all strlen comparison statement styles

Change-Id: I5463cac22db564db9ee65e45d1987bdb85cf4164

diff --git a/src/multi_assistant_service.c b/src/multi_assistant_service.c
index c35f94beadc5a7aa99d24519d01fbec2581507b2..071f8e6163d3bfd36b217d08e959ecffc3d12eac 100644 (file)
--- a/src/multi_assistant_service.c
+++ b/src/multi_assistant_service.c
@@ -340,8 +340,8 @@ int mas_ui_client_change_assistant(const char* appid)
                /* The appid parameter might not exist after this function call, so we use appid string in our g_maclient_info */
                for (int loop = 0; loop < MAX_MACLIENT_INFO_NUM; loop++) {
                        if (g_maclient_info[loop].used &&
-                               strlen(g_maclient_info[loop].appid) > 0 &&
-                               strlen(g_maclient_info[loop].wakeup_word[0]) > 0) {
+                               0 < strlen(g_maclient_info[loop].appid) &&
+                               0 < strlen(g_maclient_info[loop].wakeup_word[0])) {
                                if (strncmp(appid, g_maclient_info[loop].appid, MAX_APPID_LEN) == 0) {
                                        mas_launch_client_by_appid(g_maclient_info[loop].appid);
                                }
@@ -450,9 +450,9 @@ static int init_wakeup(void)
        if (0 == mas_config_get_assistant_info(__mas_assistant_info_cb, NULL)) {
                for (int loop = 0; loop < MAX_MACLIENT_INFO_NUM; loop++) {
                        if (g_maclient_info[loop].used &&
-                               strlen(g_maclient_info[loop].appid) > 0) {
+                               0 < strlen(g_maclient_info[loop].appid)) {
                                for (int inner_loop = 0; inner_loop < MAX_WAKEUP_WORDS_NUM; inner_loop++) {
-                                       if (strlen(g_maclient_info[loop].wakeup_word[inner_loop]) > 0) {
+                                       if (0 < strlen(g_maclient_info[loop].wakeup_word[inner_loop])) {
                                                MAS_LOGD("Registering wakeup word %s for app %s",
                                                        g_maclient_info[loop].wakeup_word[inner_loop], g_maclient_info[loop].appid);
                                                if (0 != multi_assistant_service_plugin_set_wakeup_word(
@@ -512,9 +512,9 @@ static const char* __get_client_appid_by_wakeup_word(const char *wakeup_word)
 
        for (loop = 0; loop < MAX_MACLIENT_INFO_NUM && NULL == appid; loop++) {
                if (g_maclient_info[loop].used &&
-                       strlen(g_maclient_info[loop].appid) > 0) {
+                       0 < strlen(g_maclient_info[loop].appid)) {
                        for (int inner_loop = 0; inner_loop < MAX_WAKEUP_WORDS_NUM; inner_loop++) {
-                               if (strlen(g_maclient_info[loop].wakeup_word[inner_loop]) > 0) {
+                               if (0 < strlen(g_maclient_info[loop].wakeup_word[inner_loop])) {
                                        if (0 == strncmp(wakeup_word, g_maclient_info[loop].wakeup_word[inner_loop], MAX_WAKEUP_WORD_LEN)) {
                                                appid = g_maclient_info[loop].appid;
                                        }
@@ -527,9 +527,9 @@ static const char* __get_client_appid_by_wakeup_word(const char *wakeup_word)
        if (NULL == appid) {
                for (loop = 0; loop < MAX_MACLIENT_INFO_NUM && NULL == appid; loop++) {
                        if (g_maclient_info[loop].used &&
-                               strlen(g_maclient_info[loop].appid) > 0) {
+                               0 < strlen(g_maclient_info[loop].appid)) {
                                for (int inner_loop = 0; inner_loop < MAX_WAKEUP_WORDS_NUM; inner_loop++) {
-                                       if (strlen(g_maclient_info[loop].wakeup_word[inner_loop]) > 0) {
+                                       if (0 < strlen(g_maclient_info[loop].wakeup_word[inner_loop])) {
                                                char comparand[MAX_WAKEUP_WORD_LEN];
                                                int comparand_index = 0;
                                                for (int index = 0; index < MAX_WAKEUP_WORD_LEN; index++) {
@@ -601,9 +601,9 @@ int mas_set_current_client_by_wakeup_word(const char *wakeup_word)
 
        for (loop = 0; loop < MAX_MACLIENT_INFO_NUM && -1 == ret; loop++) {
                if (g_maclient_info[loop].used &&
-                       strlen(g_maclient_info[loop].appid) > 0) {
+                       0 < strlen(g_maclient_info[loop].appid)) {
                        for (int inner_loop = 0; inner_loop < MAX_WAKEUP_WORDS_NUM; inner_loop++) {
-                               if (strlen(g_maclient_info[loop].wakeup_word[inner_loop]) > 0) {
+                               if (0 < strlen(g_maclient_info[loop].wakeup_word[inner_loop])) {
                                        if (0 == strncmp(wakeup_word, g_maclient_info[loop].wakeup_word[inner_loop], MAX_WAKEUP_WORD_LEN)) {
                                                g_current_maclient_info = loop;
                                                ret = 0;
@@ -616,9 +616,9 @@ int mas_set_current_client_by_wakeup_word(const char *wakeup_word)
        if (ret == -1) {
                for (loop = 0; loop < MAX_MACLIENT_INFO_NUM && -1 == ret; loop++) {
                        if (g_maclient_info[loop].used &&
-                               strlen(g_maclient_info[loop].appid) > 0) {
+                               0 < strlen(g_maclient_info[loop].appid)) {
                                for (int inner_loop = 0; inner_loop < MAX_WAKEUP_WORDS_NUM; inner_loop++) {
-                                       if (strlen(g_maclient_info[loop].wakeup_word[inner_loop]) > 0) {
+                                       if (0 < strlen(g_maclient_info[loop].wakeup_word[inner_loop])) {
                                                char comparand[MAX_WAKEUP_WORD_LEN];
                                                int comparand_index = 0;
                                                for (int index = 0; index < MAX_WAKEUP_WORD_LEN; index++) {
@@ -645,8 +645,8 @@ int mas_set_current_client_by_appid(const char *appid)
 
        for (int loop = 0; loop < MAX_MACLIENT_INFO_NUM; loop++) {
                if (g_maclient_info[loop].used &&
-                       strlen(g_maclient_info[loop].appid) > 0 &&
-                       strlen(g_maclient_info[loop].wakeup_word[0]) > 0) {
+                       0 < strlen(g_maclient_info[loop].appid) &&
+                       0 < strlen(g_maclient_info[loop].wakeup_word[0])) {
                        if (strncmp(appid, g_maclient_info[loop].appid, MAX_APPID_LEN) == 0) {
                                g_current_maclient_info = loop;
                        }
@@ -660,7 +660,7 @@ int mas_launch_client_by_appid(const char *appid)
        app_control_h app_control;
        int ret = 0;
 
-       if (NULL == appid || strlen(appid) == 0) {
+       if (NULL == appid || 0 == strlen(appid)) {
                MAS_LOGE("appid invalid, failed launching MA Client");
                return -1;
        }