Fixed the build error using gcc 13

[platform/core/messaging/msg-service.git] / mapi / msg_message.cpp

diff --git a/mapi/msg_message.cpp b/mapi/msg_message.cpp
index 02ba5e6..4b7ddbd 100755 (executable)
--- a/mapi/msg_message.cpp
+++ b/mapi/msg_message.cpp
@@ -175,55 +175,88 @@ int msg_message_get_int_value(void *data, int field, int *value)
        case MSG_MESSAGE_TYPE_INT: {
                if (msg_data->mainType == MSG_SMS_TYPE) {
                        switch (msg_data->subType) {
-                               case MSG_CB_SMS:
-                                       *value = MSG_TYPE_SMS_CB;
-                                       break;
-                               case MSG_JAVACB_SMS:
-                                       *value = MSG_TYPE_SMS_JAVACB;
-                                       break;
-                               case MSG_WAP_SI_SMS:
-                               case MSG_WAP_SL_SMS:
-                                       *value = MSG_TYPE_SMS_WAPPUSH;
-                                       break;
-                               case MSG_MWI_VOICE_SMS:
-                               case MSG_MWI_FAX_SMS:
-                               case MSG_MWI_EMAIL_SMS:
-                               case MSG_MWI_OTHER_SMS:
-                                       *value = MSG_TYPE_SMS_MWI;
-                                       break;
-                               case MSG_SYNCML_CP:
-                                       *value = MSG_TYPE_SMS_SYNCML;
-                                       break;
-                               case MSG_REJECT_SMS:
-                                       *value = MSG_TYPE_SMS_REJECT;
-                                       break;
-                               case MSG_ETWS_SMS:
-                                       *value = MSG_TYPE_SMS_ETWS_PRIMARY;
-                                       break;
-                               case MSG_CMAS_PRESIDENTIAL:
-                                       *value = MSG_TYPE_SMS_CMAS_PRESIDENTIAL;
-                                       break;
-                               case MSG_CMAS_EXTREME:
-                                       *value = MSG_TYPE_SMS_CMAS_EXTREME;
-                                       break;
-                               case MSG_CMAS_SEVERE:
-                                       *value = MSG_TYPE_SMS_CMAS_SEVERE;
-                                       break;
-                               case MSG_CMAS_AMBER:
-                                       *value = MSG_TYPE_SMS_CMAS_AMBER;
-                                       break;
-                               case MSG_CMAS_TEST:
-                                       *value = MSG_TYPE_SMS_CMAS_TEST;
-                                       break;
-                               case MSG_CMAS_EXERCISE:
-                                       *value = MSG_TYPE_SMS_CMAS_EXERCISE;
-                                       break;
-                               case MSG_CMAS_OPERATOR_DEFINED:
-                                       *value = MSG_TYPE_SMS_CMAS_OPERATOR_DEFINED;
-                                       break;
-                               default:
-                                       *value = MSG_TYPE_SMS;
-                                       break;
+                       case MSG_CB_SMS:
+                               *value = MSG_TYPE_SMS_CB;
+                               break;
+                       case MSG_JAVACB_SMS:
+                               *value = MSG_TYPE_SMS_JAVACB;
+                               break;
+                       case MSG_WAP_SI_SMS:
+                       case MSG_WAP_SL_SMS:
+                               *value = MSG_TYPE_SMS_WAPPUSH;
+                               break;
+                       case MSG_MWI_VOICE_SMS:
+                       case MSG_MWI_FAX_SMS:
+                       case MSG_MWI_EMAIL_SMS:
+                       case MSG_MWI_OTHER_SMS:
+                               *value = MSG_TYPE_SMS_MWI;
+                               break;
+                       case MSG_SYNCML_CP:
+                               *value = MSG_TYPE_SMS_SYNCML;
+                               break;
+                       case MSG_REJECT_SMS:
+                               *value = MSG_TYPE_SMS_REJECT;
+                               break;
+                       case MSG_ETWS_SMS:
+                               *value = MSG_TYPE_SMS_ETWS_PRIMARY;
+                               break;
+                       case MSG_CMAS_PRESIDENTIAL:
+                               *value = MSG_TYPE_SMS_CMAS_PRESIDENTIAL;
+                               break;
+                       case MSG_CMAS_PRESIDENTIAL_OTHER_LANG:
+                               *value = MSG_TYPE_SMS_CMAS_PRESIDENTIAL_OTHER_LANG;
+                               break;
+                       case MSG_CMAS_EXTREME:
+                               *value = MSG_TYPE_SMS_CMAS_EXTREME;
+                               break;
+                       case MSG_CMAS_EXTREME_OTHER_LANG:
+                               *value = MSG_TYPE_SMS_CMAS_EXTREME_OTHER_LANG;
+                               break;
+                       case MSG_CMAS_SEVERE:
+                               *value = MSG_TYPE_SMS_CMAS_SEVERE;
+                               break;
+                       case MSG_CMAS_SEVERE_OTHER_LANG:
+                               *value = MSG_TYPE_SMS_CMAS_SEVERE_OTHER_LANG;
+                               break;
+                       case MSG_CMAS_AMBER:
+                               *value = MSG_TYPE_SMS_CMAS_AMBER;
+                               break;
+                       case MSG_CMAS_AMBER_OTHER_LANG:
+                               *value = MSG_TYPE_SMS_CMAS_AMBER_OTHER_LANG;
+                               break;
+                       case MSG_CMAS_TEST:
+                               *value = MSG_TYPE_SMS_CMAS_TEST;
+                               break;
+                       case MSG_CMAS_TEST_OTHER_LANG:
+                               *value = MSG_TYPE_SMS_CMAS_TEST_OTHER_LANG;
+                               break;
+                       case MSG_CMAS_EXERCISE:
+                               *value = MSG_TYPE_SMS_CMAS_EXERCISE;
+                               break;
+                       case MSG_CMAS_EXERCISE_OTHER_LANG:
+                               *value = MSG_TYPE_SMS_CMAS_EXERCISE_OTHER_LANG;
+                               break;
+                       case MSG_CMAS_OPERATOR_DEFINED:
+                               *value = MSG_TYPE_SMS_CMAS_OPERATOR_DEFINED;
+                               break;
+                       case MSG_CMAS_OPERATOR_DEFINED_OTHER_LANG:
+                               *value = MSG_TYPE_SMS_CMAS_OPERATOR_DEFINED_OTHER_LANG;
+                               break;
+                       case MSG_CMAS_PUBLIC_SAFETY:
+                               *value = MSG_TYPE_SMS_CMAS_PUBLIC_SAFETY;
+                               break;
+                       case MSG_CMAS_PUBLIC_SAFETY_OTHER_LANG:
+                               *value = MSG_TYPE_SMS_CMAS_PUBLIC_SAFETY_OTHER_LANG;
+                               break;
+                       case MSG_CMAS_STATE_LOCAL_TEST:
+                               *value = MSG_TYPE_SMS_CMAS_STATE_LOCAL_TEST;
+                               break;
+                       case MSG_CMAS_STATE_LOCAL_TEST_OTHER_LANG:
+                               *value = MSG_TYPE_SMS_CMAS_STATE_LOCAL_TEST_OTHER_LANG;
+                               break;
+                       default:
+                               *value = MSG_TYPE_SMS;
+                               break;
                        }
                } else if (msg_data->mainType == MSG_MMS_TYPE) {
                        if (msg_data->subType == MSG_NOTIFICATIONIND_MMS)
@@ -311,6 +344,9 @@ int msg_message_get_bool_value(void *data, int field, bool *value)
                        *value = false;
                break;
        }
+       case MSG_MESSAGE_DPM_RESTRICTED_BOOL:
+               *value = msg_data->bRestricted;
+               break;
        default:
                ret = MSG_ERR_INVALID_PARAMETER;
                break;
@@ -647,38 +683,71 @@ int msg_cb_message_get_int_value(void *data, int field, int *value)
 
        switch (field) {
        case MSG_CB_MSG_TYPE_INT: {
-                       switch (cb_msg->type) {
-                       case MSG_ETWS_SMS:
-                               *value = MSG_TYPE_SMS_ETWS_PRIMARY;
-                               break;
-                       case MSG_CB_SMS:
-                               *value = ((cb_msg->messageId & 0xFFF8) == 0x1100) ? MSG_TYPE_SMS_ETWS_SECONDARY : MSG_TYPE_SMS_CB;
-                               break;
-                       case MSG_CMAS_PRESIDENTIAL:
-                               *value = MSG_TYPE_SMS_CMAS_PRESIDENTIAL;
-                               break;
-                       case MSG_CMAS_EXTREME:
-                               *value = MSG_TYPE_SMS_CMAS_EXTREME;
-                               break;
-                       case MSG_CMAS_SEVERE:
-                               *value = MSG_TYPE_SMS_CMAS_SEVERE;
-                               break;
-                       case MSG_CMAS_AMBER:
-                               *value = MSG_TYPE_SMS_CMAS_AMBER;
-                               break;
-                       case MSG_CMAS_TEST:
-                               *value = MSG_TYPE_SMS_CMAS_TEST;
-                               break;
-                       case MSG_CMAS_EXERCISE:
-                               *value = MSG_TYPE_SMS_CMAS_EXERCISE;
-                               break;
-                       case MSG_CMAS_OPERATOR_DEFINED:
-                               *value = MSG_TYPE_SMS_CMAS_OPERATOR_DEFINED;
-                               break;
-                       default:
-                               ret = MSG_ERR_UNKNOWN;
-                       }
+               switch (cb_msg->type) {
+               case MSG_ETWS_SMS:
+                       *value = MSG_TYPE_SMS_ETWS_PRIMARY;
+                       break;
+               case MSG_CB_SMS:
+                       *value = ((cb_msg->messageId & 0xFFF8) == 0x1100) ? MSG_TYPE_SMS_ETWS_SECONDARY : MSG_TYPE_SMS_CB;
+                       break;
+               case MSG_CMAS_PRESIDENTIAL:
+                       *value = MSG_TYPE_SMS_CMAS_PRESIDENTIAL;
+                       break;
+               case MSG_CMAS_PRESIDENTIAL_OTHER_LANG:
+                       *value = MSG_TYPE_SMS_CMAS_PRESIDENTIAL_OTHER_LANG;
+                       break;
+               case MSG_CMAS_EXTREME:
+                       *value = MSG_TYPE_SMS_CMAS_EXTREME;
+                       break;
+               case MSG_CMAS_EXTREME_OTHER_LANG:
+                       *value = MSG_TYPE_SMS_CMAS_EXTREME_OTHER_LANG;
+                       break;
+               case MSG_CMAS_SEVERE:
+                       *value = MSG_TYPE_SMS_CMAS_SEVERE;
+                       break;
+               case MSG_CMAS_SEVERE_OTHER_LANG:
+                       *value = MSG_TYPE_SMS_CMAS_SEVERE_OTHER_LANG;
+                       break;
+               case MSG_CMAS_AMBER:
+                       *value = MSG_TYPE_SMS_CMAS_AMBER;
+                       break;
+               case MSG_CMAS_AMBER_OTHER_LANG:
+                       *value = MSG_TYPE_SMS_CMAS_AMBER_OTHER_LANG;
+                       break;
+               case MSG_CMAS_TEST:
+                       *value = MSG_TYPE_SMS_CMAS_TEST;
+                       break;
+               case MSG_CMAS_TEST_OTHER_LANG:
+                       *value = MSG_TYPE_SMS_CMAS_TEST_OTHER_LANG;
+                       break;
+               case MSG_CMAS_EXERCISE:
+                       *value = MSG_TYPE_SMS_CMAS_EXERCISE;
+                       break;
+               case MSG_CMAS_EXERCISE_OTHER_LANG:
+                       *value = MSG_TYPE_SMS_CMAS_EXERCISE_OTHER_LANG;
+                       break;
+               case MSG_CMAS_OPERATOR_DEFINED:
+                       *value = MSG_TYPE_SMS_CMAS_OPERATOR_DEFINED;
+                       break;
+               case MSG_CMAS_OPERATOR_DEFINED_OTHER_LANG:
+                       *value = MSG_TYPE_SMS_CMAS_OPERATOR_DEFINED_OTHER_LANG;
+                       break;
+               case MSG_CMAS_PUBLIC_SAFETY:
+                       *value = MSG_TYPE_SMS_CMAS_PUBLIC_SAFETY;
+                       break;
+               case MSG_CMAS_PUBLIC_SAFETY_OTHER_LANG:
+                       *value = MSG_TYPE_SMS_CMAS_PUBLIC_SAFETY_OTHER_LANG;
+                       break;
+               case MSG_CMAS_STATE_LOCAL_TEST:
+                       *value = MSG_TYPE_SMS_CMAS_STATE_LOCAL_TEST;
+                       break;
+               case MSG_CMAS_STATE_LOCAL_TEST_OTHER_LANG:
+                       *value = MSG_TYPE_SMS_CMAS_STATE_LOCAL_TEST_OTHER_LANG;
+                       break;
+               default:
+                       ret = MSG_ERR_UNKNOWN;
                }
+       }
                break;
        case MSG_CB_MSG_RECV_TIME_INT:
                *value = cb_msg->receivedTime;
@@ -698,6 +767,9 @@ int msg_cb_message_get_int_value(void *data, int field, int *value)
        case MSG_CB_MSG_ETWS_WARNING_TYPE_INT:
                *value = cb_msg->etwsWarningType;
                break;
+       case MSG_CB_MSG_INTERNAL_MSG_ID_INT:
+               *value = cb_msg->msgId;
+               break;
        default:
                ret = MSG_ERR_INVALID_PARAMETER;
                break;