From 3186c986ee4c1e98f493529073743c3853951e70 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Mon, 22 Jul 2013 17:49:53 +0100 Subject: [PATCH] Fix two new cppcheck warnings about values supplied to usleep being too large. --- mythtv/libs/libmyth/audio/audiooutputca.cpp | 2 +- mythtv/libs/libmythtv/diseqc.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mythtv/libs/libmyth/audio/audiooutputca.cpp b/mythtv/libs/libmyth/audio/audiooutputca.cpp index 5646d4c28ef..2d0cc00c28a 100644 --- a/mythtv/libs/libmyth/audio/audiooutputca.cpp +++ b/mythtv/libs/libmyth/audio/audiooutputca.cpp @@ -280,7 +280,7 @@ bool AudioOutputCA::OpenDevice() if (result < 0) { d->CloseAnalog(); - usleep(1000 * 1000); + usleep((1000 * 1000) - 1); // Argument to usleep must be less than 1 million } } deviceOpened = (result > 0); diff --git a/mythtv/libs/libmythtv/diseqc.cpp b/mythtv/libs/libmythtv/diseqc.cpp index cdac1c73e18..e2183baf73f 100644 --- a/mythtv/libs/libmythtv/diseqc.cpp +++ b/mythtv/libs/libmythtv/diseqc.cpp @@ -36,7 +36,7 @@ // DiSEqC sleep intervals per eutelsat spec #define DISEQC_SHORT_WAIT (15 * 1000) #define DISEQC_LONG_WAIT (100 * 1000) -#define DISEQC_POWER_OFF_WAIT (1000 * 1000) +#define DISEQC_POWER_OFF_WAIT ((1000 * 1000) - 1) #define DISEQC_POWER_ON_WAIT (500 * 1000) // Number of times to retry ioctls after receiving ETIMEDOUT before giving up