mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 23:13:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

timerdclient: fix -Wstringop-truncation warnings

Browse Source
This commit is contained in:
Markus Volk
2020-01-30 21:40:30 +01:00
parent b1899de3f5
commit 7f3423dd4b
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/timerdclient/timerdclient.cpp
View File

@@ -344,7 +344,7 @@ int CTimerdClient::addTimerEvent( CTimerd::CTimerEventTypes evType, void* data,
tri.epg_id = ri->epg_id; tri.epg_id = ri->epg_id;
tri.recordingSafety = ri->recordingSafety; tri.recordingSafety = ri->recordingSafety;
tri.autoAdjustToEPG = ri->autoAdjustToEPG; tri.autoAdjustToEPG = ri->autoAdjustToEPG;
strncpy(tri.recordingDir, ri->recordingDir, RECORD_DIR_MAXLEN-1); strncpy(tri.recordingDir, ri->recordingDir, RECORD_DIR_MAXLEN);
length = sizeof( CTimerd::TransferRecordingInfo); length = sizeof( CTimerd::TransferRecordingInfo);
data = &tri; data = &tri;
} }

2
lib/timerdclient/timerdclient.h
View File

@@ -120,7 +120,7 @@ class CTimerdClient:private CBasicClient
eventInfo.apids = apids; eventInfo.apids = apids;
eventInfo.recordingSafety = safety; eventInfo.recordingSafety = safety;
eventInfo.autoAdjustToEPG = autoAdjust; eventInfo.autoAdjustToEPG = autoAdjust;
strncpy(eventInfo.recordingDir, recDir.c_str(), RECORD_DIR_MAXLEN); strncpy(eventInfo.recordingDir, recDir.c_str(), RECORD_DIR_MAXLEN-1);
return addTimerEvent(CTimerd::TIMER_RECORD, &eventInfo, announcetime, alarmtime, stoptime, evrepeat, repeatcount,forceAdd); return addTimerEvent(CTimerd::TIMER_RECORD, &eventInfo, announcetime, alarmtime, stoptime, evrepeat, repeatcount,forceAdd);
}; };

38
lib/timerdclient/timerdtypes.h
View File

@@ -34,7 +34,7 @@
#define REMINDER_MESSAGE_MAXLEN 31 #define REMINDER_MESSAGE_MAXLEN 31
#define EXEC_PLUGIN_NAME_MAXLEN 256 #define EXEC_PLUGIN_NAME_MAXLEN 256
#define RECORD_DIR_MAXLEN 1024 #define RECORD_DIR_MAXLEN 1025
#define EPG_TITLE_MAXLEN 51 #define EPG_TITLE_MAXLEN 51
#define TIMERD_APIDS_CONF 0x00 #define TIMERD_APIDS_CONF 0x00
@@ -46,14 +46,14 @@
class CTimerd class CTimerd
{ {
public: public:
enum CTimerEventRepeat enum CTimerEventRepeat
{ {
TIMERREPEAT_ONCE = 0, TIMERREPEAT_ONCE = 0,
TIMERREPEAT_DAILY, TIMERREPEAT_DAILY,
TIMERREPEAT_WEEKLY, TIMERREPEAT_WEEKLY,
TIMERREPEAT_BIWEEKLY, TIMERREPEAT_BIWEEKLY,
TIMERREPEAT_FOURWEEKLY, TIMERREPEAT_FOURWEEKLY,
TIMERREPEAT_MONTHLY, TIMERREPEAT_MONTHLY,
TIMERREPEAT_BYEVENTDESCRIPTION, TIMERREPEAT_BYEVENTDESCRIPTION,
TIMERREPEAT_WEEKDAYS = 0x100 // Bits 9-15 specify weekdays (9=mo,10=di,...) TIMERREPEAT_WEEKDAYS = 0x100 // Bits 9-15 specify weekdays (9=mo,10=di,...)
}; };
@@ -71,14 +71,14 @@ class CTimerd
TIMER_IMMEDIATE_RECORD, TIMER_IMMEDIATE_RECORD,
TIMER_REMOTEBOX TIMER_REMOTEBOX
}; };
enum CTimerEventStates enum CTimerEventStates
{ {
TIMERSTATE_SCHEDULED, TIMERSTATE_SCHEDULED,
TIMERSTATE_PREANNOUNCE, TIMERSTATE_PREANNOUNCE,
TIMERSTATE_ISRUNNING, TIMERSTATE_ISRUNNING,
TIMERSTATE_HASFINISHED, TIMERSTATE_HASFINISHED,
TIMERSTATE_TERMINATED TIMERSTATE_TERMINATED
}; };
struct EventInfo struct EventInfo
@@ -144,7 +144,7 @@ class CTimerd
}; };
struct responseGetTimer struct responseGetTimer
{ {
int eventID; int eventID;
CTimerEventTypes eventType; CTimerEventTypes eventType;
CTimerEventStates eventState; CTimerEventStates eventState;
@@ -165,13 +165,13 @@ class CTimerd
char remotebox_name[25]; char remotebox_name[25];
int rem_pre; int rem_pre;
int rem_post; int rem_post;
bool operator< (const responseGetTimer& a) const bool operator< (const responseGetTimer& a) const
{ {
return this->alarmTime < a.alarmTime ; return this->alarmTime < a.alarmTime ;
} }
}; };
typedef std::vector<responseGetTimer> TimerList; typedef std::vector<responseGetTimer> TimerList;
}; };
#endif #endif