mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 19:01:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

netfs_setup: drop unused LUFS support

Browse Source 
Origin commit data
------------------
Commit: c653b264b3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- netfs_setup: drop unused LUFS support
This commit is contained in:
vanhofen
2017-09-12 22:30:35 +02:00
parent ad03e7a834
commit 5d79361a42
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/netfs_setup.cpp
View File

@@ -54,7 +54,6 @@ CNETFSMountGui::CNETFSMountGui()
// FIXME #warning move probing from exec() to fsmounter // FIXME #warning move probing from exec() to fsmounter
m_nfs_sup = CFSMounter::FS_UNPROBED; m_nfs_sup = CFSMounter::FS_UNPROBED;
m_cifs_sup = CFSMounter::FS_UNPROBED; m_cifs_sup = CFSMounter::FS_UNPROBED;
m_lufs_sup = CFSMounter::FS_UNPROBED;
width = 50; width = 50;
@@ -77,7 +76,6 @@ std::string CNETFSMountGui::getEntryString(int mt, int i)
switch(g_settings.netfs[mt][i].type) { switch(g_settings.netfs[mt][i].type) {
case CFSMounter::NFS: res = "NFS " + g_settings.netfs[mt][i].ip + ":"; break; case CFSMounter::NFS: res = "NFS " + g_settings.netfs[mt][i].ip + ":"; break;
case CFSMounter::CIFS: res = "CIFS //" + g_settings.netfs[mt][i].ip + "/"; break; case CFSMounter::CIFS: res = "CIFS //" + g_settings.netfs[mt][i].ip + "/"; break;
case CFSMounter::LUFS: res = "FTPS " + g_settings.netfs[mt][i].ip + "/"; break;
} }
if (g_settings.netfs[mt][i].dir.empty() || g_settings.netfs[mt][i].local_dir.empty()) if (g_settings.netfs[mt][i].dir.empty() || g_settings.netfs[mt][i].local_dir.empty())
return ""; return "";
@@ -362,10 +360,7 @@ int CNETFSMountGui::exec( CMenuTarget* parent, const std::string & actionKey )
if (m_cifs_sup == CFSMounter::FS_UNPROBED) if (m_cifs_sup == CFSMounter::FS_UNPROBED)
m_cifs_sup = CFSMounter::fsSupported(CFSMounter::CIFS); m_cifs_sup = CFSMounter::fsSupported(CFSMounter::CIFS);
if (m_lufs_sup == CFSMounter::FS_UNPROBED) printf("SUPPORT: NFS: %d, CIFS: %d\n", m_nfs_sup, m_cifs_sup);
m_lufs_sup = CFSMounter::fsSupported(CFSMounter::LUFS);
printf("SUPPORT: NFS: %d, CIFS: %d, LUFS: %d\n", m_nfs_sup, m_cifs_sup, m_lufs_sup);
if (actionKey.empty() || actionKey.substr(0,4)=="menu") if (actionKey.empty() || actionKey.substr(0,4)=="menu")
{ {
@@ -550,8 +545,7 @@ int CNETFSMountGui::menu(int mt)
const CMenuOptionChooser::keyval NFS_TYPE_OPTIONS[] = const CMenuOptionChooser::keyval NFS_TYPE_OPTIONS[] =
{ {
{ CFSMounter::NFS , LOCALE_NFS_TYPE_NFS }, { CFSMounter::NFS , LOCALE_NFS_TYPE_NFS },
{ CFSMounter::CIFS, LOCALE_NFS_TYPE_CIFS } /*, { CFSMounter::CIFS, LOCALE_NFS_TYPE_CIFS }
{ CFSMounter::LUFS, LOCALE_NFS_TYPE_LUFS } */
}; };
#define NFS_TYPE_OPTION_COUNT (sizeof(NFS_TYPE_OPTIONS)/sizeof(CMenuOptionChooser::keyval)) #define NFS_TYPE_OPTION_COUNT (sizeof(NFS_TYPE_OPTIONS)/sizeof(CMenuOptionChooser::keyval))

1
src/gui/netfs_setup.h
View File

@@ -44,7 +44,6 @@ class CNETFSMountGui : public CMenuTarget
CFSMounter::FS_Support m_nfs_sup; CFSMounter::FS_Support m_nfs_sup;
CFSMounter::FS_Support m_cifs_sup; CFSMounter::FS_Support m_cifs_sup;
CFSMounter::FS_Support m_lufs_sup;
int vinit(int mt); int vinit(int mt);
std::string checkVarPath(const std::string &file); /// returns path for persistent var partitions std::string checkVarPath(const std::string &file); /// returns path for persistent var partitions