Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

various warning/errorwarning fixes for gcc47

Browse Source 
. warnings (sometimes promoted to errors) in servers/ and kernel/
 . -Os for ext2 boot module to make it small enough
This commit is contained in:
Ben Gras
2012-08-27 16:19:18 +02:00
parent 2af02e0d5d
commit e4ac80eb60
20 changed files with 23 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
servers/inet/generic/ip_read.c
+1 -2
View File
@@ -71,7 +71,7 @@ acc_t *pack;
ip_hdr_t *pack_hdr;
{
ip_ass_t *ass_ent;
size_t pack_hdr_len, pack_offset, tmp_offset;
size_t pack_offset, tmp_offset;
u16_t pack_flags_fragoff;
acc_t *prev_acc, *curr_acc, *next_acc, *head_acc, *tmp_acc;
ip_hdr_t *tmp_hdr;
@@ -81,7 +81,6 @@ ip_hdr_t *pack_hdr;
pack_hdr->ih_proto, pack_hdr->ih_src, pack_hdr->ih_dst);
pack_flags_fragoff= ntohs(pack_hdr->ih_flags_fragoff);
pack_hdr_len= (pack_hdr->ih_vers_ihl & IH_IHL_MASK) * 4;
pack_offset= (pack_flags_fragoff & IH_FRAGOFF_MASK)*8;
pack->acc_ext_link= NULL;
servers/inet/generic/tcp_recv.c
+1 -9
View File
@@ -34,15 +34,11 @@ size_t data_len;
{
tcp_fd_t *connuser;
int tcp_hdr_flags;
int ip_hdr_len, tcp_hdr_len;
u32_t seg_ack, seg_seq, rcv_hi, snd_una, snd_nxt;
u16_t seg_wnd, mtu;
size_t mss;
int acceptable_ACK, segm_acceptable, send_rst, close_connection;
ip_hdr_len= (ip_hdr->ih_vers_ihl & IH_IHL_MASK) << 2;
tcp_hdr_len= (tcp_hdr->th_data_off & TH_DO_MASK) >> 2;
tcp_hdr_flags= tcp_hdr->th_flags & TH_FLAGS_MASK;
seg_ack= ntohl(tcp_hdr->th_ack_nr);
seg_seq= ntohl(tcp_hdr->th_seq_nr);
@@ -1394,12 +1390,9 @@ unsigned
tcp_sel_read(tcp_conn)
tcp_conn_t *tcp_conn;
{
tcp_fd_t *tcp_fd;
size_t data_size;
int fin_recv, urg, push;
tcp_fd= tcp_conn->tc_fd;
if (tcp_conn->tc_state == TCS_CLOSED)
return 1;
@@ -1449,7 +1442,7 @@ int *bytesp;
{
tcp_conn_t *tcp_conn;
size_t data_size;
int fin_recv, urg, push;
int fin_recv, urg;
*bytesp= 0; /* The default is that nothing is available */
@@ -1461,7 +1454,6 @@ int *bytesp;
return;
urg= tcp_Gmod4G(tcp_conn->tc_RCV_UP, tcp_conn->tc_RCV_LO);
push= (tcp_conn->tc_flags & TCF_RCV_PUSH);
fin_recv= (tcp_conn->tc_flags & TCF_FIN_RECV);
data_size= tcp_conn->tc_RCV_NXT-tcp_conn->tc_RCV_LO;