openharmony/miscservices_request
1
0
Fork 0
mirror of https://github.com/openharmony/miscservices_request.git synced 2026-07-20 22:58:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

!41 系统组件支持64位

Browse Source 
Merge pull request !41 from zhangfanfan2/master
This commit is contained in:
openharmony_ci
2022-04-07 03:57:22 +00:00
committed by Gitee
parent 8c7ec78a49 921293b9f1
commit 0fc3879440
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
download/ability/src/download_database.cpp
+2 -2
View File
@@ -103,7 +103,7 @@ int64_t DownloadDataBase::Insert(OHOS::NativeRdb::ValuesBucket insertValues)
}
int ret = store_->Insert(outRowId, TABLE_NAME, insertValues);
DOWNLOAD_HILOGI("DownloadDataBase Insert id = %{public}lld ", outRowId);
DOWNLOAD_HILOGI("DownloadDataBase Insert id = %{public}lld ", (long long)outRowId);
if (ret != OHOS::NativeRdb::E_OK) {
DOWNLOAD_HILOGE("DownloadDataBase Insert ret :%{public}d", ret);
return RDB_EXECUTE_FAIL;
@@ -193,4 +193,4 @@ int SqliteOpenHelperDownloadCallback::OnDowngrade(OHOS::NativeRdb::RdbStore &sto
{
return OHOS::NativeRdb::E_OK;
}
} // namespace OHOS::Request::Download
} // namespace OHOS::Request::Download
upload/frameworks/libs/src/curl_adp.cpp
+9 -7
View File
@@ -114,7 +114,7 @@ bool CUrlAdp::MultiAddHandle(CURLM *curlMulti, std::vector<CURL*>& curlArray)
FailNotify(UPLOAD_ERRORCODE_UPLOAD_LIB_ERROR);
return false;
}
UPLOAD_HILOGD(UPLOAD_MODULE_FRAMEWORK, "fileInfo.st_size %{public}lld", fileInfo.st_size);
UPLOAD_HILOGD(UPLOAD_MODULE_FRAMEWORK, "fileInfo.st_size %{public}lld", (long long)fileInfo.st_size);
CURL *curl = curl_easy_init();
if (curl == nullptr) {
FailNotify(UPLOAD_ERRORCODE_UPLOAD_LIB_ERROR);
@@ -251,7 +251,7 @@ int CUrlAdp::ProgressCallback(void *clientp, curl_off_t dltotal, curl_off_t dlno
UPLOAD_HILOGD(UPLOAD_MODULE_FRAMEWORK, "===>ProgressCallback thread id is %{public}lu", pthread_self());
FileData *fData = (FileData *) clientp;
CUrlAdp *url = (CUrlAdp *) fData->adp;
UPLOAD_HILOGD(UPLOAD_MODULE_FRAMEWORK, "===>ProgressCallback ulnow is %{public}lld", ulnow);
UPLOAD_HILOGD(UPLOAD_MODULE_FRAMEWORK, "===>ProgressCallback ulnow is %{public}lld", (long long)ulnow);
fData->upsize = ulnow;
int64_t totalulnow = 0;
if (url && url->uploadTask_) {
@@ -261,9 +261,11 @@ int CUrlAdp::ProgressCallback(void *clientp, curl_off_t dltotal, curl_off_t dlno
vmem.upsize = fData->upsize;
}
totalulnow += vmem.upsize;
UPLOAD_HILOGD(UPLOAD_MODULE_FRAMEWORK, "===>ProgressCallback vmem.upsize is %{public}lld", vmem.upsize);
UPLOAD_HILOGD(UPLOAD_MODULE_FRAMEWORK, "===>ProgressCallback vmem.upsize is %{public}lld",
(long long)vmem.upsize);
}
UPLOAD_HILOGD(UPLOAD_MODULE_FRAMEWORK, "===>ProgressCallback totalulnow is %{public}lld", totalulnow);
UPLOAD_HILOGD(UPLOAD_MODULE_FRAMEWORK, "===>ProgressCallback totalulnow is %{public}lld",
(long long)totalulnow);
url->uploadTask_->OnProgress(dltotal, dlnow, ultotal, totalulnow);
}
return 0;
@@ -271,7 +273,7 @@ int CUrlAdp::ProgressCallback(void *clientp, curl_off_t dltotal, curl_off_t dlno
size_t CUrlAdp::HeaderCallback(char *buffer, size_t size, size_t nitems, void *userdata)
{
UPLOAD_HILOGD(UPLOAD_MODULE_FRAMEWORK, "size is %{public}u, nitems is %{public}u", size, nitems);
UPLOAD_HILOGD(UPLOAD_MODULE_FRAMEWORK, "size is %{public}zu, nitems is %{public}zu", size, nitems);
CUrlAdp* url = (CUrlAdp*) userdata;
if (url && url->uploadTask_) {
url->uploadTask_->OnHeaderReceive(buffer, size, nitems);
@@ -281,7 +283,7 @@ size_t CUrlAdp::HeaderCallback(char *buffer, size_t size, size_t nitems, void *u
size_t CUrlAdp::ReadCallback(char *buffer, size_t size, size_t nitems, void *arg)
{
UPLOAD_HILOGD(UPLOAD_MODULE_FRAMEWORK, "size is %{public}u, nitems is %{public}u.", size, nitems);
UPLOAD_HILOGD(UPLOAD_MODULE_FRAMEWORK, "size is %{public}zu, nitems is %{public}zu.", size, nitems);
FileData *read = (FileData *) arg;
CUrlAdp *adp = (CUrlAdp *) read->adp;
if (adp == nullptr) {
@@ -347,4 +349,4 @@ void CUrlAdp::StopTimer()
ret = MiscServices::TimeServiceClient::GetInstance()->DestroyTimer(timerId_);
return;
}
} // namespace OHOS::Request::Upload
} // namespace OHOS::Request::Upload
upload/interfaces/kits/napi/src/progress_callback.cpp
+2 -2
View File
@@ -49,7 +49,7 @@ void ProgressCallback::CheckQueueWorkRet(int ret, ProgressWorker *progressWorker
void ProgressCallback::Progress(const int64_t uploadedSize, const int64_t totalSize)
{
UPLOAD_HILOGD(UPLOAD_MODULE_JS_NAPI,
"Progress. uploadedSize : %lld, totalSize : %lld", uploadedSize, totalSize);
"Progress. uploadedSize : %lld, totalSize : %lld", (long long)uploadedSize, (long long)totalSize);
ProgressWorker *progressWorker = new ProgressWorker(this, uploadedSize, totalSize);
uv_work_t *work = new uv_work_t;
work->data = progressWorker;
@@ -94,4 +94,4 @@ EXIT_CODE :
});
CheckQueueWorkRet(ret, progressWorker, work);
}
} // end of OHOS::Request::Upload
} // end of OHOS::Request::Upload