diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-12-15 16:55:29 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-12-15 16:55:29 +0000 |
| commit | bbd916fde5e3d4b36dc8c96bfd2c63a524a4ef4c (patch) | |
| tree | 2367a173eb7f8dfb9d46eec1defdffbe22fa0e01 | |
| parent | 38f3d33d9784200dea988e18803461ee3a0811e2 (diff) | |
| download | enigma2-bbd916fde5e3d4b36dc8c96bfd2c63a524a4ef4c.tar.gz enigma2-bbd916fde5e3d4b36dc8c96bfd2c63a524a4ef4c.zip | |
fix ASSERT in the correct way
| -rw-r--r-- | lib/base/eerror.h | 2 | ||||
| -rw-r--r-- | lib/dvb/frontend.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/base/eerror.h b/lib/base/eerror.h index 5a66b31e..e7c33a0b 100644 --- a/lib/base/eerror.h +++ b/lib/base/eerror.h @@ -135,7 +135,7 @@ enum { lvlDebug=1, lvlWarning=2, lvlFatal=4 }; inline void eWarning(const char* fmt, ...) { } - #define ASSERT(x) do { x; } while (0) + #define ASSERT(x) do { } while (0) #endif //DEBUG void eWriteCrashdump(); diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp index 91fad0a6..d8301db8 100644 --- a/lib/dvb/frontend.cpp +++ b/lib/dvb/frontend.cpp @@ -2013,7 +2013,8 @@ int eDVBFrontend::isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm) { ASSERT(m_sec); eDVBFrontendParametersSatellite sat_parm; - ASSERT(!feparm->getDVBS(sat_parm)); + int ret = feparm->getDVBS(sat_parm); + ASSERT(!ret); return m_sec->canTune(sat_parm, this, 1 << m_fe); } else if (m_type == eDVBFrontend::feCable) |