Commit 6cff929d authored by Aurélien Delrieu's avatar Aurélien Delrieu

Fix compilation on trusty

parent ac2de07b
......@@ -202,7 +202,7 @@ int InterconnectChannelReceiver::receiveToBuffer(NetSocketEvent *const event,
{
int ret = -1;
size_t length = 0;
*buf = nullptr;
*buf = NULL;
LOG(this->log_interconnect, LEVEL_DEBUG,
"try to receive a packet from interconnect channel "
......@@ -236,7 +236,7 @@ int InterconnectChannelReceiver::receiveToBuffer(NetSocketEvent *const event,
// If empty packet, return null pointer
else if(ret >= 0 && length == 0)
{
*buf = nullptr;
*buf = NULL;
}
return ret;
......@@ -260,7 +260,7 @@ bool InterconnectChannelReceiver::receive(NetSocketEvent *const event,
// Start receiving messages
do
{
interconnect_msg_buffer_t *buf = nullptr;
interconnect_msg_buffer_t *buf = NULL;
ret = this->receiveToBuffer(event, &buf);
if(ret < 0)
......@@ -345,7 +345,7 @@ void InterconnectChannelReceiver::deserialize(unsigned char *data, uint32_t len,
do
{
uint32_t dvb_frame_len;
DvbFrame *dvb_frame = nullptr;
DvbFrame *dvb_frame = NULL;
// Read the length of dvb_frame
memcpy(&dvb_frame_len, data + pos, sizeof(dvb_frame_len));
......
......@@ -63,8 +63,8 @@ class InterconnectChannel
name(name),
interconnect_iface(iface_name),
interconnect_addr(iface_addr),
data_channel(nullptr),
sig_channel(nullptr)
data_channel(NULL),
sig_channel(NULL)
{
this->log_interconnect = Output::registerLog(LEVEL_WARNING, name);
};
......
......@@ -69,7 +69,7 @@ bool AttenuationHandler::initialize(const string &link_section, OutputLog *log_i
{
LOG(log_init, LEVEL_ERROR,
"section '%s': missing parameter '%s'",
link_section,
link_section.c_str(),
MINIMAL_CONDITION_TYPE);
return false;
}
......@@ -81,7 +81,8 @@ bool AttenuationHandler::initialize(const string &link_section, OutputLog *log_i
{
LOG(log_init, LEVEL_ERROR,
"section '%s': missing parameter '%s'",
link_section, ERROR_INSERTION_TYPE);
link_section.c_str(),
ERROR_INSERTION_TYPE);
return false;
}
LOG(log_init, LEVEL_NOTICE,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment