From 377d412264e6422c80e525bfbc6555c54ba7c93c Mon Sep 17 00:00:00 2001 From: Roxanne Skelly Date: Mon, 8 Apr 2019 16:29:42 -0700 Subject: [PATCH] Fix mac/ubuntu compiler warning --- assignment-client/src/AssignmentClientApp.cpp | 2 +- assignment-client/src/AssignmentClientMonitor.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/assignment-client/src/AssignmentClientApp.cpp b/assignment-client/src/AssignmentClientApp.cpp index 0b2f4c9295..a87200dc5b 100644 --- a/assignment-client/src/AssignmentClientApp.cpp +++ b/assignment-client/src/AssignmentClientApp.cpp @@ -199,7 +199,7 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) : assignmentServerPort = parser.value(assignmentServerPortOption).toInt(); } - quint16 childMinListenPort = INVALID_PORT; + quint16 childMinListenPort = 0; if (argumentVariantMap.contains(ASSIGNMENT_MONITOR_MIN_CHILDREN_LISTEN_PORT_OPTION)) { childMinListenPort = argumentVariantMap.value(ASSIGNMENT_MONITOR_MIN_CHILDREN_LISTEN_PORT_OPTION).toUInt(); } diff --git a/assignment-client/src/AssignmentClientMonitor.cpp b/assignment-client/src/AssignmentClientMonitor.cpp index c662ffeb03..918c89527f 100644 --- a/assignment-client/src/AssignmentClientMonitor.cpp +++ b/assignment-client/src/AssignmentClientMonitor.cpp @@ -105,7 +105,7 @@ void AssignmentClientMonitor::childProcessFinished(qint64 pid, quint16 listenPor auto message = "Child process " + QString::number(pid) + " on port " + QString::number(listenPort) + "has %1 with exit code " + QString::number(exitCode) + "."; - if (listenPort != INVALID_PORT) { + if (listenPort) { _childListenPorts.remove(listenPort); } @@ -159,20 +159,20 @@ void AssignmentClientMonitor::aboutToQuit() { void AssignmentClientMonitor::spawnChildClient() { QProcess* assignmentClient = new QProcess(this); - quint16 listenPort = INVALID_PORT; + quint16 listenPort = 0; // allocate a port - if (_childMinListenPort != INVALID_PORT) { + if (_childMinListenPort) { for (listenPort = _childMinListenPort; _childListenPorts.contains(listenPort); listenPort++) { if (_maxAssignmentClientForks && (listenPort >= _maxAssignmentClientForks + _childMinListenPort)) { - listenPort = INVALID_PORT; + listenPort = 0; qDebug() << "Insufficient listen ports"; break; } } } - if (listenPort != INVALID_PORT) { + if (listenPort) { _childListenPorts.insert(listenPort); } @@ -199,7 +199,7 @@ void AssignmentClientMonitor::spawnChildClient() { _childArguments.append(QString::number(_requestAssignmentType)); } - if (listenPort != INVALID_PORT) { + if (listenPort) { _childArguments.append("-" + ASSIGNMENT_CLIENT_LISTEN_PORT_OPTION); _childArguments.append(QString::number(listenPort)); }