mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 23:42:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

setting_helpers: whitespace cleanup and code format changes

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 30a3093d9f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-30 (Mon, 30 May 2016)

Origin message was:
------------------
- setting_helpers: whitespace cleanup and code format changes

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-05-30 11:21:22 +02:00
parent 7764d30ea3
commit 9ebf5261fa
2 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/system/setting_helpers.cpp
View File

@@ -401,7 +401,7 @@ long CNetAdapter::mac_addr_sys ( u_char *addr) //only for function getMacAddr()
int s, i; int s, i;
int ok = 0; int ok = 0;
s = socket(AF_INET, SOCK_DGRAM, 0); s = socket(AF_INET, SOCK_DGRAM, 0);
if (s==-1) if (s==-1)
{ {
return -1; return -1;
} }
@@ -413,11 +413,11 @@ long CNetAdapter::mac_addr_sys ( u_char *addr) //only for function getMacAddr()
for (i = ifc.ifc_len / sizeof(struct ifreq); --i >= 0; IFR++) for (i = ifc.ifc_len / sizeof(struct ifreq); --i >= 0; IFR++)
{ {
strcpy(ifr.ifr_name, IFR->ifr_name); strcpy(ifr.ifr_name, IFR->ifr_name);
if (ioctl(s, SIOCGIFFLAGS, &ifr) == 0) if (ioctl(s, SIOCGIFFLAGS, &ifr) == 0)
{ {
if (! (ifr.ifr_flags & IFF_LOOPBACK)) if (! (ifr.ifr_flags & IFF_LOOPBACK))
{ {
if (ioctl(s, SIOCGIFHWADDR, &ifr) == 0) if (ioctl(s, SIOCGIFHWADDR, &ifr) == 0)
{ {
ok = 1; ok = 1;
break; break;

35
src/system/setting_helpers.h
View File

@@ -69,19 +69,16 @@ class COnOffNotifier : public CChangeObserver
class CSectionsdConfigNotifier : public CChangeObserver class CSectionsdConfigNotifier : public CChangeObserver
{ {
public: public:
bool changeNotify(const neutrino_locale_t, void * ); bool changeNotify(const neutrino_locale_t, void * );
}; };
class CTouchFileNotifier : public CChangeObserver class CTouchFileNotifier : public CChangeObserver
{ {
const char * filename; const char * filename;
public: public:
inline CTouchFileNotifier(const char * file_to_modify) inline CTouchFileNotifier(const char * _filename) { filename = _filename; };
{ bool changeNotify(const neutrino_locale_t, void * data);
filename = file_to_modify;
};
bool changeNotify(const neutrino_locale_t, void * data);
}; };
class CColorSetupNotifier : public CChangeObserver class CColorSetupNotifier : public CChangeObserver
@@ -123,33 +120,33 @@ class CMoviePluginChangeExec : public CMenuTarget
class CTZChangeNotifier : public CChangeObserver class CTZChangeNotifier : public CChangeObserver
{ {
public: public:
bool changeNotify(const neutrino_locale_t, void * data); bool changeNotify(const neutrino_locale_t, void * data);
}; };
class CDataResetNotifier : public CMenuTarget class CDataResetNotifier : public CMenuTarget
{ {
public: public:
int exec(CMenuTarget* parent, const std::string& actionKey); int exec(CMenuTarget* parent, const std::string& actionKey);
}; };
class CFanControlNotifier : public CChangeObserver class CFanControlNotifier : public CChangeObserver
{ {
public: public:
bool changeNotify(const neutrino_locale_t, void * data); bool changeNotify(const neutrino_locale_t, void * data);
static void setSpeed(unsigned int speed); static void setSpeed(unsigned int speed);
}; };
class CCpuFreqNotifier : public CChangeObserver class CCpuFreqNotifier : public CChangeObserver
{ {
public: public:
bool changeNotify(const neutrino_locale_t, void * data); bool changeNotify(const neutrino_locale_t, void * data);
}; };
class CAutoModeNotifier : public CChangeObserver class CAutoModeNotifier : public CChangeObserver
{ {
public: public:
bool changeNotify(const neutrino_locale_t, void * data); bool changeNotify(const neutrino_locale_t, void * data);
}; };
#endif #endif