mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-27 07:23:09 +02:00
suppress some basicclient valgrind warnings
To enable these paranoia memsets for testing, compile with -DPEDANTIC_VALGRIND_SETUP. Probably more of not completely initialized structs are present in other parts of the code. This is probably not useful for productive builds.
This commit is contained in:
@@ -28,6 +28,11 @@
|
||||
#include <timerdclient/timerdmsg.h>
|
||||
#include <timerdclient/timerdclient.h>
|
||||
|
||||
#ifdef PEDANTIC_VALGRIND_SETUP
|
||||
#define VALGRIND_PARANOIA(x) memset(&x, 0, sizeof(x))
|
||||
#else
|
||||
#define VALGRIND_PARANOIA(x) {}
|
||||
#endif
|
||||
|
||||
unsigned char CTimerdClient::getVersion () const
|
||||
{
|
||||
@@ -44,6 +49,7 @@ const char * CTimerdClient::getSocketName() const
|
||||
void CTimerdClient::registerEvent(unsigned int eventID, unsigned int clientID, const char * const udsName)
|
||||
{
|
||||
CEventServer::commandRegisterEvent msg2;
|
||||
VALGRIND_PARANOIA(msg2);
|
||||
|
||||
msg2.eventID = eventID;
|
||||
msg2.clientID = clientID;
|
||||
@@ -59,6 +65,7 @@ void CTimerdClient::registerEvent(unsigned int eventID, unsigned int clientID, c
|
||||
void CTimerdClient::unRegisterEvent(unsigned int eventID, unsigned int clientID)
|
||||
{
|
||||
CEventServer::commandUnRegisterEvent msg2;
|
||||
VALGRIND_PARANOIA(msg2);
|
||||
|
||||
msg2.eventID = eventID;
|
||||
msg2.clientID = clientID;
|
||||
@@ -166,6 +173,7 @@ bool CTimerdClient::modifyTimerEvent(int eventid, time_t announcetime, time_t al
|
||||
// set new time values for event eventid
|
||||
|
||||
CTimerdMsg::commandModifyTimer msgModifyTimer;
|
||||
VALGRIND_PARANOIA(msgModifyTimer);
|
||||
msgModifyTimer.eventID = eventid;
|
||||
msgModifyTimer.announceTime = announcetime;
|
||||
msgModifyTimer.alarmTime = alarmtime;
|
||||
@@ -204,6 +212,7 @@ bool CTimerdClient::rescheduleTimerEvent(int eventid, time_t diff)
|
||||
bool CTimerdClient::rescheduleTimerEvent(int eventid, time_t announcediff, time_t alarmdiff, time_t stopdiff)
|
||||
{
|
||||
CTimerdMsg::commandModifyTimer msgModifyTimer;
|
||||
VALGRIND_PARANOIA(msgModifyTimer);
|
||||
msgModifyTimer.eventID = eventid;
|
||||
msgModifyTimer.announceTime = announcediff;
|
||||
msgModifyTimer.alarmTime = alarmdiff;
|
||||
@@ -257,6 +266,9 @@ int CTimerdClient::addTimerEvent( CTimerd::CTimerEventTypes evType, void* data,
|
||||
CTimerd::TransferEventInfo tei;
|
||||
CTimerd::TransferRecordingInfo tri;
|
||||
CTimerdMsg::commandAddTimer msgAddTimer;
|
||||
VALGRIND_PARANOIA(tei);
|
||||
VALGRIND_PARANOIA(tri);
|
||||
VALGRIND_PARANOIA(msgAddTimer);
|
||||
msgAddTimer.alarmTime = alarmtime;
|
||||
msgAddTimer.announceTime = announcetime;
|
||||
msgAddTimer.stopTime = stoptime;
|
||||
@@ -325,6 +337,7 @@ int CTimerdClient::addTimerEvent( CTimerd::CTimerEventTypes evType, void* data,
|
||||
void CTimerdClient::removeTimerEvent( int evId)
|
||||
{
|
||||
CTimerdMsg::commandRemoveTimer msgRemoveTimer;
|
||||
VALGRIND_PARANOIA(msgRemoveTimer);
|
||||
|
||||
msgRemoveTimer.eventID = evId;
|
||||
|
||||
@@ -394,6 +407,7 @@ bool CTimerdClient::shutdown()
|
||||
void CTimerdClient::modifyTimerAPid(int eventid, unsigned char apids)
|
||||
{
|
||||
CTimerdMsg::commandSetAPid data;
|
||||
VALGRIND_PARANOIA(data);
|
||||
data.eventID=eventid;
|
||||
data.apids = apids;
|
||||
send(CTimerdMsg::CMD_SETAPID, (char*) &data, sizeof(data));
|
||||
@@ -404,6 +418,7 @@ void CTimerdClient::modifyTimerAPid(int eventid, unsigned char apids)
|
||||
void CTimerdClient::setRecordingSafety(int pre, int post)
|
||||
{
|
||||
CTimerdMsg::commandRecordingSafety data;
|
||||
VALGRIND_PARANOIA(data);
|
||||
data.pre = pre;
|
||||
data.post = post;
|
||||
send(CTimerdMsg::CMD_SETRECSAFETY, (char*) &data, sizeof(data));
|
||||
@@ -473,6 +488,7 @@ void CTimerdClient::setWeekdaysToStr(CTimerd::CTimerEventRepeat rep, char* str)
|
||||
void CTimerdClient::stopTimerEvent( int evId)
|
||||
{
|
||||
CTimerdMsg::commandRemoveTimer msgRemoveTimer;
|
||||
VALGRIND_PARANOIA(msgRemoveTimer);
|
||||
|
||||
msgRemoveTimer.eventID = evId;
|
||||
|
||||
|
Reference in New Issue
Block a user