summaryrefslogtreecommitdiff
path: root/common.c
diff options
context:
space:
mode:
authorThomas Günther <tom@toms-cafe.de>2009-07-10 23:37:37 +0200
committerThomas Günther <tom@toms-cafe.de>2009-07-10 23:37:37 +0200
commit747ba59e743e4d3b5b1265c0e755a4b7951d2fef (patch)
tree89abfe367c0943f0f348d8aaf3dff696e4511cb5 /common.c
parent892fa52b3e9ecaa7cd3e376863ad3275dc084aa7 (diff)
downloadvdr-plugin-text2skin-747ba59e743e4d3b5b1265c0e755a4b7951d2fef.tar.gz
vdr-plugin-text2skin-747ba59e743e4d3b5b1265c0e755a4b7951d2fef.tar.bz2
Replaced asprintf with cString::sprintf in GetFrontend*()
Diffstat (limited to 'common.c')
-rw-r--r--common.c56
1 files changed, 26 insertions, 30 deletions
diff --git a/common.c b/common.c
index 5512bae..c676fdb 100644
--- a/common.c
+++ b/common.c
@@ -90,60 +90,56 @@ const cRecording *GetRecordingByFileName(const char *FileName)
int GetFrontendSTR(void)
{
uint16_t value = 0;
- char *dev = NULL;
+ cString dev = cString::sprintf(FRONTEND_DEVICE, cDevice::ActualDevice()->CardIndex(), 0);
- asprintf(&dev, FRONTEND_DEVICE, cDevice::ActualDevice()->CardIndex(), 0);
int fe = open(dev, O_RDONLY | O_NONBLOCK);
- free(dev);
- if (fe >= 0) {
- CHECK(ioctl(fe, FE_READ_SIGNAL_STRENGTH, &value));
- close(fe);
- }
+ if (fe < 0)
+ return 0;
+ CHECK(ioctl(fe, FE_READ_SIGNAL_STRENGTH, &value));
+ close(fe);
+
return value / 655;
}
int GetFrontendSNR(void)
{
uint16_t value = 0;
- char *dev = NULL;
+ cString dev = cString::sprintf(FRONTEND_DEVICE, cDevice::ActualDevice()->CardIndex(), 0);
- asprintf(&dev, FRONTEND_DEVICE, cDevice::ActualDevice()->CardIndex(), 0);
int fe = open(dev, O_RDONLY | O_NONBLOCK);
- free(dev);
- if (fe >= 0) {
- CHECK(ioctl(fe, FE_READ_SNR, &value));
- close(fe);
- }
+ if (fe < 0)
+ return 0;
+ CHECK(ioctl(fe, FE_READ_SNR, &value));
+ close(fe);
+
return value / 655;
}
bool GetFrontendHasLock(void)
{
- fe_status_t value = fe_status_t(0);
- char *dev = NULL;
+ fe_status_t value;
+ cString dev = cString::sprintf(FRONTEND_DEVICE, cDevice::ActualDevice()->CardIndex(), 0);
- asprintf(&dev, FRONTEND_DEVICE, cDevice::ActualDevice()->CardIndex(), 0);
int fe = open(dev, O_RDONLY | O_NONBLOCK);
- free(dev);
- if (fe >= 0) {
- CHECK(ioctl(fe, FE_READ_STATUS, &value));
- close(fe);
- }
+ if (fe < 0)
+ return false;
+ CHECK(ioctl(fe, FE_READ_STATUS, &value));
+ close(fe);
+
return value & FE_HAS_LOCK;
}
bool GetFrontendHasSignal(void)
{
- fe_status_t value = fe_status_t(0);
- char *dev = NULL;
+ fe_status_t value;
+ cString dev = cString::sprintf(FRONTEND_DEVICE, cDevice::ActualDevice()->CardIndex(), 0);
- asprintf(&dev, FRONTEND_DEVICE, cDevice::ActualDevice()->CardIndex(), 0);
int fe = open(dev, O_RDONLY | O_NONBLOCK);
- free(dev);
- if (fe >= 0) {
- CHECK(ioctl(fe, FE_READ_STATUS, &value));
- close(fe);
- }
+ if (fe < 0)
+ return false;
+ CHECK(ioctl(fe, FE_READ_STATUS, &value));
+ close(fe);
+
return value & FE_HAS_SIGNAL;
}