From: sinikang Date: Wed, 9 May 2018 08:00:09 +0000 (+0900) Subject: Change the variable name X-Git-Tag: submit/tizen/20180510.015209^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dbc9b2fb9b5bee5ce3a4043888c98b3e4463889f;p=platform%2Fcore%2Ftelephony%2Ftel-plugin-atmodem.git Change the variable name according to the change of https://review.tizen.org/gerrit/#/c/168181/ should change the varable name to 'ss_class' Change-Id: I1d615d8c9905eb3c620b11208e27d42d17347c38 --- diff --git a/packaging/tel-plugin-atmodem.spec b/packaging/tel-plugin-atmodem.spec index 85aeb12..6aa82db 100644 --- a/packaging/tel-plugin-atmodem.spec +++ b/packaging/tel-plugin-atmodem.spec @@ -1,6 +1,6 @@ %define major 0 %define minor 1 -%define patchlevel 78 +%define patchlevel 79 Name: tel-plugin-atmodem Version: %{major}.%{minor}.%{patchlevel} diff --git a/src/s_ss.c b/src/s_ss.c index 9551e41..b84b86e 100644 --- a/src/s_ss.c +++ b/src/s_ss.c @@ -472,7 +472,7 @@ static void on_response_atmodem_ss_set_barring(TcorePending *p, req = tcore_user_request_ref_data(ur, NULL); resp.record_num = 1; resp.record = g_malloc0(sizeof(struct barring_info) * resp.record_num); - resp.record[0].class = req->class; + resp.record[0].ss_class = req->ss_class; resp.record[0].mode = req->mode; if (cb_data->opco == TIZEN_SS_OPCO_ACTIVATE) resp.record[0].status = SS_STATUS_ACTIVATE; @@ -561,11 +561,11 @@ static void on_response_atmodem_ss_get_barring_status(TcorePending *p, classx_str = g_slist_nth_data(tokens, 1); if (!classx_str) { - dbg("Class error. Setting to the requested class: [%d]", req_buf->class); - resp.record[valid_records].class = req_buf->class; + dbg("Class error. Setting to the requested class: [%d]", req_buf->ss_class); + resp.record[valid_records].ss_class = req_buf->ss_class; } else { if (__atmodem_ss_convert_modem_class_to_class(atoi(classx_str), - &(resp.record[valid_records].class)) == FALSE) { + &(resp.record[valid_records].ss_class)) == FALSE) { tcore_at_tok_free(tokens); continue; } @@ -653,7 +653,7 @@ static void on_response_atmodem_ss_set_forwarding(TcorePending *p, resp.record[0].status = SS_STATUS_ACTIVATE; else resp.record[0].status = SS_STATUS_DEACTIVATE; - resp.record[0].class = req->class; + resp.record[0].ss_class = req->ss_class; resp.record[0].mode = req->mode; if (strlen(req->number)) { g_strlcpy(resp.record[0].number, req->number, MAX_SS_FORWARDING_NUMBER_LEN); @@ -747,11 +747,11 @@ static void on_response_atmodem_ss_get_forwarding_status(TcorePending *p, classx_str = g_slist_nth_data(tokens, 1); if (!classx_str) { - dbg("Class error. Setting to the requested class: [%d]", req_buf->class); - resp.record[valid_records].class = req_buf->class; + dbg("Class error. Setting to the requested class: [%d]", req_buf->ss_class); + resp.record[valid_records].ss_class = req_buf->ss_class; } else { if (__atmodem_ss_convert_modem_class_to_class(atoi(classx_str), - &(resp.record[valid_records].class)) == FALSE) { + &(resp.record[valid_records].ss_class)) == FALSE) { tcore_at_tok_free(tokens); continue; } @@ -810,7 +810,7 @@ static void on_response_atmodem_ss_set_waiting(TcorePending *p, req = tcore_user_request_ref_data(ur, NULL); resp.record_num = 1; resp.record = g_malloc0(sizeof(struct waiting_info) * resp.record_num); - resp.record[0].class = req->class; + resp.record[0].ss_class = req->ss_class; if (cb_data->opco == TIZEN_SS_OPCO_ACTIVATE) resp.record[0].status = SS_STATUS_ACTIVATE; else @@ -900,11 +900,11 @@ static void on_response_atmodem_ss_get_waiting_status(TcorePending *p, classx_str = g_slist_nth_data(tokens, 1); if (!classx_str) { - dbg("Class error. Setting to the requested class: [%d]", req_buf->class); - waiting_resp.record[valid_records].class = req_buf->class; + dbg("Class error. Setting to the requested class: [%d]", req_buf->ss_class); + waiting_resp.record[valid_records].ss_class = req_buf->ss_class; } else { if (__atmodem_ss_convert_modem_class_to_class(atoi(classx_str), - &(waiting_resp.record[valid_records].class)) == FALSE) { + &(waiting_resp.record[valid_records].ss_class)) == FALSE) { tcore_at_tok_free(tokens); continue; } @@ -1053,7 +1053,7 @@ static TReturn _ss_barring_set(CoreObject *o, UserRequest *ur, enum telephony_ss return ret; } - classx = __atmodem_ss_convert_class_to_atmodem_class(barring_info->class); + classx = __atmodem_ss_convert_class_to_atmodem_class(barring_info->ss_class); memcpy(password, barring_info->password, MAX_SS_BARRING_PASSWORD_LEN); password[MAX_SS_BARRING_PASSWORD_LEN] = '\0'; @@ -1172,7 +1172,7 @@ static TReturn s_ss_barring_get_status(CoreObject *o, UserRequest *ur) struct treq_ss_barring *barring_info = 0; barring_info = (struct treq_ss_barring *)tcore_user_request_ref_data(ur, 0); - return _ss_barring_get(o, ur, barring_info->class, SS_BARR_MODE_BOIC); + return _ss_barring_get(o, ur, barring_info->ss_class, SS_BARR_MODE_BOIC); } static TReturn _ss_forwarding_set(CoreObject *o, UserRequest *ur, enum telephony_ss_opcode op) @@ -1191,7 +1191,7 @@ static TReturn _ss_forwarding_set(CoreObject *o, UserRequest *ur, enum telephony forwarding_info = (struct treq_ss_forwarding *)tcore_user_request_ref_data(ur, 0); - classx = __atmodem_ss_convert_class_to_atmodem_class(forwarding_info->class); + classx = __atmodem_ss_convert_class_to_atmodem_class(forwarding_info->ss_class); if (__atmodem_ss_convert_forwarding_opcode_to_modem_mode( op, &mode) == FALSE) { err("Invalid arguments"); @@ -1308,7 +1308,7 @@ static TReturn s_ss_forwarding_get_status(CoreObject *o, UserRequest *ur) struct treq_ss_forwarding *forwarding_info = 0; forwarding_info = (struct treq_ss_forwarding *)tcore_user_request_ref_data(ur, 0); - return _ss_forwarding_get(o, ur, forwarding_info->class, forwarding_info->mode); + return _ss_forwarding_get(o, ur, forwarding_info->ss_class, forwarding_info->mode); } static TReturn _ss_waiting_set(CoreObject *o, UserRequest *ur, enum telephony_ss_opcode opco) @@ -1329,7 +1329,7 @@ static TReturn _ss_waiting_set(CoreObject *o, UserRequest *ur, enum telephony_ss else mode = 0; - classx = __atmodem_ss_convert_class_to_atmodem_class(waiting_info->class); + classx = __atmodem_ss_convert_class_to_atmodem_class(waiting_info->ss_class); dbg("mode: [%d], class: [%d]", mode, classx); at_cmd = g_strdup_printf("AT+CCWA=1, %d, %d", mode, classx); @@ -1398,7 +1398,7 @@ static TReturn s_ss_waiting_get_status(CoreObject *o, UserRequest *ur) struct treq_ss_waiting *waiting = 0; waiting = (struct treq_ss_waiting *)tcore_user_request_ref_data(ur, 0); - return _ss_waiting_get(o, ur, waiting->class); + return _ss_waiting_get(o, ur, waiting->ss_class); } #ifdef EMUL_SUPPORTED