Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-10 20:38:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix mac/ubuntu compiler warning

Browse source
This commit is contained in:
Roxanne Skelly 2019-04-08 16:29:42 -07:00
parent cb6f7a45f8
commit 377d412264
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/AssignmentClientApp.cpp
View file

@ -199,7 +199,7 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) :
assignmentServerPort = parser.value(assignmentServerPortOption).toInt(); assignmentServerPort = parser.value(assignmentServerPortOption).toInt();
} }
quint16 childMinListenPort = INVALID_PORT; quint16 childMinListenPort = 0;
if (argumentVariantMap.contains(ASSIGNMENT_MONITOR_MIN_CHILDREN_LISTEN_PORT_OPTION)) { if (argumentVariantMap.contains(ASSIGNMENT_MONITOR_MIN_CHILDREN_LISTEN_PORT_OPTION)) {
childMinListenPort = argumentVariantMap.value(ASSIGNMENT_MONITOR_MIN_CHILDREN_LISTEN_PORT_OPTION).toUInt(); childMinListenPort = argumentVariantMap.value(ASSIGNMENT_MONITOR_MIN_CHILDREN_LISTEN_PORT_OPTION).toUInt();
} }

12
assignment-client/src/AssignmentClientMonitor.cpp
View file

@ -105,7 +105,7 @@ void AssignmentClientMonitor::childProcessFinished(qint64 pid, quint16 listenPor
auto message = "Child process " + QString::number(pid) + " on port " + QString::number(listenPort) + auto message = "Child process " + QString::number(pid) + " on port " + QString::number(listenPort) +
"has %1 with exit code " + QString::number(exitCode) + "."; "has %1 with exit code " + QString::number(exitCode) + ".";
if (listenPort != INVALID_PORT) { if (listenPort) {
_childListenPorts.remove(listenPort); _childListenPorts.remove(listenPort);
} }
@ -159,20 +159,20 @@ void AssignmentClientMonitor::aboutToQuit() {
void AssignmentClientMonitor::spawnChildClient() { void AssignmentClientMonitor::spawnChildClient() {
QProcess* assignmentClient = new QProcess(this); QProcess* assignmentClient = new QProcess(this);
quint16 listenPort = INVALID_PORT; quint16 listenPort = 0;
// allocate a port // allocate a port
if (_childMinListenPort != INVALID_PORT) { if (_childMinListenPort) {
for (listenPort = _childMinListenPort; _childListenPorts.contains(listenPort); listenPort++) { for (listenPort = _childMinListenPort; _childListenPorts.contains(listenPort); listenPort++) {
if (_maxAssignmentClientForks && if (_maxAssignmentClientForks &&
(listenPort >= _maxAssignmentClientForks + _childMinListenPort)) { (listenPort >= _maxAssignmentClientForks + _childMinListenPort)) {
listenPort = INVALID_PORT; listenPort = 0;
qDebug() << "Insufficient listen ports"; qDebug() << "Insufficient listen ports";
break; break;
} }
} }
} }
if (listenPort != INVALID_PORT) { if (listenPort) {
_childListenPorts.insert(listenPort); _childListenPorts.insert(listenPort);
} }
@ -199,7 +199,7 @@ void AssignmentClientMonitor::spawnChildClient() {
_childArguments.append(QString::number(_requestAssignmentType)); _childArguments.append(QString::number(_requestAssignmentType));
} }
if (listenPort != INVALID_PORT) { if (listenPort) {
_childArguments.append("-" + ASSIGNMENT_CLIENT_LISTEN_PORT_OPTION); _childArguments.append("-" + ASSIGNMENT_CLIENT_LISTEN_PORT_OPTION);
_childArguments.append(QString::number(listenPort)); _childArguments.append(QString::number(listenPort));
} }