Style fixes in TCP code; remove MIN and PAIR from util.h.

* Moved PAIR to toxav, where it's used (but really this should die).
* Replace most MIN calls with typed `min_*` calls. Didn't replace the
  ones where the desired semantics are unclear. Moved the MIN macro to
  the one place where it's still used.
* Avoid assignments in `while` loops. Instead, factored out the loop body
  into a separate `bool`-returning function.
* Use named types for callbacks (`_cb` types).
* Avoid assignments in `if` conditions.
* Removed `MAKE_REALLOC` and expanded its two calls. We can't have
  templates in C, and this fake templating is ugly and hard to analyse
  and debug (it expands on a single line).
* Moved epoll system include to the .c file, out of the .h file.
* Avoid assignments in expressions (`a = b = c;`).
* Avoid multiple declarators per struct member declaration.
* Fix naming inconsistencies.
* Replace `net_to_host` macro with function.

1 files changed, 6 insertions, 16 deletions

diff --git a/toxcore/TCP_server.h b/toxcore/TCP_server.h
index c8cbeda0..632a5e79 100644
--- a/toxcore/TCP_server.h
+++ b/toxcore/TCP_server.h
@@ -28,10 +28,6 @@
 #include "list.h"
 #include "onion.h"
 
-#ifdef TCP_SERVER_USE_EPOLL
-#include <sys/epoll.h>
-#endif
-
 #define MAX_INCOMING_CONNECTIONS 256
 
 #define TCP_MAX_BACKLOG MAX_INCOMING_CONNECTIONS
@@ -63,25 +59,19 @@
 #define TCP_PING_FREQUENCY 30
 #define TCP_PING_TIMEOUT 10
 
-#ifdef TCP_SERVER_USE_EPOLL
-#define TCP_SOCKET_LISTENING 0
-#define TCP_SOCKET_INCOMING 1
-#define TCP_SOCKET_UNCONFIRMED 2
-#define TCP_SOCKET_CONFIRMED 3
-#endif
-
-enum {
+typedef enum TCP_Status {
     TCP_STATUS_NO_STATUS,
     TCP_STATUS_CONNECTED,
     TCP_STATUS_UNCONFIRMED,
     TCP_STATUS_CONFIRMED,
-};
+} TCP_Status;
 
 typedef struct TCP_Priority_List TCP_Priority_List;
 
 struct TCP_Priority_List {
     TCP_Priority_List *next;
-    uint16_t size, sent;
+    uint16_t size;
+    uint16_t sent;
     uint8_t data[];
 };
 
@@ -97,11 +87,11 @@ TCP_Server *new_TCP_server(uint8_t ipv6_enabled, uint16_t num_sockets, const uin
 
 /* Run the TCP_server
  */
-void do_TCP_server(TCP_Server *TCP_server);
+void do_TCP_server(TCP_Server *tcp_server);
 
 /* Kill the TCP server
  */
-void kill_TCP_server(TCP_Server *TCP_server);
+void kill_TCP_server(TCP_Server *tcp_server);
 
 /* Read the next two bytes in TCP stream then convert them to
  * length (host byte order).