openharmony/telephony_core_service
1
0
Fork 0
mirror of https://gitee.com/openharmony/telephony_core_service synced 2024-11-26 17:50:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!10 Support 64-bit compile

Browse Source 
Merge pull request !10 from frank_bing/master
This commit is contained in:
openharmony_ci 2021-08-16 08:25:34 +00:00 committed by Gitee
commit 387f476e74
10 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
interfaces/innerkits/state_registry/proxy/telephony_state_registry_proxy.cpp
View File

@ -102,7 +102,7 @@ int32_t TelephonyStateRegistryProxy::UpdateSignalInfo(
result = TELEPHONY_FAIL;
return result;
}
printf("TelephonyStateRegistryProxy::UpdateSignalInfo##vec.size = %d\n", vec.size());
printf("TelephonyStateRegistryProxy::UpdateSignalInfo##vec.size = %zu\n", vec.size());
if (!in.WriteInt32(static_cast<int32_t>(vec.size()))) {
result = TELEPHONY_FAIL;
return result;
@ -221,4 +221,4 @@ int32_t TelephonyStateRegistryProxy::UnregisterStateChange(int32_t simId, uint32
return result;
}
} // namespace TelephonyState
} // namespace OHOS
} // namespace OHOS

2
interfaces/kits/js/napi/network_search/src/napi_radio.cpp
View File

@ -231,7 +231,7 @@ static int32_t WrapNetworkType(SignalInformation::NetworkType type)
static bool InitAsyncContext(
const napi_env env, const size_t parameterCount, const napi_value parameters[], AsyncContext &asyncContext)
{
HiLog::Error(LABEL, "InitAsyncContext parameterCount=%{public}d", parameterCount);
HiLog::Error(LABEL, "InitAsyncContext parameterCount=%{public}zu", parameterCount);
if (parameterCount == TelephonyNapi::NONE_PARAMTER) {
asyncContext.slotId = GetDefaultSlotId();
return true;

2
network_search/src/network_search_notify.cpp
View File

@ -83,7 +83,7 @@ void NetworkSearchNotify::NotifyNetworkStateUpdated(const sptr<NetworkState> &ne
void NetworkSearchNotify::NotifySignalInfoUpdated(const std::vector<sptr<SignalInformation>> &signalInfos)
{
HILOG_INFO("NotifySignalInfoUpdated~~~ signalInfos.size=%{public}d\n", signalInfos.size());
HILOG_INFO("NotifySignalInfoUpdated~~~ signalInfos.size=%{public}zu\n", signalInfos.size());
if (telephonyStateNotify_ != nullptr) {
int32_t result = telephonyStateNotify_->UpdateSignalInfo(0, 0, signalInfos);

2
services/src/phone_manager.cpp
View File

@ -47,7 +47,7 @@ int32_t PhoneManager ::Init()
void PhoneManager ::ReleasePhone()
{
TELEPHONY_INFO_LOG("PhoneManager ReleasePhone phone_.size():%{public}d", phone_.size());
TELEPHONY_INFO_LOG("PhoneManager ReleasePhone phone_.size():%{public}zu", phone_.size());
if (phone_.size() != 0) {
phone_.clear();
}

2
tel_ril/src/tel_ril_call.cpp
View File

@ -55,7 +55,7 @@ bool TelRilCall::IsCallRespOrNotify(uint32_t code)
void TelRilCall::ProcessCallRespOrNotify(uint32_t code, OHOS::MessageParcel &data)
{
TELEPHONY_INFO_LOG(
"TelRilCall ProcessCallResponse code:%{public}d, GetDataSize:%{public}d", code, data.GetDataSize());
"TelRilCall ProcessCallResponse code:%{public}u, GetDataSize:%{public}zu", code, data.GetDataSize());
auto itFunc = memberFuncMap_.find(code);
if (itFunc != memberFuncMap_.end()) {
auto memberFunc = itFunc->second;

2
tel_ril/src/tel_ril_data.cpp
View File

@ -50,7 +50,7 @@ bool TelRilData::IsDataRespOrNotify(uint32_t code)
void TelRilData::ProcessDataRespOrNotify(uint32_t code, OHOS::MessageParcel &data)
{
TELEPHONY_INFO_LOG(
"TelRilData ProcessDataRespOrNotify code:%{public}d, GetDataSize:%{public}d", code, data.GetDataSize());
"TelRilData ProcessDataRespOrNotify code:%{public}u, GetDataSize:%{public}zu", code, data.GetDataSize());
auto itFunc = memberFuncMap_.find(code);
if (itFunc != memberFuncMap_.end()) {
auto memberFunc = itFunc->second;

2
tel_ril/src/tel_ril_modem.cpp
View File

@ -37,7 +37,7 @@ bool TelRilModem::IsCommonRespOrNotify(uint32_t code)
void TelRilModem::ProcessCommonRespOrNotify(uint32_t code, OHOS::MessageParcel &data)
{
TELEPHONY_INFO_LOG(
"TelRilModem ProcessCommonRespOrNotify code:%{public}d, GetDataSize:%{public}d", code, data.GetDataSize());
"TelRilModem ProcessCommonRespOrNotify code:%{public}u, GetDataSize:%{public}zu", code, data.GetDataSize());
auto itFunc = memberFuncMap_.find(code);
if (itFunc != memberFuncMap_.end()) {
auto memberFunc = itFunc->second;

4
tel_ril/src/tel_ril_network.cpp
View File

@ -60,7 +60,7 @@ bool TelRilNetwork::IsNetworkRespOrNotify(uint32_t code)
void TelRilNetwork::ProcessNetworkRespOrNotify(uint32_t code, OHOS::MessageParcel &data)
{
TELEPHONY_INFO_LOG("TelRilNetwork ProcessNetworkRespOrNotify code:%{public}d, GetDataSize:%{public}d", code,
TELEPHONY_INFO_LOG("TelRilNetwork ProcessNetworkRespOrNotify code:%{public}u, GetDataSize:%{public}zu", code,
data.GetDataSize());
auto itFunc = memberFuncMap_.find(code);
if (itFunc != memberFuncMap_.end()) {
@ -238,7 +238,7 @@ void TelRilNetwork::GetCsRegStatusResponse(OHOS::MessageParcel &data)
}
csRegStatusInfo->ReadFromParcel(data);
TELEPHONY_DEBUG_LOG(
"ReadIccFileResponse --> csRegStatusInfo.size:%{public}d,"
"ReadIccFileResponse --> csRegStatusInfo.size:%{public}zu,"
" csRegStatusInfo->regStatus:%{public}d, csRegStatusInfo->radioTechnology:%{public}d",
sizeof(csRegStatusInfo), csRegStatusInfo->regStatus, csRegStatusInfo->radioTechnology);
const size_t readSpSize = sizeof(struct HRilRadioResponseInfo);

2
tel_ril/src/tel_ril_sim.cpp
View File

@ -51,7 +51,7 @@ bool TelRilSim::IsSimRespOrNotify(uint32_t code)
void TelRilSim::ProcessSimRespOrNotify(uint32_t code, OHOS::MessageParcel &data)
{
TELEPHONY_INFO_LOG(
"TelRilSim ProcessSimRespOrNotify code:%{public}d, GetDataSize:%{public}d", code, data.GetDataSize());
"TelRilSim ProcessSimRespOrNotify code:%{public}u, GetDataSize:%{public}zu", code, data.GetDataSize());
auto itFunc = memberFuncMap_.find(code);
if (itFunc != memberFuncMap_.end()) {
auto memberFunc = itFunc->second;

8
tel_ril/src/tel_ril_sms.cpp
View File

@ -12,6 +12,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <inttypes.h>
#include "tel_ril_sms.h"
#include "hdf_death_recipient.h"
#include "hril_modem_parcel.h"
@ -54,7 +56,7 @@ bool TelRilSms::IsSmsRespOrNotify(uint32_t code)
void TelRilSms::ProcessSmsRespOrNotify(uint32_t code, OHOS::MessageParcel &data)
{
TELEPHONY_INFO_LOG(
"TelRilSms ProcessSmsRespOrNotify code:%{public}d, GetDataSize:%{public}d", code, data.GetDataSize());
"TelRilSms ProcessSmsRespOrNotify code:%{public}u, GetDataSize:%{public}zu", code, data.GetDataSize());
auto itFunc = memberFuncMap_.find(code);
if (itFunc != memberFuncMap_.end()) {
auto memberFunc = itFunc->second;
@ -149,7 +151,7 @@ void TelRilSms::NewSmsNotify(OHOS::MessageParcel &data)
smsMessage->ReadFromParcel(data);
int32_t indicationType = smsMessage->indicationType;
RilProcessIndication(indicationType);
TELEPHONY_DEBUG_LOG("NewSmsNotify indicationType:%{public}d, size:%{public}d, PDU size:%{public}d",
TELEPHONY_DEBUG_LOG("NewSmsNotify indicationType:%{public}d, size:%{public}d, PDU size:%{public}zu",
indicationType, smsMessage->size, smsMessage->pdu.size());
if (observerHandler_ != nullptr) {
observerHandler_->NotifyObserver(ObserverHandler::RADIO_GSM_SMS, smsMessage);
@ -220,7 +222,7 @@ void TelRilSms::SendSmsResponse(OHOS::MessageParcel &data)
if (radioResponseInfo->error == HRilErrType::NONE) {
TELEPHONY_DEBUG_LOG("SendSmsResponse GetParam start");
sendSmsResultInfo->flag = telRilRequest->pointer_->GetParam();
TELEPHONY_DEBUG_LOG("SendSmsResponse flag:%{public}lld", telRilRequest->pointer_->GetParam());
TELEPHONY_DEBUG_LOG("SendSmsResponse flag:%{public}" PRIu64 "", telRilRequest->pointer_->GetParam());
std::shared_ptr<OHOS::AppExecFwk::EventHandler> handler = telRilRequest->pointer_->GetOwner();
if (handler == nullptr) {
TELEPHONY_ERR_LOG("ERROR : SendSmsResponse --> handler == nullptr !!!");