mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-27 23:42:51 +02:00
helpers: improve my_system function
Instead of hardcoding the maximum number of arguments to the
my_system helper, pass a variable argument list.
The function is deliberately source-incompatible with the old
implementation (as opposed to a variant with a sentinel NULL
argument, which would be compatible) to find all users and to
make sure that new future users of this function are not
overlooked during merges with other branches.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 96650cdd45
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -468,7 +468,7 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK
|
||||
return true;
|
||||
|
||||
if(delete_all) {
|
||||
my_system("/bin/sh", "-c", "rm -f /var/tuxbox/config/zapit/*.conf");
|
||||
my_system(3, "/bin/sh", "-c", "rm -f /var/tuxbox/config/zapit/*.conf");
|
||||
CServiceManager::getInstance()->SatelliteList().clear();
|
||||
CZapit::getInstance()->LoadSettings();
|
||||
CZapit::getInstance()->GetConfig(zapitCfg);
|
||||
@@ -488,7 +488,7 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK
|
||||
CFrameBuffer::getInstance()->Clear();
|
||||
}
|
||||
if(delete_chan) {
|
||||
my_system("/bin/sh", "-c", "rm -f /var/tuxbox/config/zapit/*.xml");
|
||||
my_system(3, "/bin/sh", "-c", "rm -f /var/tuxbox/config/zapit/*.xml");
|
||||
g_Zapit->reinitChannels();
|
||||
}
|
||||
return ret;
|
||||
|
Reference in New Issue
Block a user