mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 09:51:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

setting_helpers: reduce dub code parts

Browse Source 
Note: This line: 'TARGET_PREFIX "/share/zoneinfo/" + zone' will be
found in other source files too. It could make
sense to unify it globally to avoid duplicating code.
This commit is contained in:
Thilo Graf
2023-04-25 15:43:10 +02:00
parent 75f693d988
commit 6aded31eb3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/system/setting_helpers.cpp
View File

@@ -60,7 +60,7 @@
#include <driver/display.h> #include <driver/display.h>
#include <driver/volume.h> #include <driver/volume.h>
#include <system/helpers.h> #include <system/helpers.h>
#include <system/debug.h>
#include <gui/widget/msgbox.h> #include <gui/widget/msgbox.h>
#include <gui/widget/hintbox.h> #include <gui/widget/hintbox.h>
@@ -581,6 +581,7 @@ bool CTZChangeNotifier::changeNotify(const neutrino_locale_t, void *Data)
bool found = false; bool found = false;
std::string name, zone; std::string name, zone;
printf("CTZChangeNotifier::changeNotify: %s\n", (char *) Data); printf("CTZChangeNotifier::changeNotify: %s\n", (char *) Data);
std::string zoneinfo = TARGET_PREFIX "/share/zoneinfo/" + zone;
xmlDocPtr parser = parseXmlFile("/etc/timezone.xml"); xmlDocPtr parser = parseXmlFile("/etc/timezone.xml");
if (parser != NULL) if (parser != NULL)
@@ -600,8 +601,10 @@ bool CTZChangeNotifier::changeNotify(const neutrino_locale_t, void *Data)
const char *zptr = xmlGetAttribute(search, "zone"); const char *zptr = xmlGetAttribute(search, "zone");
if (zptr) if (zptr)
zone = zptr; zone = zptr;
if (!access(TARGET_PREFIX "/share/zoneinfo/" + zone, R_OK)) if (!access(zoneinfo.c_str(), R_OK))
found = true; found = true;
else
dprintf(DEBUG_NORMAL, "[CTZChangeNotifier] [%s - %d] %s not found\n", __func__, __LINE__, zoneinfo.c_str());
break; break;
} }
} }
@@ -612,7 +615,7 @@ bool CTZChangeNotifier::changeNotify(const neutrino_locale_t, void *Data)
if (found) if (found)
{ {
printf("Timezone: %s -> %s\n", name.c_str(), zone.c_str()); printf("Timezone: %s -> %s\n", name.c_str(), zone.c_str());
std::string cmd = TARGET_PREFIX "/share/zoneinfo/" + zone; std::string cmd = zoneinfo;
printf("symlink %s to /etc/localtime\n", cmd.c_str()); printf("symlink %s to /etc/localtime\n", cmd.c_str());
if (unlink("/etc/localtime")) if (unlink("/etc/localtime"))
perror("unlink failed"); perror("unlink failed");