From ab473feed159b50a87bccf308cb5f90d2fc2ddbd Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Thu, 21 Sep 2017 14:41:18 +0200
Subject: [PATCH] fix(daemon): compile with new cpp flags
---
daemon/commands/adaptive-jitter-compensation.h | 5 +++--
daemon/commands/answer.h | 5 +++--
daemon/commands/audio-codec-get.h | 5 +++--
daemon/commands/audio-codec-move.h | 5 +++--
daemon/commands/audio-codec-set.h | 5 +++--
daemon/commands/audio-codec-toggle.h | 6 ++++--
daemon/commands/audio-stream-start.h | 5 +++--
daemon/commands/audio-stream-stats.h | 5 +++--
daemon/commands/audio-stream-stop.h | 5 +++--
daemon/commands/auth-infos-clear.h | 5 +++--
daemon/commands/call-mute.h | 5 +++--
daemon/commands/call-pause.h | 5 +++--
daemon/commands/call-resume.h | 5 +++--
daemon/commands/call-stats.h | 5 +++--
daemon/commands/call-status.h | 5 +++--
daemon/commands/call-transfer.h | 5 +++--
daemon/commands/call.h | 5 +++--
daemon/commands/cn.h | 5 +++--
daemon/commands/conference.h | 5 +++--
daemon/commands/configcommand.h | 8 +++++---
daemon/commands/contact.h | 5 +++--
daemon/commands/dtmf.h | 5 +++--
daemon/commands/firewall-policy.h | 5 +++--
daemon/commands/help.h | 5 +++--
daemon/commands/ipv6.h | 5 +++--
daemon/commands/jitterbuffer.h | 12 +++++++-----
daemon/commands/media-encryption.h | 5 +++--
daemon/commands/msfilter-add-fmtp.h | 5 +++--
daemon/commands/netsim.h | 5 +++--
daemon/commands/play-wav.h | 5 +++--
daemon/commands/pop-event.h | 5 +++--
daemon/commands/port.h | 5 +++--
daemon/commands/ptime.h | 5 +++--
daemon/commands/quit.h | 5 +++--
daemon/commands/register-info.h | 5 +++--
daemon/commands/register-status.h | 5 +++--
daemon/commands/register.h | 5 +++--
daemon/commands/terminate.h | 5 +++--
daemon/commands/unregister.h | 5 +++--
daemon/commands/version.h | 5 +++--
daemon/commands/video.h | 11 +++++++----
daemon/daemon-pipetest.c | 13 ++++++-------
daemon/daemon.h | 2 +-
43 files changed, 141 insertions(+), 96 deletions(-)
diff --git a/daemon/commands/adaptive-jitter-compensation.h b/daemon/commands/adaptive-jitter-compensation.h
index c8a901c02e..cc15bd07df 100644
--- a/daemon/commands/adaptive-jitter-compensation.h
+++ b/daemon/commands/adaptive-jitter-compensation.h
@@ -1,6 +1,6 @@
/*
adaptive-jitter-compensation.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class AdaptiveBufferCompensationCommand: public DaemonCommand {
public:
AdaptiveBufferCompensationCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string &args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_ADAPTIVE_BUFFER_COMPENSATION_H_
diff --git a/daemon/commands/answer.h b/daemon/commands/answer.h
index 7dcd94972d..046fd3175b 100644
--- a/daemon/commands/answer.h
+++ b/daemon/commands/answer.h
@@ -1,6 +1,6 @@
/*
answer.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class AnswerCommand: public DaemonCommand {
public:
AnswerCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string &args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_ANSWER_H_
diff --git a/daemon/commands/audio-codec-get.h b/daemon/commands/audio-codec-get.h
index 8a80753217..0068fd308c 100644
--- a/daemon/commands/audio-codec-get.h
+++ b/daemon/commands/audio-codec-get.h
@@ -1,6 +1,6 @@
/*
audio-codec-get.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class AudioCodecGetCommand: public DaemonCommand {
public:
AudioCodecGetCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string &args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_AUDIO_CODEC_GET_H_
diff --git a/daemon/commands/audio-codec-move.h b/daemon/commands/audio-codec-move.h
index a19fa7b84f..204edc95f9 100644
--- a/daemon/commands/audio-codec-move.h
+++ b/daemon/commands/audio-codec-move.h
@@ -1,6 +1,6 @@
/*
audio-codec-move.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class AudioCodecMoveCommand: public DaemonCommand {
public:
AudioCodecMoveCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string &args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_AUDIO_CODEC_MOVE_H_
diff --git a/daemon/commands/audio-codec-set.h b/daemon/commands/audio-codec-set.h
index 0d90b28423..f5667f9f55 100644
--- a/daemon/commands/audio-codec-set.h
+++ b/daemon/commands/audio-codec-set.h
@@ -1,6 +1,6 @@
/*
audio-codec-set.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class AudioCodecSetCommand: public DaemonCommand {
public:
AudioCodecSetCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string &args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_AUDIO_CODEC_SET_H_
diff --git a/daemon/commands/audio-codec-toggle.h b/daemon/commands/audio-codec-toggle.h
index 36dce43007..f625112d6a 100644
--- a/daemon/commands/audio-codec-toggle.h
+++ b/daemon/commands/audio-codec-toggle.h
@@ -1,6 +1,6 @@
/*
audio-codec-toggle.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,9 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class AudioCodecToggleCommand: public DaemonCommand {
public:
AudioCodecToggleCommand(const char *name, const char *proto, const char *help, bool enable);
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string &args) override;
+
protected:
bool mEnable;
};
diff --git a/daemon/commands/audio-stream-start.h b/daemon/commands/audio-stream-start.h
index 4d8dc878e3..730d586323 100644
--- a/daemon/commands/audio-stream-start.h
+++ b/daemon/commands/audio-stream-start.h
@@ -1,6 +1,6 @@
/*
audio-stream-start.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class AudioStreamStartCommand: public DaemonCommand {
public:
AudioStreamStartCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string &args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_AUDIO_STREAM_START_H_
diff --git a/daemon/commands/audio-stream-stats.h b/daemon/commands/audio-stream-stats.h
index f63fbb17c9..72e93feddf 100644
--- a/daemon/commands/audio-stream-stats.h
+++ b/daemon/commands/audio-stream-stats.h
@@ -1,6 +1,6 @@
/*
audio-stream-stats.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class AudioStreamStatsCommand: public DaemonCommand {
public:
AudioStreamStatsCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string &args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_AUDIO_STREAM_STATS_H_
diff --git a/daemon/commands/audio-stream-stop.h b/daemon/commands/audio-stream-stop.h
index 44dd7166dc..ad2d0c051c 100644
--- a/daemon/commands/audio-stream-stop.h
+++ b/daemon/commands/audio-stream-stop.h
@@ -1,6 +1,6 @@
/*
audio-stream-stop.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class AudioStreamStopCommand: public DaemonCommand {
public:
AudioStreamStopCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_AUDIO_STREAM_STOP_H_
diff --git a/daemon/commands/auth-infos-clear.h b/daemon/commands/auth-infos-clear.h
index 35df2165a4..59a53be788 100644
--- a/daemon/commands/auth-infos-clear.h
+++ b/daemon/commands/auth-infos-clear.h
@@ -1,6 +1,6 @@
/*
auth-infos-clear.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class AuthInfosClearCommand: public DaemonCommand {
public:
AuthInfosClearCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_AUTH_INFOS_CLEAR_H_
diff --git a/daemon/commands/call-mute.h b/daemon/commands/call-mute.h
index bab2fe1287..993f9a989a 100644
--- a/daemon/commands/call-mute.h
+++ b/daemon/commands/call-mute.h
@@ -1,6 +1,6 @@
/*
call-mute.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -26,7 +26,8 @@ class CallMuteCommand : public DaemonCommand
{
public:
CallMuteCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_CALL_MUTE_H
diff --git a/daemon/commands/call-pause.h b/daemon/commands/call-pause.h
index 7fbb6177de..e0d96063f6 100644
--- a/daemon/commands/call-pause.h
+++ b/daemon/commands/call-pause.h
@@ -1,6 +1,6 @@
/*
call-pause.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -26,7 +26,8 @@ class CallPauseCommand : public DaemonCommand
{
public:
CallPauseCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_CALL_PAUSE_H
diff --git a/daemon/commands/call-resume.h b/daemon/commands/call-resume.h
index 03ac2ae852..6c08c28560 100644
--- a/daemon/commands/call-resume.h
+++ b/daemon/commands/call-resume.h
@@ -1,6 +1,6 @@
/*
call-resume.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -26,7 +26,8 @@ class CallResumeCommand : public DaemonCommand
{
public:
CallResumeCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_CALL_RESUME_H
diff --git a/daemon/commands/call-stats.h b/daemon/commands/call-stats.h
index 465e384957..27814ec1bf 100644
--- a/daemon/commands/call-stats.h
+++ b/daemon/commands/call-stats.h
@@ -1,6 +1,6 @@
/*
call-stats.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class CallStatsCommand: public DaemonCommand {
public:
CallStatsCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_CALL_STATS_H_
diff --git a/daemon/commands/call-status.h b/daemon/commands/call-status.h
index df59899989..308ee1823b 100644
--- a/daemon/commands/call-status.h
+++ b/daemon/commands/call-status.h
@@ -1,6 +1,6 @@
/*
call-status.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class CallStatusCommand: public DaemonCommand {
public:
CallStatusCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_CALL_STATUS_H_
diff --git a/daemon/commands/call-transfer.h b/daemon/commands/call-transfer.h
index c0c0d977b9..83e93d0c98 100644
--- a/daemon/commands/call-transfer.h
+++ b/daemon/commands/call-transfer.h
@@ -1,6 +1,6 @@
/*
call-transfer.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -26,7 +26,8 @@ class CallTransferCommand : public DaemonCommand
{
public:
CallTransferCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_CALL_TRANSFER_H
diff --git a/daemon/commands/call.h b/daemon/commands/call.h
index e2cf8700e3..881ad144e2 100644
--- a/daemon/commands/call.h
+++ b/daemon/commands/call.h
@@ -1,6 +1,6 @@
/*
call.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class CallCommand: public DaemonCommand {
public:
CallCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_CALL_H_
diff --git a/daemon/commands/cn.h b/daemon/commands/cn.h
index 6e625bea8c..9b46c6cd69 100644
--- a/daemon/commands/cn.h
+++ b/daemon/commands/cn.h
@@ -1,6 +1,6 @@
/*
cn.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class CNCommand: public DaemonCommand {
public:
CNCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_CN_H_
diff --git a/daemon/commands/conference.h b/daemon/commands/conference.h
index c9d0719eec..cbf1cbe4b2 100644
--- a/daemon/commands/conference.h
+++ b/daemon/commands/conference.h
@@ -1,6 +1,6 @@
/*
conference.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -26,7 +26,8 @@ class ConferenceCommand : public DaemonCommand
{
public:
ConferenceCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_CONFERENCE_H
diff --git a/daemon/commands/configcommand.h b/daemon/commands/configcommand.h
index 6a138b9004..36feb749e5 100644
--- a/daemon/commands/configcommand.h
+++ b/daemon/commands/configcommand.h
@@ -1,6 +1,6 @@
/*
configcommand.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,13 +25,15 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class ConfigGetCommand: public DaemonCommand {
public:
ConfigGetCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
class ConfigSetCommand: public DaemonCommand {
public:
ConfigSetCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_CONFIG_H_
diff --git a/daemon/commands/contact.h b/daemon/commands/contact.h
index 057472b94f..4b2def6d6e 100644
--- a/daemon/commands/contact.h
+++ b/daemon/commands/contact.h
@@ -1,6 +1,6 @@
/*
contact.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class ContactCommand: public DaemonCommand {
public:
ContactCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_CONTACT_H_
diff --git a/daemon/commands/dtmf.h b/daemon/commands/dtmf.h
index 96d52298db..ca9104b478 100644
--- a/daemon/commands/dtmf.h
+++ b/daemon/commands/dtmf.h
@@ -1,6 +1,6 @@
/*
dtmf.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class DtmfCommand: public DaemonCommand {
public:
DtmfCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_DTMF_H_
diff --git a/daemon/commands/firewall-policy.h b/daemon/commands/firewall-policy.h
index a19d1dfd19..4750646921 100644
--- a/daemon/commands/firewall-policy.h
+++ b/daemon/commands/firewall-policy.h
@@ -1,6 +1,6 @@
/*
firewall-policy.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class FirewallPolicyCommand: public DaemonCommand {
public:
FirewallPolicyCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_FIREWALL_POLICY_H_
diff --git a/daemon/commands/help.h b/daemon/commands/help.h
index 6e18fd1b5b..826e610f98 100644
--- a/daemon/commands/help.h
+++ b/daemon/commands/help.h
@@ -1,6 +1,6 @@
/*
help.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class HelpCommand: public DaemonCommand {
public:
HelpCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_HELP_H_
diff --git a/daemon/commands/ipv6.h b/daemon/commands/ipv6.h
index 31ef4899b1..e3ea1e29f9 100644
--- a/daemon/commands/ipv6.h
+++ b/daemon/commands/ipv6.h
@@ -1,6 +1,6 @@
/*
ipv6.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class IPv6Command: public DaemonCommand {
public:
IPv6Command();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_IPV6_H_
diff --git a/daemon/commands/jitterbuffer.h b/daemon/commands/jitterbuffer.h
index 76855e0aac..2ea34511a0 100644
--- a/daemon/commands/jitterbuffer.h
+++ b/daemon/commands/jitterbuffer.h
@@ -1,6 +1,6 @@
/*
jitterbuffer.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,15 +25,17 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class JitterBufferCommand : public DaemonCommand{
public:
- JitterBufferCommand();
- virtual void exec(Daemon *app, const std::string& args);
+ JitterBufferCommand();
+
+ void exec(Daemon *app, const std::string& args) override;
};
class JitterBufferResetCommand : public DaemonCommand{
public:
- JitterBufferResetCommand();
- virtual void exec(Daemon *app, const std::string& args);
+ JitterBufferResetCommand();
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_JITTER_BUFFER_H
diff --git a/daemon/commands/media-encryption.h b/daemon/commands/media-encryption.h
index 7a35d0c271..ddd531a420 100644
--- a/daemon/commands/media-encryption.h
+++ b/daemon/commands/media-encryption.h
@@ -1,6 +1,6 @@
/*
media-encryption.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class MediaEncryptionCommand: public DaemonCommand {
public:
MediaEncryptionCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_MEDIA_ENCRYPTION_H_
diff --git a/daemon/commands/msfilter-add-fmtp.h b/daemon/commands/msfilter-add-fmtp.h
index ecb2969ec5..c9a3d32707 100644
--- a/daemon/commands/msfilter-add-fmtp.h
+++ b/daemon/commands/msfilter-add-fmtp.h
@@ -1,6 +1,6 @@
/*
msfilter-add-fmtp.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class MSFilterAddFmtpCommand : public DaemonCommand {
public:
MSFilterAddFmtpCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_MSFILTER_ADD_FMTP
diff --git a/daemon/commands/netsim.h b/daemon/commands/netsim.h
index e6b147c63b..dcedc43e94 100644
--- a/daemon/commands/netsim.h
+++ b/daemon/commands/netsim.h
@@ -1,6 +1,6 @@
/*
netsim.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class NetsimCommand: public DaemonCommand {
public:
NetsimCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_NETSIM_H_
diff --git a/daemon/commands/play-wav.h b/daemon/commands/play-wav.h
index 19a2452050..dd91805608 100644
--- a/daemon/commands/play-wav.h
+++ b/daemon/commands/play-wav.h
@@ -1,6 +1,6 @@
/*
play-wav.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class PlayWavCommand: public DaemonCommand {
public:
PlayWavCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_PLAY_WAV_H_
diff --git a/daemon/commands/pop-event.h b/daemon/commands/pop-event.h
index 66a3a8489c..e05f7c67e5 100644
--- a/daemon/commands/pop-event.h
+++ b/daemon/commands/pop-event.h
@@ -1,6 +1,6 @@
/*
pop-event.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class PopEventCommand: public DaemonCommand {
public:
PopEventCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_POP_EVENT_H_
diff --git a/daemon/commands/port.h b/daemon/commands/port.h
index 465a087e34..99c698fcc5 100644
--- a/daemon/commands/port.h
+++ b/daemon/commands/port.h
@@ -1,6 +1,6 @@
/*
port.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class PortCommand: public DaemonCommand {
public:
PortCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_PORT_H_
diff --git a/daemon/commands/ptime.h b/daemon/commands/ptime.h
index a54a17cd6b..03a390e904 100644
--- a/daemon/commands/ptime.h
+++ b/daemon/commands/ptime.h
@@ -1,6 +1,6 @@
/*
ptime.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class PtimeCommand: public DaemonCommand {
public:
PtimeCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_PTIME_H_
diff --git a/daemon/commands/quit.h b/daemon/commands/quit.h
index 99bf5f49a8..3ff30d8904 100644
--- a/daemon/commands/quit.h
+++ b/daemon/commands/quit.h
@@ -1,6 +1,6 @@
/*
quit.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class QuitCommand: public DaemonCommand {
public:
QuitCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_QUIT_H_
diff --git a/daemon/commands/register-info.h b/daemon/commands/register-info.h
index e6b437a576..cdbbaf6632 100644
--- a/daemon/commands/register-info.h
+++ b/daemon/commands/register-info.h
@@ -1,6 +1,6 @@
/*
register-info.h
-Copyright (C) 2017 Belledonne Communications, Grenoble, France
+Copyright (C) 2017 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -26,7 +26,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class RegisterInfoCommand: public DaemonCommand {
public:
RegisterInfoCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_REGISTER_INFO_H_
diff --git a/daemon/commands/register-status.h b/daemon/commands/register-status.h
index 5e19cbe14e..ce8bbbf574 100644
--- a/daemon/commands/register-status.h
+++ b/daemon/commands/register-status.h
@@ -1,6 +1,6 @@
/*
register-status.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class RegisterStatusCommand: public DaemonCommand {
public:
RegisterStatusCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_REGISTER_STATUS_H_
diff --git a/daemon/commands/register.h b/daemon/commands/register.h
index c29a17f2b8..f7b2f4e055 100644
--- a/daemon/commands/register.h
+++ b/daemon/commands/register.h
@@ -1,6 +1,6 @@
/*
register.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class RegisterCommand: public DaemonCommand {
public:
RegisterCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_REGISTER_H_
diff --git a/daemon/commands/terminate.h b/daemon/commands/terminate.h
index 5733d3f215..0d58ebc599 100644
--- a/daemon/commands/terminate.h
+++ b/daemon/commands/terminate.h
@@ -1,6 +1,6 @@
/*
terminate.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class TerminateCommand: public DaemonCommand {
public:
TerminateCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_TERMINATE_H_
diff --git a/daemon/commands/unregister.h b/daemon/commands/unregister.h
index 09dd5521cc..62f34ee87b 100644
--- a/daemon/commands/unregister.h
+++ b/daemon/commands/unregister.h
@@ -1,6 +1,6 @@
/*
unregister.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class UnregisterCommand: public DaemonCommand {
public:
UnregisterCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_UNREGISTER_H_
diff --git a/daemon/commands/version.h b/daemon/commands/version.h
index 18c897b8c9..76a6d81d06 100644
--- a/daemon/commands/version.h
+++ b/daemon/commands/version.h
@@ -1,6 +1,6 @@
/*
version.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class VersionCommand: public DaemonCommand {
public:
VersionCommand();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_VERSION_H_
diff --git a/daemon/commands/video.h b/daemon/commands/video.h
index b456888177..a971a23602 100644
--- a/daemon/commands/video.h
+++ b/daemon/commands/video.h
@@ -1,6 +1,6 @@
/*
video.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -26,7 +26,8 @@ class Video : public DaemonCommand
{
public:
Video();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
@@ -34,14 +35,16 @@ class VideoSource : public DaemonCommand
{
public:
VideoSource();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
class AutoVideo : public DaemonCommand
{
public:
AutoVideo();
- virtual void exec(Daemon *app, const std::string& args);
+
+ void exec(Daemon *app, const std::string& args) override;
};
#endif // LINPHONE_DAEMON_COMMAND_VIDEO_H
diff --git a/daemon/daemon-pipetest.c b/daemon/daemon-pipetest.c
index 625312c14f..f3fa70c248 100644
--- a/daemon/daemon-pipetest.c
+++ b/daemon/daemon-pipetest.c
@@ -1,6 +1,6 @@
/*
daemon-pipetest.c
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -79,7 +79,7 @@ int main(int argc, char *argv[]){
SetConsoleMode(hin, fdwOldMode);
#else
struct pollfd pfds[2] = { { 0 } };
- int bytes;
+ ssize_t bytes;
pfds[0].fd=fd;
pfds[0].events=POLLIN;
pfds[1].fd=1;
@@ -91,11 +91,11 @@ int main(int argc, char *argv[]){
/*splice to stdout*/
if (pfds[0].revents & POLLIN){
if ((bytes=read(pfds[0].fd,buf,sizeof(buf)))>0){
- if (write(0,buf,bytes)==-1){
+ if (write(0,buf,(size_t)bytes)==-1){
ortp_error("Fail to write to stdout?");
break;
}
- fprintf(stdout,"\n");
+ fprintf(stdout,"\n");
}else if (bytes==0){
break;
}
@@ -103,10 +103,10 @@ int main(int argc, char *argv[]){
/*splice from stdin to pipe */
if (pfds[1].revents & POLLIN){
if ((bytes=read(pfds[1].fd,buf,sizeof(buf)))>0){
- if (write(pfds[0].fd,buf,bytes)==-1){
+ if (write(pfds[0].fd,buf,(size_t)bytes)==-1){
ortp_error("Fail to write to unix socket");
break;
- }
+ }
}else if (bytes==0){
break;
}
@@ -117,4 +117,3 @@ int main(int argc, char *argv[]){
return 0;
}
-
diff --git a/daemon/daemon.h b/daemon/daemon.h
index 12a32c3583..97591982eb 100644
--- a/daemon/daemon.h
+++ b/daemon/daemon.h
@@ -1,6 +1,6 @@
/*
daemon.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
--
GitLab