[Qemu-devel] [PATCH 15/18] slirp: Reindent after refactoring

[Samuel Thibault]

No code change.

Signed-off-by: Guillaume Subiron <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
---
 slirp/slirp.h      |  3 +-
 slirp/tcp_input.c  | 95 +++++++++++++++++++++++++++---------------------------
 slirp/tcp_output.c | 29 ++++++++---------
 slirp/tcp_subr.c   | 50 ++++++++++++++--------------
 4 files changed, 89 insertions(+), 88 deletions(-)

diff --git a/slirp/slirp.h b/slirp/slirp.h
index 4952f5c..1c3acb5 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -363,7 +363,8 @@ void tcp_setpersist(register struct tcpcb *);
 void tcp_init(Slirp *);
 void tcp_cleanup(Slirp *);
 void tcp_template(struct tcpcb *);
-void tcp_respond(struct tcpcb *, register struct tcpiphdr *, register struct 
mbuf *, tcp_seq, tcp_seq, int, sa_family_t);
+void tcp_respond(struct tcpcb *, register struct tcpiphdr *,
+        register struct mbuf *, tcp_seq, tcp_seq, int, sa_family_t);
 struct tcpcb * tcp_newtcpcb(struct socket *);
 struct tcpcb * tcp_close(register struct tcpcb *);
 void tcp_sockclosed(struct tcpcb *);
diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c
index 48b7fc6..3409557 100644
--- a/slirp/tcp_input.c
+++ b/slirp/tcp_input.c
@@ -256,48 +256,48 @@ tcp_input(struct mbuf *m, int iphlen, struct socket 
*inso, sa_family_t af)
 
        switch (af) {
        case AF_INET:
-       if (iphlen > sizeof(struct ip )) {
-         ip_stripoptions(m, (struct mbuf *)0);
-         iphlen=sizeof(struct ip );
-       }
-       /* XXX Check if too short */
+           if (iphlen > sizeof(struct ip)) {
+               ip_stripoptions(m, (struct mbuf *)0);
+               iphlen = sizeof(struct ip);
+           }
+           /* XXX Check if too short */
 
 
-       /*
-        * Save a copy of the IP header in case we want restore it
-        * for sending an ICMP error message in response.
-        */
-       ip=mtod(m, struct ip *);
-       save_ip = *ip;
-       save_ip.ip_len+= iphlen;
+           /*
+            * Save a copy of the IP header in case we want restore it
+            * for sending an ICMP error message in response.
+            */
+           ip = mtod(m, struct ip *);
+           save_ip = *ip;
+           save_ip.ip_len += iphlen;
 
-       /*
-        * Get IP and TCP header together in first mbuf.
-        * Note: IP leaves IP header in first mbuf.
-        */
-       m->m_data -= sizeof(struct tcpiphdr) - (sizeof(struct ip)
-                                            + sizeof(struct tcphdr));
-       m->m_len += sizeof(struct tcpiphdr) - (sizeof(struct ip)
-                                           + sizeof(struct tcphdr));
-       ti = mtod(m, struct tcpiphdr *);
+           /*
+            * Get IP and TCP header together in first mbuf.
+            * Note: IP leaves IP header in first mbuf.
+            */
+           m->m_data -= sizeof(struct tcpiphdr) - (sizeof(struct ip)
+                                                + sizeof(struct tcphdr));
+           m->m_len  += sizeof(struct tcpiphdr) - (sizeof(struct ip)
+                                                + sizeof(struct tcphdr));
+           ti = mtod(m, struct tcpiphdr *);
 
-       /*
-        * Checksum extended TCP header and data.
-        */
-       tlen = ip->ip_len;
-       tcpiphdr2qlink(ti)->next = tcpiphdr2qlink(ti)->prev = NULL;
-       memset(&ti->ih_mbuf, 0 , sizeof(struct mbuf_ptr));
-       memset(&ti->ti, 0, sizeof(ti->ti));
-       ti->ti_x0 = 0;
-       ti->ti_src = save_ip.ip_src;
-       ti->ti_dst = save_ip.ip_dst;
-       ti->ti_pr = save_ip.ip_p;
-       ti->ti_len = htons((uint16_t)tlen);
-       len = ((sizeof(struct tcpiphdr) - sizeof(struct tcphdr)) + tlen);
-       if(cksum(m, len)) {
-         goto drop;
-       }
-       break;
+           /*
+            * Checksum extended TCP header and data.
+            */
+           tlen = ip->ip_len;
+           tcpiphdr2qlink(ti)->next = tcpiphdr2qlink(ti)->prev = NULL;
+           memset(&ti->ih_mbuf, 0 , sizeof(struct mbuf_ptr));
+           memset(&ti->ti, 0, sizeof(ti->ti));
+           ti->ti_x0 = 0;
+           ti->ti_src = save_ip.ip_src;
+           ti->ti_dst = save_ip.ip_dst;
+           ti->ti_pr = save_ip.ip_p;
+           ti->ti_len = htons((uint16_t)tlen);
+           len = ((sizeof(struct tcpiphdr) - sizeof(struct tcphdr)) + tlen);
+           if (cksum(m, len)) {
+               goto drop;
+           }
+           break;
 
        default:
            goto drop;
@@ -341,10 +341,10 @@ findso:
        fhost.ss_family = af;
        switch (af) {
        case AF_INET:
-       ((struct sockaddr_in *)&lhost)->sin_addr = ti->ti_src;
-       ((struct sockaddr_in *)&lhost)->sin_port = ti->ti_sport;
-       ((struct sockaddr_in *)&fhost)->sin_addr = ti->ti_dst;
-       ((struct sockaddr_in *)&fhost)->sin_port = ti->ti_dport;
+           ((struct sockaddr_in *)&lhost)->sin_addr = ti->ti_src;
+           ((struct sockaddr_in *)&lhost)->sin_port = ti->ti_sport;
+           ((struct sockaddr_in *)&fhost)->sin_addr = ti->ti_dst;
+           ((struct sockaddr_in *)&fhost)->sin_port = ti->ti_dport;
            break;
        default:
            goto drop;
@@ -402,7 +402,7 @@ findso:
          if (so->so_iptos == 0) {
              switch (af) {
              case AF_INET:
-           so->so_iptos = ((struct ip *)ti)->ip_tos;
+                 so->so_iptos = ((struct ip *)ti)->ip_tos;
                  break;
              default:
                  goto drop;
@@ -588,8 +588,8 @@ findso:
           * tcp_ctl once connected, otherwise connect
           */
          if (af == AF_INET &&
-             (so->so_faddr.s_addr & slirp->vnetwork_mask.s_addr) ==
-             slirp->vnetwork_addr.s_addr) {
+                (so->so_faddr.s_addr & slirp->vnetwork_mask.s_addr) ==
+                slirp->vnetwork_addr.s_addr) {
            if (so->so_faddr.s_addr != slirp->vhost_addr.s_addr &&
                so->so_faddr.s_addr != slirp->vnameserver_addr.s_addr) {
                /* May be an add exec */
@@ -632,7 +632,7 @@ findso:
              m->m_len  += sizeof(struct tcpiphdr)+off-sizeof(struct tcphdr);
              switch (af) {
              case AF_INET:
-             *ip=save_ip;
+                 *ip = save_ip;
                  break;
              default:
                  goto drop;
@@ -1506,7 +1506,8 @@ tcp_mss(struct tcpcb *tp, u_int offer)
 
        switch (so->so_ffamily) {
        case AF_INET:
-       mss = min(IF_MTU, IF_MRU) - sizeof(struct tcphdr) + sizeof(struct ip);
+           mss = min(IF_MTU, IF_MRU) - sizeof(struct tcphdr)
+                                     + sizeof(struct ip);
            break;
        default:
            /* :TODO:maethor:130319: ??? */
diff --git a/slirp/tcp_output.c b/slirp/tcp_output.c
index 1f5417d..ce0d0e6 100644
--- a/slirp/tcp_output.c
+++ b/slirp/tcp_output.c
@@ -451,21 +451,20 @@ send:
 
        switch (so->so_ffamily) {
        case AF_INET:
-       m->m_data += sizeof(struct tcpiphdr) - sizeof(struct tcphdr)
-                                            - sizeof(struct ip);
-       m->m_len  -= sizeof(struct tcpiphdr) - sizeof(struct tcphdr)
-                                            - sizeof(struct ip);
-       ip = mtod(m, struct ip *);
-
-       ip->ip_len = m->m_len;
-       ip->ip_dst = tcpiph_save.ti_dst;
-       ip->ip_src = tcpiph_save.ti_src;
-       ip->ip_p = tcpiph_save.ti_pr;
-
-       ip->ip_ttl = IPDEFTTL;
-       ip->ip_tos = so->so_iptos;
-
-       error = ip_output(so, m);
+           m->m_data += sizeof(struct tcpiphdr) - sizeof(struct tcphdr)
+                                                - sizeof(struct ip);
+           m->m_len  -= sizeof(struct tcpiphdr) - sizeof(struct tcphdr)
+                                                - sizeof(struct ip);
+           ip = mtod(m, struct ip *);
+
+           ip->ip_len = m->m_len;
+           ip->ip_dst = tcpiph_save.ti_dst;
+           ip->ip_src = tcpiph_save.ti_src;
+           ip->ip_p = tcpiph_save.ti_pr;
+
+           ip->ip_ttl = IPDEFTTL;
+           ip->ip_tos = so->so_iptos;
+           error = ip_output(so, m);
            break;
 
        default:
diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
index 02a3abe..7d7e2ce 100644
--- a/slirp/tcp_subr.c
+++ b/slirp/tcp_subr.c
@@ -79,12 +79,12 @@ tcp_template(struct tcpcb *tp)
        n->ti_x0 = 0;
        switch (so->so_ffamily) {
        case AF_INET:
-       n->ti_pr = IPPROTO_TCP;
-       n->ti_len = htons(sizeof(struct tcphdr));
-       n->ti_src = so->so_faddr;
-       n->ti_dst = so->so_laddr;
-       n->ti_sport = so->so_fport;
-       n->ti_dport = so->so_lport;
+           n->ti_pr = IPPROTO_TCP;
+           n->ti_len = htons(sizeof(struct tcphdr));
+           n->ti_src = so->so_faddr;
+           n->ti_dst = so->so_laddr;
+           n->ti_sport = so->so_fport;
+           n->ti_dport = so->so_lport;
            break;
 
        default:
@@ -153,8 +153,8 @@ tcp_respond(struct tcpcb *tp, struct tcpiphdr *ti, struct 
mbuf *m,
 #define xchg(a,b,type) { type t; t=a; a=b; b=t; }
                switch (af) {
                case AF_INET:
-               xchg(ti->ti_dst.s_addr, ti->ti_src.s_addr, uint32_t);
-               xchg(ti->ti_dport, ti->ti_sport, uint16_t);
+                   xchg(ti->ti_dst.s_addr, ti->ti_src.s_addr, uint32_t);
+                   xchg(ti->ti_dport, ti->ti_sport, uint16_t);
                    break;
                default:
                    /* :TODO:maethor:130321: ? */
@@ -186,23 +186,23 @@ tcp_respond(struct tcpcb *tp, struct tcpiphdr *ti, struct 
mbuf *m,
 
        switch (af) {
        case AF_INET:
-       m->m_data += sizeof(struct tcpiphdr) - sizeof(struct tcphdr)
-                                            - sizeof(struct ip);
-       m->m_len  -= sizeof(struct tcpiphdr) - sizeof(struct tcphdr)
-                                            - sizeof(struct ip);
-       ip = mtod(m, struct ip *);
-       ip->ip_len = tlen;
-       ip->ip_dst = tcpiph_save.ti_dst;
-       ip->ip_src = tcpiph_save.ti_src;
-       ip->ip_p = tcpiph_save.ti_pr;
-
-       if (flags & TH_RST) {
-               ip->ip_ttl = MAXTTL;
-       } else {
-               ip->ip_ttl = IPDEFTTL;
-       }
-
-       (void) ip_output((struct socket *)0, m);
+           m->m_data += sizeof(struct tcpiphdr) - sizeof(struct tcphdr)
+                                                - sizeof(struct ip);
+           m->m_len  -= sizeof(struct tcpiphdr) - sizeof(struct tcphdr)
+                                                - sizeof(struct ip);
+           ip = mtod(m, struct ip *);
+           ip->ip_len = tlen;
+           ip->ip_dst = tcpiph_save.ti_dst;
+           ip->ip_src = tcpiph_save.ti_src;
+           ip->ip_p = tcpiph_save.ti_pr;
+
+           if (flags & TH_RST) {
+               ip->ip_ttl = MAXTTL;
+           } else {
+               ip->ip_ttl = IPDEFTTL;
+           }
+
+           (void) ip_output((struct socket *)0, m);
            break;
 
        default:
-- 
2.4.6