mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 16:31:05 +02:00
fix for Wextra Wshadow Werror build
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@535 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 6571f3dc02
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-04-01 (Thu, 01 Apr 2010)
This commit is contained in:
@@ -3130,7 +3130,7 @@ _repeat:
|
||||
new_msg = (mode == mode_standby) ? NeutrinoMessages::STANDBY_OFF : NeutrinoMessages::STANDBY_ON;
|
||||
//printf("standby: new msg %X\n", new_msg);
|
||||
if ((g_settings.shutdown_real_rcdelay)) {
|
||||
neutrino_msg_t _msg;
|
||||
neutrino_msg_t _msg_;
|
||||
neutrino_msg_data_t mdata;
|
||||
struct timeval endtime;
|
||||
time_t seconds;
|
||||
@@ -3148,10 +3148,10 @@ _repeat:
|
||||
//printf("standby: timeout %d\n", timeout);
|
||||
|
||||
while(true) {
|
||||
g_RCInput->getMsg_ms(&_msg, &mdata, timeout);
|
||||
g_RCInput->getMsg_ms(&_msg_, &mdata, timeout);
|
||||
|
||||
//printf("standby: input msg %X\n", msg);
|
||||
if (_msg == CRCInput::RC_timeout)
|
||||
if (_msg_ == CRCInput::RC_timeout)
|
||||
break;
|
||||
|
||||
gettimeofday(&endtime, NULL);
|
||||
@@ -3160,7 +3160,7 @@ _repeat:
|
||||
seconds--;
|
||||
//printf("standby: input seconds %d\n", seconds);
|
||||
if (seconds >= 1) {
|
||||
if (_msg == CRCInput::RC_standby)
|
||||
if (_msg_ == CRCInput::RC_standby)
|
||||
new_msg = NeutrinoMessages::SHUTDOWN;
|
||||
break;
|
||||
}
|
||||
|
Reference in New Issue
Block a user