Reinstate the new signal handling; revert the revert.

[cubemap] / serverpool.cpp

diff --git a/serverpool.cpp b/serverpool.cpp
index 68281996847fa5686158d50e33b588f198d330d6..e309ab99cecdae61b27faa77c55b5184ba473f4a 100644 (file)
--- a/serverpool.cpp
+++ b/serverpool.cpp
@@ -1,5 +1,8 @@
-#include <unistd.h>
+#include <assert.h>
 #include <errno.h>
+#include <google/protobuf/repeated_field.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 #include "client.h"
 #include "log.h"
@@ -89,15 +92,7 @@ void ServerPool::add_stream_from_serialized(const StreamProto &stream, const vec
 
        // Close and delete any leftovers, if the number of servers was reduced.
        for (size_t i = num_servers; i < data_fds.size(); ++i) {
-               int ret;
-               do {
-                       ret = close(data_fds[i]);  // Implicitly deletes the file.
-               } while (ret == -1 && errno == EINTR);
-
-               if (ret == -1) {
-                       log_perror("close");
-                       // Can still continue.
-               }
+               safe_close(data_fds[i]);  // Implicitly deletes the file.
        }
 }