summaryrefslogtreecommitdiffstats
path: root/stream/dvb_tune.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-05-06 20:58:54 +0200
committerwm4 <wm4@nowhere>2013-05-06 23:11:11 +0200
commit885c6a2610619ad3ee2b01ae7ec7670f8551d388 (patch)
tree7a9d2d4f9516c417e15e16613bb71a87f1feca3f /stream/dvb_tune.c
parentab776adeceb4b9b6ce7adde5a857ffc1e4b2c4ae (diff)
downloadmpv-885c6a2610619ad3ee2b01ae7ec7670f8551d388.tar.bz2
mpv-885c6a2610619ad3ee2b01ae7ec7670f8551d388.tar.xz
Fix some cppcheck / scan-build warnings
These were found by the cppcheck and scan-build static analyzers. Most of these aren't interesting (the 2 previous commits fix some interesting cases found by these analyzers), and they don't nearly fix all warnings. (Most of the unfixed warnings are spam, things MPlayer never cared about, or false positives.)
Diffstat (limited to 'stream/dvb_tune.c')
-rw-r--r--stream/dvb_tune.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/stream/dvb_tune.c b/stream/dvb_tune.c
index d5ea8c7b1a..8b24e88ede 100644
--- a/stream/dvb_tune.c
+++ b/stream/dvb_tune.c
@@ -325,7 +325,7 @@ static int tune_it(int fd_frontend, int fd_sec, unsigned int freq, unsigned int
fe_transmit_mode_t TransmissionMode, fe_guard_interval_t guardInterval, fe_bandwidth_t bandwidth,
fe_code_rate_t LP_CodeRate, fe_hierarchy_t hier, int timeout)
{
- int res, hi_lo = 0, dfd;
+ int hi_lo = 0, dfd;
struct dvb_frontend_parameters feparams;
struct dvb_frontend_info fe_info;
@@ -334,7 +334,7 @@ static int tune_it(int fd_frontend, int fd_sec, unsigned int freq, unsigned int
memset(&feparams, 0, sizeof(feparams));
- if ( (res = ioctl(fd_frontend,FE_GET_INFO, &fe_info) < 0))
+ if ( ioctl(fd_frontend,FE_GET_INFO, &fe_info) < 0)
{
mp_msg(MSGT_DEMUX, MSGL_FATAL, "FE_GET_INFO FAILED\n");
return -1;