izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always use std::min, std::max.

Browse Source
This commit is contained in:
John Hood
2018-08-15 01:44:54 -04:00
parent e5f8a826ef
commit fb23168ed9
5 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontend/mosh-server.cc
+4 -4
View File
@@ -682,11 +682,11 @@ static void serve( int host_fd, Terminal::Complete &terminal, ServerConnection &
int timeout = INT_MAX;
uint64_t now = Network::timestamp();
timeout = min( timeout, network.wait_time() );
timeout = min( timeout, terminal.wait_time( now ) );
timeout = std::min( timeout, network.wait_time() );
timeout = std::min( timeout, terminal.wait_time( now ) );
if ( (!network.get_remote_state_num())
|| network.shutdown_in_progress() ) {
timeout = min( timeout, 5000 );
timeout = std::min( timeout, 5000 );
}
/*
* The server goes completely asleep if it has no remote peer.
@@ -701,7 +701,7 @@ static void serve( int host_fd, Terminal::Complete &terminal, ServerConnection &
/* 24 days might be too soon. That's OK. */
network_sleep = INT_MAX;
}
timeout = min( timeout, static_cast<int>(network_sleep) );
timeout = std::min( timeout, static_cast<int>(network_sleep) );
}
/* poll for events */