diff --git a/src/appmanagerwidget.cpp b/src/appmanagerwidget.cpp index 021046eafa0222e0aaf83f6b75d513a3f2b13bea..5c4cfac0e827b1caddc8a2f89bd4599449d5eed2 100644 --- a/src/appmanagerwidget.cpp +++ b/src/appmanagerwidget.cpp @@ -518,7 +518,8 @@ void AppManagerWidget::showAppInfo(const AppInfo &info) } // 根据版本找到候选包中对应的包大小和下载地址 - if (m_showingAppInfo.installedPkgInfo.version == srvPkgInfo.version) { + if (m_showingAppInfo.installedPkgInfo.version == srvPkgInfo.version + && m_showingAppInfo.installedPkgInfo.arch == srvPkgInfo.arch) { m_showingAppInfo.installedPkgInfo.pkgSize = srvPkgInfo.pkgSize; m_showingAppInfo.installedPkgInfo.downloadUrl = srvPkgInfo.downloadUrl; } diff --git a/src/job/appmanagerjob.cpp b/src/job/appmanagerjob.cpp index 1d49e59275909757a51a5239743eac7046fac666..b7f1c9b4799cf37faff5b945ecc784765dcb0197 100644 --- a/src/job/appmanagerjob.cpp +++ b/src/job/appmanagerjob.cpp @@ -15,28 +15,6 @@ #include #include // async I/O -int zlibCompress(char *dest, int &destLen, - char *source, int sourceLen) -{ - unsigned char *dest1 = reinterpret_cast(dest); - unsigned long destLen1 = static_cast(destLen); - unsigned char *source1 = reinterpret_cast(source); - unsigned long sourceLen1 = static_cast(sourceLen); - - return (compress(dest1, &destLen1, source1, sourceLen1)); -} - -int zlibUncompress(char *dest, int &destLen, - char *source, int sourceLen) -{ - unsigned char *dest1 = reinterpret_cast(dest); - unsigned long destLen1 = static_cast(destLen); - unsigned char *source1 = reinterpret_cast(source); - unsigned long sourceLen1 = static_cast(sourceLen); - - return (uncompress(dest1, &destLen1, source1, sourceLen1)); -} - enum ComPressError { Ok = 0, Fail = -1