From 43f7193260c55a3ab55222773a5f0ec7a00cd695 Mon Sep 17 00:00:00 2001 From: Albert I Date: Sat, 26 Jun 2021 04:21:58 +0800 Subject: [PATCH] sm6225-common: gps: Implement list empty error code for msg_q This fixes enum-conversion warning due to implicit type enum casting between linked_list and msg_q which happens only for status -6. Change-Id: I27ba74c4d840b7ba0cb1017d69a30fc25b80d6b9 --- gps/utils/msg_q.c | 4 +++- gps/utils/msg_q.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gps/utils/msg_q.c b/gps/utils/msg_q.c index 3383960..2e8b886 100644 --- a/gps/utils/msg_q.c +++ b/gps/utils/msg_q.c @@ -76,6 +76,8 @@ static msq_q_err_type convert_linked_list_err_type(linked_list_err_type linked_l return eMSG_Q_UNAVAILABLE_RESOURCE; case eLINKED_LIST_INSUFFICIENT_BUFFER: return eMSG_Q_INSUFFICIENT_BUFFER; + case eLINKED_LIST_EMPTY: + return eMSG_Q_EMPTY; case eLINKED_LIST_FAILURE_GENERAL: default: @@ -298,7 +300,7 @@ msq_q_err_type msg_q_rmv(void* msg_q_data, void** msg_obj) if (linked_list_empty(p_msg_q->msg_list)) { LOC_LOGW("%s: list is empty !!\n", __FUNCTION__); pthread_mutex_unlock(&p_msg_q->list_mutex); - return eLINKED_LIST_EMPTY; + return eMSG_Q_EMPTY; } rv = convert_linked_list_err_type(linked_list_remove(p_msg_q->msg_list, msg_obj)); diff --git a/gps/utils/msg_q.h b/gps/utils/msg_q.h index 16df494..108cac8 100644 --- a/gps/utils/msg_q.h +++ b/gps/utils/msg_q.h @@ -50,6 +50,8 @@ typedef enum /**< Failed because an there were not enough resources. */ eMSG_Q_INSUFFICIENT_BUFFER = -5, /**< Failed because an the supplied buffer was too small. */ + eMSG_Q_EMPTY = -6 + /**< Failed because list is empty. */ }msq_q_err_type; /*===========================================================================