Prechádzať zdrojové kódy

tcp: minor cleanups & spelling

- removed F_CONN_NON_BLOCKING (not used anymore)
- spelling & whitespace cleanups
Andrei Pelinescu-Onciul 15 rokov pred
rodič
commit
7f1b8eb817
3 zmenil súbory, kde vykonal 3 pridanie a 4 odobranie
  1. 0 1
      tcp_conn.h
  2. 2 2
      tcp_main.c
  3. 1 1
      tcp_read.c

+ 0 - 1
tcp_conn.h

@@ -61,7 +61,6 @@
 
 
 /* tcp connection flags */
-#define F_CONN_NON_BLOCKING 1
 #define F_CONN_READ_W       2 /* watched for READ ev. in main */
 #define F_CONN_WRITE_W      4 /* watched for WRITE (main) */
 #define F_CONN_READER       8 /* handled by a tcp reader */

+ 2 - 2
tcp_main.c

@@ -3750,9 +3750,9 @@ inline static int handle_tcpconn_ev(struct tcp_connection* tcpconn, short ev,
 #ifdef TCP_ASYNC
 send_to_child:
 #endif
-		DBG("tcp: DBG: sendig to child, events %x\n", ev);
+		DBG("tcp: DBG: sending to child, events %x\n", ev);
 #ifdef POLLRDHUP
-		tcpconn->flags|=((int)!(ev & (POLLRDHUP|POLLHUP|POLLERR)) -1) & 
+		tcpconn->flags|=((int)!(ev & (POLLRDHUP|POLLHUP|POLLERR)) -1) &
 							F_CONN_EOF_SEEN;
 #else /* POLLRDHUP */
 		tcpconn->flags|=((int)!(ev & (POLLHUP|POLLERR)) -1) & F_CONN_EOF_SEEN;

+ 1 - 1
tcp_read.c

@@ -928,7 +928,7 @@ again:
 			}
 			/* if we received the fd there is most likely data waiting to
 			 * be read => process it first to avoid extra sys calls */
-			read_flags=((con->flags & (F_CONN_EOF_SEEN|F_CONN_FORCE_EOF)) && 
+			read_flags=((con->flags & (F_CONN_EOF_SEEN|F_CONN_FORCE_EOF)) &&
 						!(con->flags & F_CONN_OOB_DATA))? RD_CONN_FORCE_EOF
 						:0;
 			resp=tcp_read_req(con, &n, &read_flags);