From 0e435bb389d3923325d8f92bb452e45268e88966 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Wed, 22 Feb 2017 08:59:56 +0100 Subject: [PATCH] - rc_input: rename checkLnkDev() to checkdev_lnk(); ... just to align form-style to latest changes --- src/driver/rcinput.cpp | 41 ++++++++++++++++++++--------------------- src/driver/rcinput.h | 2 +- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp index b7974a09c..0541b69f1 100644 --- a/src/driver/rcinput.cpp +++ b/src/driver/rcinput.cpp @@ -174,6 +174,25 @@ bool CRCInput::checkdev() return true; /* need to check anyway... */ } +#ifdef BOXMODEL_CS_HD2 +bool CRCInput::checkdev_lnk(std::string lnk) +{ + static struct stat info; + if (lstat(lnk.c_str(), &info) != -1) { + if (S_ISLNK(info.st_mode)) { + std::string tmp = readLink(lnk); + if (!tmp.empty()) { + if (lstat(tmp.c_str(), &info) != -1) { + if (S_ISCHR(info.st_mode)) + return true; + } + } + } + } + return false; +} +#endif + bool CRCInput::checkpath(in_dev id) { for (std::vector::iterator it = indev.begin(); it != indev.end(); ++it) { @@ -206,25 +225,6 @@ bool CRCInput::checkpath(in_dev id) return false; } -#ifdef BOXMODEL_CS_HD2 -bool CRCInput::checkLnkDev(std::string lnk) -{ - static struct stat info; - if (lstat(lnk.c_str(), &info) != -1) { - if (S_ISLNK(info.st_mode)) { - std::string tmp = readLink(lnk); - if (!tmp.empty()) { - if (lstat(tmp.c_str(), &info) != -1) { - if (S_ISCHR(info.st_mode)) - return true; - } - } - } - } - return false; -} -#endif - /* if recheck == true, only not already opened devices are opened, if not, close then (re)open all */ void CRCInput::open(bool recheck) { @@ -249,13 +249,12 @@ void CRCInput::open(bool recheck) #ifdef BOXMODEL_CS_HD2 && (dentry->d_type != DT_LNK) #endif - ) { d_printf("[rcinput:%s] skipping '%s'\n", __func__, dentry->d_name); continue; } #ifdef BOXMODEL_CS_HD2 - if ((dentry->d_type == DT_LNK) && (!checkLnkDev("/dev/input/" + std::string(dentry->d_name)))) { + if ((dentry->d_type == DT_LNK) && (!checkdev_lnk("/dev/input/" + std::string(dentry->d_name)))) { d_printf("[rcinput:%s] skipping '%s'\n", __func__, dentry->d_name); continue; } diff --git a/src/driver/rcinput.h b/src/driver/rcinput.h index 37cfd4b8a..450dd4dd7 100644 --- a/src/driver/rcinput.h +++ b/src/driver/rcinput.h @@ -171,7 +171,7 @@ class CRCInput bool checkpath(in_dev id); bool checkdev(); #ifdef BOXMODEL_CS_HD2 - bool checkLnkDev(std::string lnk); + bool checkdev_lnk(std::string lnk); #endif void close(); int translate(int code);