mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 15:02:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

- update: remove obsolete define SQUASHFS

Browse Source
This commit is contained in:
vanhofen
2023-03-19 21:49:26 +01:00
committed by Thilo Graf
parent 7a4aaa04ae
commit d877f2cc6c
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/update.cpp
View File

@@ -59,8 +59,6 @@
#include <lib/libnet/libnet.h> #include <lib/libnet/libnet.h>
#define SQUASHFS
#include <curl/curl.h> #include <curl/curl.h>
#include <curl/easy.h> #include <curl/easy.h>
@@ -89,7 +87,6 @@ extern int allow_flash;
//#define DRYRUN //#define DRYRUN
//#define gTmpPath "/var/update/"
#define gTmpPath "/tmp/" #define gTmpPath "/tmp/"
#define gUserAgent "neutrino/softupdater 1.0" #define gUserAgent "neutrino/softupdater 1.0"
@@ -409,7 +406,6 @@ bool CFlashUpdate::checkVersion4Update()
{ {
char msg[400]; char msg[400];
CFlashVersionInfo *versionInfo; CFlashVersionInfo *versionInfo;
neutrino_locale_t msg_body;
dprintf(DEBUG_NORMAL, "[update] mode is %d\n", softupdate_mode); dprintf(DEBUG_NORMAL, "[update] mode is %d\n", softupdate_mode);
if (softupdate_mode == 1) // internet-update if (softupdate_mode == 1) // internet-update
{ {
@@ -426,10 +422,8 @@ bool CFlashUpdate::checkVersion4Update()
showGlobalStatus(20); showGlobalStatus(20);
hide(); hide();
msg_body = LOCALE_FLASHUPDATE_MSGBOX;
#ifdef SQUASHFS
versionInfo = new CFlashVersionInfo(newVersion); // Memory leak: versionInfo versionInfo = new CFlashVersionInfo(newVersion); // Memory leak: versionInfo
sprintf(msg, g_Locale->getText(msg_body), versionInfo->getType(true), versionInfo->getVersionString(), versionInfo->getDate(), versionInfo->getTime()); sprintf(msg, g_Locale->getText(LOCALE_FLASHUPDATE_MSGBOX), versionInfo->getType(true), versionInfo->getVersionString(), versionInfo->getDate(), versionInfo->getTime());
if (gotImage) if (gotImage)
{ {
@@ -451,7 +445,6 @@ bool CFlashUpdate::checkVersion4Update()
} }
delete versionInfo; delete versionInfo;
#endif
} }
else else
{ {