matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix warnings introduced by recent feature development

Browse Source
This commit is contained in:
Srivats P 2016-06-01 20:51:29 +05:30
parent 78957a019f
commit 2acfb3f25a
7 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/devicegroupmodel.cpp
View File

@ -193,9 +193,9 @@ QVariant DeviceGroupModel::data(const QModelIndex &index, int role) const
} }
bool DeviceGroupModel::setData( bool DeviceGroupModel::setData(
const QModelIndex &index, const QModelIndex & /*index*/,
const QVariant &value, const QVariant & /*value*/,
int role) int /*role*/)
{ {
if (!port_) if (!port_)
return false; return false;

4
client/portgroup.cpp
View File

@ -438,7 +438,7 @@ void PortGroup::processPortConfigList(PbRpcController *controller)
.arg(port->userAlias()) .arg(port->userAlias())
.arg(port->userName()); .arg(port->userName());
QMessageBox::warning(NULL, tr("Open Session"), warning); QMessageBox::warning(NULL, tr("Open Session"), warning);
qWarning(qPrintable(warning)); qWarning("%s", qPrintable(warning));
continue; continue;
} }
atConnectPortConfig_[j] = pc; atConnectPortConfig_[j] = pc;
@ -585,7 +585,7 @@ void PortGroup::processDeleteDeviceGroupAck(PbRpcController *controller)
delete controller; delete controller;
} }
void PortGroup::processModifyDeviceGroupAck(int portIndex, void PortGroup::processModifyDeviceGroupAck(int /*portIndex*/,
PbRpcController *controller) PbRpcController *controller)
{ {
qDebug("In %s", __FUNCTION__); qDebug("In %s", __FUNCTION__);

4
client/portswindow.cpp
View File

@ -192,7 +192,7 @@ int PortsWindow::reservedPortCount()
//! Always return true //! Always return true
bool PortsWindow::openSession( bool PortsWindow::openSession(
const OstProto::SessionContent *session, const OstProto::SessionContent *session,
QString &error) QString & /*error*/)
{ {
QProgressDialog progress("Opening Session", NULL, QProgressDialog progress("Opening Session", NULL,
0, session->port_groups_size(), mainWindow); 0, session->port_groups_size(), mainWindow);
@ -223,7 +223,7 @@ bool PortsWindow::openSession(
*/ */
bool PortsWindow::saveSession( bool PortsWindow::saveSession(
OstProto::SessionContent *session, // OUT param OstProto::SessionContent *session, // OUT param
QString &error, QString & /*error*/,
QProgressDialog *progress) QProgressDialog *progress)
{ {
int n = portGroupCount(); int n = portGroupCount();

10
client/stream.cpp
View File

@ -50,12 +50,18 @@ void Stream::storeProtocolWidgets()
return; return;
} }
quint64 getDeviceMacAddress(int portId, int streamId, int frameIndex) quint64 getDeviceMacAddress(
int /*portId*/,
int /*streamId*/,
int /*frameIndex*/)
{ {
return 0; return 0;
} }
quint64 getNeighborMacAddress(int portId, int streamId, int frameIndex) quint64 getNeighborMacAddress(
int /*portId*/,
int /*streamId*/,
int /*frameIndex*/)
{ {
return 0; return 0;
} }

2
server/devicemanager.cpp
View File

@ -40,7 +40,7 @@ inline UInt128 UINT128(OstEmul::Ip6Address x)
inline bool isMacMcast(quint64 mac) inline bool isMacMcast(quint64 mac)
{ {
return (mac >> 40) & 0x01 == 0x01; return ((mac >> 40) & 0x01) == 0x01;
} }

8
server/myservice.cpp
View File

@ -843,9 +843,9 @@ _invalid_port:
} }
void MyService::resolveDeviceNeighbors( void MyService::resolveDeviceNeighbors(
::google::protobuf::RpcController* controller, ::google::protobuf::RpcController* /*controller*/,
const ::OstProto::PortIdList* request, const ::OstProto::PortIdList* request,
::OstProto::Ack* response, ::OstProto::Ack* /*response*/,
::google::protobuf::Closure* done) ::google::protobuf::Closure* done)
{ {
qDebug("In %s", __PRETTY_FUNCTION__); qDebug("In %s", __PRETTY_FUNCTION__);
@ -869,9 +869,9 @@ void MyService::resolveDeviceNeighbors(
} }
void MyService::clearDeviceNeighbors( void MyService::clearDeviceNeighbors(
::google::protobuf::RpcController* controller, ::google::protobuf::RpcController* /*controller*/,
const ::OstProto::PortIdList* request, const ::OstProto::PortIdList* request,
::OstProto::Ack* response, ::OstProto::Ack* /*response*/,
::google::protobuf::Closure* done) ::google::protobuf::Closure* done)
{ {
qDebug("In %s", __PRETTY_FUNCTION__); qDebug("In %s", __PRETTY_FUNCTION__);

2
server/pcapport.cpp
View File

@ -984,8 +984,8 @@ void PcapPort::EmulationTransceiver::run()
flags |= PCAP_OPENFLAG_NOCAPTURE_LOCAL; flags |= PCAP_OPENFLAG_NOCAPTURE_LOCAL;
#endif #endif
_retry:
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
_retry:
// NOCAPTURE_LOCAL needs windows only pcap_open() // NOCAPTURE_LOCAL needs windows only pcap_open()
handle_ = pcap_open(qPrintable(device_), 65535, handle_ = pcap_open(qPrintable(device_), 65535,
flags, 100 /* ms */, NULL, errbuf); flags, 100 /* ms */, NULL, errbuf);