From be0210f544d8a4c5bc6319ad7f5c94480989b7c9 Mon Sep 17 00:00:00 2001 From: garden Date: Sun, 12 Oct 2014 20:17:24 +0000 Subject: [PATCH] In 2014, I think we can stop trying to outsmart the compiler. Remove "register" storage class. git-svn-id: https://svn.code.sf.net/p/vde/svn/trunk@582 d37a7db1-d92d-0410-89df-f68f52f87b57 --- vde-2/src/common/poll.c | 4 +-- vde-2/src/dpipe.c | 2 +- vde-2/src/kvde_switch/consmgmt.c | 12 ++++----- vde-2/src/kvde_switch/kvde_switch.c | 14 +++++----- vde-2/src/lib/libvdehist.c | 2 +- vde-2/src/lib/libvdeplug.c | 2 +- vde-2/src/slirpvde/cksum.c | 4 +-- vde-2/src/slirpvde/ip_icmp.c | 14 +++++----- vde-2/src/slirpvde/ip_input.c | 30 ++++++++++----------- vde-2/src/slirpvde/ip_output.c | 8 +++--- vde-2/src/slirpvde/mbuf.c | 2 +- vde-2/src/slirpvde/mbuf.h | 2 +- vde-2/src/slirpvde/misc.c | 6 ++--- vde-2/src/slirpvde/slirp.h | 14 +++++----- vde-2/src/slirpvde/slirpvde.c | 4 +-- vde-2/src/slirpvde/socket.h | 4 +-- vde-2/src/slirpvde/tcp_input.c | 20 +++++++------- vde-2/src/slirpvde/tcp_output.c | 8 +++--- vde-2/src/slirpvde/tcp_subr.c | 10 +++---- vde-2/src/slirpvde/tcp_timer.c | 18 ++++++------- vde-2/src/slirpvde/udp.c | 8 +++--- vde-2/src/slirpvde/udp.h | 2 +- vde-2/src/vde_autolink.c | 2 +- vde-2/src/vde_cryptcab/crc32.c | 4 +-- vde-2/src/vde_l3/vde_l3.c | 2 +- vde-2/src/vde_plug.c | 4 +-- vde-2/src/vde_router/rbtree.c | 8 +++--- vde-2/src/vde_switch/bitarray.h | 52 ++++++++++++++++++------------------- vde-2/src/vde_switch/consmgmt.c | 12 ++++----- vde-2/src/vde_switch/fstp.c | 16 ++++++------ vde-2/src/vde_switch/hash.c | 6 ++--- vde-2/src/vde_switch/port.c | 34 ++++++++++++------------ vde-2/src/vde_switch/qtimer.c | 8 +++--- vde-2/src/vde_switch/vde_switch.c | 20 +++++++------- vde-2/src/vde_vxlan/vxlan_hash.c | 4 +-- vde-2/src/vdeq.c | 18 ++++++------- vde-2/src/vdetaplib/libvdetap.c | 2 +- vde-2/src/vdetaplib/vdetap.c | 2 +- vde-2/src/wirefilter.c | 4 +-- 39 files changed, 194 insertions(+), 194 deletions(-) diff --git a/vde-2/src/common/poll.c b/vde-2/src/common/poll.c index 61b1c81..c471304 100644 --- a/vde-2/src/common/poll.c +++ b/vde-2/src/common/poll.c @@ -22,7 +22,7 @@ static int prepare_select(struct pollfd *ufds, nfds_t nfds, int timeout, struct timeval **pstimeout, int *maxfdp1, fd_set *rfds, fd_set *wfds, fd_set *efds) { - register int i; + int i; struct pollfd *currfd; struct timeval *stimeout = *pstimeout; @@ -93,7 +93,7 @@ static int prepare_select(struct pollfd *ufds, nfds_t nfds, int timeout, static int convert_results(struct pollfd *ufds, int nfds, fd_set *rfds, fd_set *wfds, fd_set *efds) { - register int i; + int i; struct pollfd *currfd; int retval = 0; diff --git a/vde-2/src/dpipe.c b/vde-2/src/dpipe.c index ef47d88..e53ce99 100644 --- a/vde-2/src/dpipe.c +++ b/vde-2/src/dpipe.c @@ -29,7 +29,7 @@ static char *progname; int splitindex(int argc, char *argv[], int *dirchar) { - register int i; + int i; for (i=0; iip_off &~ IP_DF) { - register struct ipq *fp; + struct ipq *fp; struct qlink *l; /* * Look for queue of fragments @@ -240,8 +240,8 @@ bad: static struct ip * ip_reass(Slirp *slirp, struct ip *ip, struct ipq *fp) { - register struct mbuf *m = dtom(slirp, ip); - register struct ipasfrag *q; + struct mbuf *m = dtom(slirp, ip); + struct ipasfrag *q; int hlen = ip->ip_hl << 2; int i, next; @@ -395,7 +395,7 @@ dropfrag: static void ip_freef(Slirp *slirp, struct ipq *fp) { - register struct ipasfrag *q, *p; + struct ipasfrag *q, *p; for (q = fp->frag_link.next; q != (struct ipasfrag*)&fp->frag_link; q = p) { p = q->ipf_next; @@ -411,7 +411,7 @@ ip_freef(Slirp *slirp, struct ipq *fp) * Like insque, but pointers in middle of structure. */ static void -ip_enq(register struct ipasfrag *p, register struct ipasfrag *prev) +ip_enq(struct ipasfrag *p, struct ipasfrag *prev) { DEBUG_CALL("ip_enq"); DEBUG_ARG("prev = %lx", (long)prev); @@ -425,7 +425,7 @@ ip_enq(register struct ipasfrag *p, register struct ipasfrag *prev) * To ip_enq as remque is to insque. */ static void -ip_deq(register struct ipasfrag *p) +ip_deq(struct ipasfrag *p) { ((struct ipasfrag *)(p->ipf_prev))->ipf_next = p->ipf_next; ((struct ipasfrag *)(p->ipf_next))->ipf_prev = p->ipf_prev; @@ -471,10 +471,10 @@ int ip_dooptions(m) struct mbuf *m; { - register struct ip *ip = mtod(m, struct ip *); + struct ip *ip = mtod(m, struct ip *); register u_char *cp; - register struct ip_timestamp *ipt; - register struct in_ifaddr *ia; + struct ip_timestamp *ipt; + struct in_ifaddr *ia; int opt, optlen, cnt, off, code, type, forward = 0; struct in_addr *sin, dst; typedef u_int32_t n_time; @@ -665,9 +665,9 @@ bad: * (XXX) should be deleted; last arg currently ignored. */ void -ip_stripoptions(register struct mbuf *m, struct mbuf *mopt) +ip_stripoptions(struct mbuf *m, struct mbuf *mopt) { - register int i; + int i; struct ip *ip = mtod(m, struct ip *); register caddr_t opts; int olen; diff --git a/vde-2/src/slirpvde/ip_output.c b/vde-2/src/slirpvde/ip_output.c index dba2784..b2ea1df 100644 --- a/vde-2/src/slirpvde/ip_output.c +++ b/vde-2/src/slirpvde/ip_output.c @@ -54,9 +54,9 @@ int ip_output(struct socket *so, struct mbuf *m0) { Slirp *slirp = m0->slirp; - register struct ip *ip; - register struct mbuf *m = m0; - register int hlen = sizeof(struct ip ); + struct ip *ip; + struct mbuf *m = m0; + int hlen = sizeof(struct ip ); int len, off, error = 0; DEBUG_CALL("ip_output"); @@ -111,7 +111,7 @@ ip_output(struct socket *so, struct mbuf *m0) m0 = m; mhlen = sizeof (struct ip); for (off = hlen + len; off < (u_int16_t)ip->ip_len; off += len) { - register struct ip *mhip; + struct ip *mhip; m = m_get(slirp); if (m == NULL) { error = -1; diff --git a/vde-2/src/slirpvde/mbuf.c b/vde-2/src/slirpvde/mbuf.c index 87508ba..f2ceb33 100644 --- a/vde-2/src/slirpvde/mbuf.c +++ b/vde-2/src/slirpvde/mbuf.c @@ -43,7 +43,7 @@ m_init(Slirp *slirp) struct mbuf * m_get(Slirp *slirp) { - register struct mbuf *m; + struct mbuf *m; int flags = 0; DEBUG_CALL("m_get"); diff --git a/vde-2/src/slirpvde/mbuf.h b/vde-2/src/slirpvde/mbuf.h index 97729e2..038062a 100644 --- a/vde-2/src/slirpvde/mbuf.h +++ b/vde-2/src/slirpvde/mbuf.h @@ -118,7 +118,7 @@ struct mbuf { void m_init(Slirp *); struct mbuf * m_get(Slirp *); void m_free(struct mbuf *); -void m_cat(register struct mbuf *, register struct mbuf *); +void m_cat(struct mbuf *, struct mbuf *); void m_inc(struct mbuf *, int); void m_adj(struct mbuf *, int); int m_copy(struct mbuf *, struct mbuf *, int, int); diff --git a/vde-2/src/slirpvde/misc.c b/vde-2/src/slirpvde/misc.c index 464903e..bd3497e 100644 --- a/vde-2/src/slirpvde/misc.c +++ b/vde-2/src/slirpvde/misc.c @@ -24,8 +24,8 @@ struct quehead { inline void insque(void *a, void *b) { - register struct quehead *element = (struct quehead *) a; - register struct quehead *head = (struct quehead *) b; + struct quehead *element = (struct quehead *) a; + struct quehead *head = (struct quehead *) b; element->qh_link = head->qh_link; head->qh_link = (struct quehead *)element; element->qh_rlink = (struct quehead *)head; @@ -36,7 +36,7 @@ insque(void *a, void *b) inline void remque(void *a) { - register struct quehead *element = (struct quehead *) a; + struct quehead *element = (struct quehead *) a; ((struct quehead *)(element->qh_link))->qh_rlink = element->qh_rlink; ((struct quehead *)(element->qh_rlink))->qh_link = element->qh_link; element->qh_rlink = NULL; diff --git a/vde-2/src/slirpvde/slirp.h b/vde-2/src/slirpvde/slirp.h index d377bf7..0067195 100644 --- a/vde-2/src/slirpvde/slirp.h +++ b/vde-2/src/slirpvde/slirp.h @@ -316,25 +316,25 @@ void if_output(struct socket *, struct mbuf *); void ip_init(Slirp *); void ip_input(struct mbuf *); void ip_slowtimo(Slirp *); -void ip_stripoptions(register struct mbuf *, struct mbuf *); +void ip_stripoptions(struct mbuf *, struct mbuf *); /* ip_output.c */ int ip_output(struct socket *, struct mbuf *); /* tcp_input.c */ -void tcp_input(register struct mbuf *, int, struct socket *); -int tcp_mss(register struct tcpcb *, u_int); +void tcp_input(struct mbuf *, int, struct socket *); +int tcp_mss(struct tcpcb *, u_int); /* tcp_output.c */ -int tcp_output(register struct tcpcb *); -void tcp_setpersist(register struct tcpcb *); +int tcp_output(struct tcpcb *); +void tcp_setpersist(struct tcpcb *); /* tcp_subr.c */ void tcp_init(Slirp *); void tcp_template(struct tcpcb *); -void tcp_respond(struct tcpcb *, register struct tcpiphdr *, register struct mbuf *, tcp_seq, tcp_seq, int); +void tcp_respond(struct tcpcb *, struct tcpiphdr *, struct mbuf *, tcp_seq, tcp_seq, int); struct tcpcb * tcp_newtcpcb(struct socket *); -struct tcpcb * tcp_close(register struct tcpcb *); +struct tcpcb * tcp_close(struct tcpcb *); void tcp_sockclosed(struct tcpcb *); int tcp_fconnect(struct socket *); void tcp_connect(struct socket *); diff --git a/vde-2/src/slirpvde/slirpvde.c b/vde-2/src/slirpvde/slirpvde.c index a376c35..fb4ae91 100644 --- a/vde-2/src/slirpvde/slirpvde.c +++ b/vde-2/src/slirpvde/slirpvde.c @@ -138,7 +138,7 @@ int slirp_can_output(void *opaque) #define convery2ascii(x) ((x)>=' ' && (x) <= '~')?(x):'.' void dumppkt(const uint8_t *pkt, int pkt_len) { - register int i,j; + int i,j; printf("Packet dump len=%d\n",pkt_len); if (pkt_len == 0) return; @@ -354,7 +354,7 @@ int main(int argc, char **argv) char *sockname=NULL; int result,nfds; register ssize_t nx; - /*register int i;*/ + /*int i;*/ fd_set rs,ws,xs; int opt,longindx; int daemonize=0; diff --git a/vde-2/src/slirpvde/socket.h b/vde-2/src/slirpvde/socket.h index 6e85d03..19877a2 100644 --- a/vde-2/src/slirpvde/socket.h +++ b/vde-2/src/slirpvde/socket.h @@ -85,8 +85,8 @@ void sorecvfrom(struct socket *); int sosendto(struct socket *, struct mbuf *); struct socket * tcp_listen(Slirp *, u_int32_t, u_int, u_int32_t, u_int, int); -void soisfconnecting(register struct socket *); -void soisfconnected(register struct socket *); +void soisfconnecting(struct socket *); +void soisfconnected(struct socket *); void sofwdrain(struct socket *); struct iovec; /* For win32 */ size_t sopreprbuf(struct socket *so, struct iovec *iov, int *np); diff --git a/vde-2/src/slirpvde/tcp_input.c b/vde-2/src/slirpvde/tcp_input.c index 47cf0ad..9e512b6 100644 --- a/vde-2/src/slirpvde/tcp_input.c +++ b/vde-2/src/slirpvde/tcp_input.c @@ -99,13 +99,13 @@ #endif static void tcp_dooptions(struct tcpcb *tp, u_char *cp, int cnt, struct tcpiphdr *ti); -static void tcp_xmit_timer(register struct tcpcb *tp, int rtt); +static void tcp_xmit_timer(struct tcpcb *tp, int rtt); static int -tcp_reass(register struct tcpcb *tp, register struct tcpiphdr *ti, +tcp_reass(struct tcpcb *tp, struct tcpiphdr *ti, struct mbuf *m) { - register struct tcpiphdr *q; + struct tcpiphdr *q; struct socket *so = tp->t_socket; int flags; @@ -130,7 +130,7 @@ tcp_reass(register struct tcpcb *tp, register struct tcpiphdr *ti, * segment. If it provides all of our data, drop us. */ if (!tcpfrag_list_end(tcpiphdr_prev(q), tp)) { - register int i; + int i; q = tcpiphdr_prev(q); /* conversion to int (in i) handles seq wraparound */ i = q->ti_seq + q->ti_len - ti->ti_seq; @@ -158,7 +158,7 @@ tcp_reass(register struct tcpcb *tp, register struct tcpiphdr *ti, * if they are completely covered, dequeue them. */ while (!tcpfrag_list_end(q, tp)) { - register int i = (ti->ti_seq + ti->ti_len) - q->ti_seq; + int i = (ti->ti_seq + ti->ti_len) - q->ti_seq; if (i <= 0) break; if (i < q->ti_len) { @@ -216,12 +216,12 @@ void tcp_input(struct mbuf *m, int iphlen, struct socket *inso) { struct ip save_ip, *ip; - register struct tcpiphdr *ti; + struct tcpiphdr *ti; caddr_t optp = NULL; int optlen = 0; int len, tlen, off; - register struct tcpcb *tp = NULL; - register int tiflags; + struct tcpcb *tp = NULL; + int tiflags; struct socket *so = NULL; int todrop, acked, ourfinisacked, needoutput = 0; int iss = 0; @@ -1343,7 +1343,7 @@ void tcp_pulloutofband(so, ti, m) struct socket *so; struct tcpiphdr *ti; - register struct mbuf *m; + struct mbuf *m; { int cnt = ti->ti_urp - 1; @@ -1374,7 +1374,7 @@ tcp_pulloutofband(so, ti, m) */ static void -tcp_xmit_timer(register struct tcpcb *tp, int rtt) +tcp_xmit_timer(struct tcpcb *tp, int rtt) { register short delta; diff --git a/vde-2/src/slirpvde/tcp_output.c b/vde-2/src/slirpvde/tcp_output.c index 0d6011a..1b9bff8 100644 --- a/vde-2/src/slirpvde/tcp_output.c +++ b/vde-2/src/slirpvde/tcp_output.c @@ -55,11 +55,11 @@ static const u_char tcp_outflags[TCP_NSTATES] = { int tcp_output(struct tcpcb *tp) { - register struct socket *so = tp->t_socket; - register long len, win; + struct socket *so = tp->t_socket; + long len, win; int off, flags, error; - register struct mbuf *m; - register struct tcpiphdr *ti; + struct mbuf *m; + struct tcpiphdr *ti; u_char opt[MAX_TCPOPTLEN]; unsigned optlen, hdrlen; int idle, sendalot; diff --git a/vde-2/src/slirpvde/tcp_subr.c b/vde-2/src/slirpvde/tcp_subr.c index 1217cc6..63089e1 100644 --- a/vde-2/src/slirpvde/tcp_subr.c +++ b/vde-2/src/slirpvde/tcp_subr.c @@ -66,7 +66,7 @@ void tcp_template(struct tcpcb *tp) { struct socket *so = tp->t_socket; - register struct tcpiphdr *n = &tp->t_template; + struct tcpiphdr *n = &tp->t_template; n->ti_mbuf = NULL; n->ti_x1 = 0; @@ -104,7 +104,7 @@ void tcp_respond(struct tcpcb *tp, struct tcpiphdr *ti, struct mbuf *m, tcp_seq ack, tcp_seq seq, int flags) { - register int tlen; + int tlen; int win = 0; DEBUG_CALL("tcp_respond"); @@ -175,7 +175,7 @@ tcp_respond(struct tcpcb *tp, struct tcpiphdr *ti, struct mbuf *m, struct tcpcb * tcp_newtcpcb(struct socket *so) { - register struct tcpcb *tp; + struct tcpcb *tp; tp = (struct tcpcb *)malloc(sizeof(*tp)); if (tp == NULL) @@ -237,10 +237,10 @@ struct tcpcb *tcp_drop(struct tcpcb *tp, int err) struct tcpcb * tcp_close(struct tcpcb *tp) { - register struct tcpiphdr *t; + struct tcpiphdr *t; struct socket *so = tp->t_socket; Slirp *slirp = so->slirp; - register struct mbuf *m; + struct mbuf *m; DEBUG_CALL("tcp_close"); DEBUG_ARG("tp = %lx", (long )tp); diff --git a/vde-2/src/slirpvde/tcp_timer.c b/vde-2/src/slirpvde/tcp_timer.c index 6c5bb11..a7002c7 100644 --- a/vde-2/src/slirpvde/tcp_timer.c +++ b/vde-2/src/slirpvde/tcp_timer.c @@ -32,7 +32,7 @@ #include -static struct tcpcb *tcp_timers(register struct tcpcb *tp, int timer); +static struct tcpcb *tcp_timers(struct tcpcb *tp, int timer); /* * Fast timeout routine for processing delayed acks @@ -40,8 +40,8 @@ static struct tcpcb *tcp_timers(register struct tcpcb *tp, int timer); void tcp_fasttimo(Slirp *slirp) { - register struct socket *so; - register struct tcpcb *tp; + struct socket *so; + struct tcpcb *tp; DEBUG_CALL("tcp_fasttimo"); @@ -64,9 +64,9 @@ tcp_fasttimo(Slirp *slirp) void tcp_slowtimo(Slirp *slirp) { - register struct socket *ip, *ipnxt; - register struct tcpcb *tp; - register int i; + struct socket *ip, *ipnxt; + struct tcpcb *tp; + int i; DEBUG_CALL("tcp_slowtimo"); @@ -106,7 +106,7 @@ tpgone: void tcp_canceltimers(struct tcpcb *tp) { - register int i; + int i; for (i = 0; i < TCPT_NTIMERS; i++) tp->t_timer[i] = 0; @@ -119,9 +119,9 @@ const int tcp_backoff[TCP_MAXRXTSHIFT + 1] = * TCP timer processing. */ static struct tcpcb * -tcp_timers(register struct tcpcb *tp, int timer) +tcp_timers(struct tcpcb *tp, int timer) { - register int rexmt; + int rexmt; DEBUG_CALL("tcp_timers"); diff --git a/vde-2/src/slirpvde/udp.c b/vde-2/src/slirpvde/udp.c index b78d3d2..50e2e1f 100644 --- a/vde-2/src/slirpvde/udp.c +++ b/vde-2/src/slirpvde/udp.c @@ -54,11 +54,11 @@ udp_init(Slirp *slirp) * ip->ip_len length data (IPDU) */ void -udp_input(register struct mbuf *m, int iphlen) +udp_input(struct mbuf *m, int iphlen) { Slirp *slirp = m->slirp; - register struct ip *ip; - register struct udphdr *uh; + struct ip *ip; + struct udphdr *uh; int len; struct ip save_ip; struct socket *so; @@ -232,7 +232,7 @@ int udp_output2(struct socket *so, struct mbuf *m, struct sockaddr_in *saddr, struct sockaddr_in *daddr, int iptos) { - register struct udpiphdr *ui; + struct udpiphdr *ui; int error = 0; DEBUG_CALL("udp_output"); diff --git a/vde-2/src/slirpvde/udp.h b/vde-2/src/slirpvde/udp.h index 47d2f3d..e7aa307 100644 --- a/vde-2/src/slirpvde/udp.h +++ b/vde-2/src/slirpvde/udp.h @@ -74,7 +74,7 @@ struct udpiphdr { struct mbuf; void udp_init(Slirp *); -void udp_input(register struct mbuf *, int); +void udp_input(struct mbuf *, int); int udp_output(struct socket *, struct mbuf *, struct sockaddr_in *); int udp_attach(struct socket *); void udp_detach(struct socket *); diff --git a/vde-2/src/vde_autolink.c b/vde-2/src/vde_autolink.c index 720165e..594e1fc 100644 --- a/vde-2/src/vde_autolink.c +++ b/vde-2/src/vde_autolink.c @@ -1454,7 +1454,7 @@ int main(int argc,char **argv) npfd=newmgmtconn(pfd[mgmtindex].fd,pfd,npfd); if (mgmt && (npfd > mgmtindex+1)) { - register int i; + int i; for (i=mgmtindex+1;i= 0 && npfd > mgmtfdstart) { - register int i; + int i; for (i=mgmtfdstart;irb_left) { { - register struct rb_node *uncle = gparent->rb_right; + struct rb_node *uncle = gparent->rb_right; if (uncle && rb_is_red(uncle)) { rb_set_black(uncle); @@ -92,7 +92,7 @@ void rb_insert_color(struct rb_node *node, struct rb_root *root) if (parent->rb_right == node) { - register struct rb_node *tmp; + struct rb_node *tmp; __rb_rotate_left(parent, root); tmp = parent; parent = node; @@ -104,7 +104,7 @@ void rb_insert_color(struct rb_node *node, struct rb_root *root) __rb_rotate_right(gparent, root); } else { { - register struct rb_node *uncle = gparent->rb_left; + struct rb_node *uncle = gparent->rb_left; if (uncle && rb_is_red(uncle)) { rb_set_black(uncle); @@ -117,7 +117,7 @@ void rb_insert_color(struct rb_node *node, struct rb_root *root) if (parent->rb_left == node) { - register struct rb_node *tmp; + struct rb_node *tmp; __rb_rotate_right(parent, root); tmp = parent; parent = node; diff --git a/vde-2/src/vde_switch/bitarray.h b/vde-2/src/vde_switch/bitarray.h index 5daec72..ef3f65b 100644 --- a/vde-2/src/vde_switch/bitarray.h +++ b/vde-2/src/vde_switch/bitarray.h @@ -94,7 +94,7 @@ static inline bitarray ba_alloc(int n) static inline bitarray ba_realloc(bitarray b,int n,int m) { - register int __i; + int __i; bitarray nb=realloc(b,__WORDSIZEROUND(m)*sizeof(unsigned long)); if(nb != NULL) for(__i=__WORDSIZEROUND(n);__i<__WORDSIZEROUND(m);__i++) @@ -120,15 +120,15 @@ static inline void ba_clr(bitarray x,int i) static inline void ba_zap(bitarray x,int n) { - register unsigned int __i; + unsigned int __i; int max=__WORDSIZEROUND(n); for (__i=0; __i< max; __i++) x[__i]=0; } #define ba_FORALLFUN(X,N,F,ARG) \ - ({ register unsigned int __i,__j; \ - register bitarrayelem __v; \ + ({ unsigned int __i,__j; \ + bitarrayelem __v; \ int max=__WORDSIZEROUND(N); \ for (__i=0; __i< max; __i++) \ for (__v=(X)[__i],__j=0; __j < __VDEWORDSIZE; __v >>=1, __j++) \ @@ -136,8 +136,8 @@ static inline void ba_zap(bitarray x,int n) 0; }) #define ba_FORALL(X,N,EXPR,K) \ - ({ register unsigned int __i,__j; \ - register bitarrayelem __v; \ + ({ unsigned int __i,__j; \ + bitarrayelem __v; \ int max=__WORDSIZEROUND(N); \ for (__i=0; __i< max; __i++) \ for (__v=(X)[__i],__j=0; __j < __VDEWORDSIZE; __v >>=1, __j++) \ @@ -146,8 +146,8 @@ static inline void ba_zap(bitarray x,int n) static inline int ba_card(bitarray x,int n) { - register unsigned int __i,__j,__n=0; - register bitarrayelem __v; + unsigned int __i,__j,__n=0; + bitarrayelem __v; int max=__WORDSIZEROUND(n); for (__i=0; __i< max; __i++) for (__v=(x)[__i],__j=0; __j < __VDEWORDSIZE; __v >>=1, __j++) @@ -157,8 +157,8 @@ static inline int ba_card(bitarray x,int n) static inline void ba_empty(bitarray x,int n) { - register unsigned int __i; - register bitarrayelem __v=0; + unsigned int __i; + bitarrayelem __v=0; int max=__WORDSIZEROUND(n); for (__i=0; __i< max; __i++) __v |= (x)[__i]; \ @@ -171,7 +171,7 @@ static inline void ba_copy(bitarray dst, bitarray src, int n) static inline void ba_add(bitarray dst, bitarray src, int n) { - register unsigned int __i; + unsigned int __i; int max=__WORDSIZEROUND(n); for (__i=0; __i< max; __i++) dst[__i] |= src[__i]; @@ -179,7 +179,7 @@ static inline void ba_add(bitarray dst, bitarray src, int n) static inline void ba_remove(bitarray dst, bitarray src, int n) { - register unsigned int __i; + unsigned int __i; int max=__WORDSIZEROUND(n); for (__i=0; __i< max; __i++) dst[__i] &= ~(src[__i]); @@ -187,7 +187,7 @@ static inline void ba_remove(bitarray dst, bitarray src, int n) static inline void ba_negate(bitarray x, int n) { - register unsigned int __i; + unsigned int __i; int max=__WORDSIZEROUND(n); for (__i=0; __i< max; __i++) x[__i] = ~(x[__i]); @@ -203,8 +203,8 @@ static inline bitarray bac_alloc(int n) static inline bitarray bac_realloc(bitarray b,int n,int m) { - register int __i; - register int __size=b[__WORDSIZEROUND(n)]; + int __i; + int __size=b[__WORDSIZEROUND(n)]; bitarray nb=realloc(b,(__WORDSIZEROUND(m)+1)*sizeof(unsigned long)); if(nb != NULL) { b[__WORDSIZEROUND(m)]=__size; @@ -223,23 +223,23 @@ static inline int bac_check(bitarray x,int i) static inline void bac_set(bitarray x,int n,int i) { - register bitarrayelem __v=x[i>>__LOG_WORDSIZE]; - register bitarrayelem __w=__v; + bitarrayelem __v=x[i>>__LOG_WORDSIZE]; + bitarrayelem __w=__v; __v |= (1L << (i & __WORDSIZEMASK)); if (__v != __w) x[i>>__LOG_WORDSIZE]=__v,(x[__WORDSIZEROUND(n)]++); } static inline void bac_clr(bitarray x,int n,int i) { - register bitarrayelem __v=x[i>>__LOG_WORDSIZE]; - register bitarrayelem __w=__v; + bitarrayelem __v=x[i>>__LOG_WORDSIZE]; + bitarrayelem __w=__v; __v &= ~(1L << (i & __WORDSIZEMASK)); if (__v != __w) x[i>>__LOG_WORDSIZE]=__v,(x[__WORDSIZEROUND(n)]--); } static inline void bac_zap(bitarray x,int n) { - register unsigned int __i; + unsigned int __i; int max=__WORDSIZEROUND(n); for (__i=0; __i< max; __i++) x[__i]=0; @@ -247,18 +247,18 @@ static inline void bac_zap(bitarray x,int n) } #define bac_FORALLFUN(X,N,F,ARG) \ - ({ register unsigned int __i,__j; \ - register bitarrayelem __v; \ - register int __n=(X)[__WORDSIZEROUND(N)]; \ + ({ unsigned int __i,__j; \ + bitarrayelem __v; \ + int __n=(X)[__WORDSIZEROUND(N)]; \ for (__i=0; __n > 0; __i++) \ for (__v=(X)[__i],__j=0; __j < __VDEWORDSIZE; __v >>=1, __j++) \ if (__v & 1) (F)(__i*__VDEWORDSIZE+__j,(ARG)),__n--; \ 0; }) #define bac_FORALL(X,N,EXPR,K) \ - ({ register unsigned int __i,__j; \ - register bitarrayelem __v; \ - register int __n=(X)[__WORDSIZEROUND(N)]; \ + ({ unsigned int __i,__j; \ + bitarrayelem __v; \ + int __n=(X)[__WORDSIZEROUND(N)]; \ for (__i=0; __n > 0; __i++) \ for (__v=(X)[__i],__j=0; __j < __VDEWORDSIZE; __v >>=1, __j++) \ if (__v & 1) (K)=__i*__VDEWORDSIZE+__j,(EXPR),__n--; \ diff --git a/vde-2/src/vde_switch/consmgmt.c b/vde-2/src/vde_switch/consmgmt.c index dba2992..eb59d36 100644 --- a/vde-2/src/vde_switch/consmgmt.c +++ b/vde-2/src/vde_switch/consmgmt.c @@ -79,7 +79,7 @@ static struct plugin **plugint=&pluginh; void addcl(int ncl,struct comlist *cl) { - register int i; + int i; for (i=0;inext=NULL; (*clt)=cl; @@ -89,9 +89,9 @@ void addcl(int ncl,struct comlist *cl) void delcl(int ncl,struct comlist *cl) { - register int i; + int i; for (i=0;inext; @@ -116,9 +116,9 @@ void adddbgcl(int ncl,struct dbgcl *cl) void deldbgcl(int ncl,struct dbgcl *cl) { - register int i; + int i; for (i=0;ifds) free(cl->fds); @@ -143,7 +143,7 @@ void addplugin(struct plugin *cl) void delplugin(struct plugin *cl) { - register struct plugin **p=plugint=&pluginh; + struct plugin **p=plugint=&pluginh; while (*p != NULL) { if (*p == cl) *p=cl->next; diff --git a/vde-2/src/vde_switch/fstp.c b/vde-2/src/vde_switch/fstp.c index ac5e313..aab7324 100644 --- a/vde-2/src/vde_switch/fstp.c +++ b/vde-2/src/vde_switch/fstp.c @@ -192,7 +192,7 @@ static struct fsttagbpdu outtagpacket = { int fstnewvlan(int vlan) { /*printf("F new vlan %d\n",vlan);*/ - register unsigned int port; + unsigned int port; int newvlan=(fsttab[vlan] == NULL); if (newvlan && ((fsttab[vlan]=malloc(sizeof(struct vlst))) == NULL || @@ -249,7 +249,7 @@ int fstremovevlan(int vlan) void fstsetnumports (int val) { - register int i; + int i; /*printf("F numports %d\n",val);*/ for (i=0;irootport != 0 && (now - fsttab[vlan]->roottimestamp) > 3*helloperiod) fstnewvlan(vlan); @@ -333,7 +333,7 @@ static void fst_hello_vlan(int vlan,int now) */ static void fst_updatebackup(int vlan,int index) { - register int port; + int port; ba_FORALL(fsttab[vlan]->backup,numports, ({ if (!FSTP_ACTIVE(vlan,port)) { ba_clr(fsttab[vlan]->backup,port); @@ -413,7 +413,7 @@ static void fst_sendbpdu(int vlan,int port,int agr,int tc,int tcack) */ static void topology_change(int vlan, int genport) { - register int port; + int port; int now=qtime(); //if (now - fsttab[vlan]->tctime > 2*helloperiod) { /*limit age?*/ /*printf("TOPOLOGY CHANGE %d\n",vlan);*/ @@ -438,7 +438,7 @@ static void topology_change(int vlan, int genport) * 3- give back the acknowledge and put the new root in fwd*/ static void fastprotocol(int vlan, int newrootport) { - register int port; + int port; ba_FORALL(fsttab[vlan]->untag,numports, ({ if(port != newrootport && !(ba_check(fsttab[vlan]->backup,port)) && !(ba_check(fsttab[vlan]->edge,port)) && FSTP_ACTIVE(vlan,port)) { @@ -667,7 +667,7 @@ static char *decoderole(int vlan, int port) static void fstprintactive(int vlan,FILE *fd) { - register int i; + int i; printoutc(fd,"FST DATA VLAN %04d %s %s",vlan, memcmp(myid,fsttab[vlan]->root,SWITCHID_LEN)==0?"ROOTSWITCH":"", ((pflag & FSTP_TAG)==0)?"FSTP IS DISABLED":""); @@ -690,7 +690,7 @@ static void fstprintactive(int vlan,FILE *fd) static int fstprint(FILE *fd,char *arg) { if (*arg != 0) { - register int vlan; + int vlan; vlan=atoi(arg); if (vlan >= 0 && vlan < NUMOFVLAN-1) { if (bac_check(validvlan,vlan)) diff --git a/vde-2/src/vde_switch/hash.c b/vde-2/src/vde_switch/hash.c index 27dc678..ef7fc98 100644 --- a/vde-2/src/vde_switch/hash.c +++ b/vde-2/src/vde_switch/hash.c @@ -285,8 +285,8 @@ static inline int po2round(int vx) if (vx == 0) return 0; else { - register int i=0; - register int x=vx-1; + int i=0; + int x=vx-1; while (x) { x>>=1; i++; } if (vx != 1<header.dest[i]); @@ -180,7 +180,7 @@ static void free_port(unsigned int portno) struct port *port=portv[portno]; if (port != NULL && port->ep==NULL) { portv[portno]=NULL; - register int i; + int i; /* delete completely the port. all vlan defs zapped */ bac_FORALL(validvlan,NUMOFVLAN,ba_clr(vlant[i].table,portno),i); free(port); @@ -268,7 +268,7 @@ struct endpoint *setup_ep(int portno, int fd_ctl, int fd_data, uid_t user, ep->vdepq_max=stdqlen; #endif if(port->ep == NULL) {/* WAS INACTIVE */ - register int i; + int i; /* copy all the vlan defs to the active vlan defs */ ep->next=port->ep; port->ep=ep; @@ -351,7 +351,7 @@ static int close_ep_port_fd(int portno, int fd_ctl) port->ms=NULL; port->sender=NULL; port->curuser=-1; - register int i; + int i; /* inactivate port: all active vlan defs cleared */ bac_FORALL(validvlan,NUMOFVLAN,({ ba_clr(vlant[i].bctag,portno); @@ -467,7 +467,7 @@ void port_send_packet(int portno, void *packet, int len) void portset_send_packet(bitarray portset, void *packet, int len) { - register int i; + int i; #ifndef VDE_PQ2 ba_FORALL(portset,numports, SEND_PACKET_PORT(portv[i],i,packet,len), i); @@ -590,7 +590,7 @@ void handle_in_packet(struct endpoint *ep, struct packet *packet, int len) portv[port]->bytesin+=len; #endif if (pflag & HUB_TAG) { /* this is a HUB */ - register int i; + int i; #ifndef VDE_PQ2 for(i = 1; i < numports; i++) if((i != port) && (portv[i] != NULL)) @@ -640,7 +640,7 @@ void handle_in_packet(struct endpoint *ep, struct packet *packet, int len) /* BROADCAST: tag/untag. Broadcast the packet untouched on the ports * of the same tag-ness, then transform it to the other tag-ness for the others*/ if (tagged) { - register int i; + int i; #ifndef VDE_PQ2 ba_FORALL(vlant[vlan].bctag,numports, ({if (i != port) SEND_PACKET_PORT(portv[i],i,packet,len);}),i); @@ -657,7 +657,7 @@ void handle_in_packet(struct endpoint *ep, struct packet *packet, int len) ({if (i != port) SEND_PACKET_PORT(portv[i],i,packet,len,&tmpbufu);}),i); #endif } else { /* untagged */ - register int i; + int i; #ifndef VDE_PQ2 ba_FORALL(vlant[vlan].bcuntag,numports, ({if (i != port) SEND_PACKET_PORT(portv[i],i,packet,len);}),i); @@ -989,7 +989,7 @@ static int print_port(FILE *fd,int i,int inclinactive) static int print_ptable(FILE *fd,char *arg) { - register int i; + int i; if (*arg != 0) { i=atoi(arg); if (i <0 || i>=numports) @@ -1006,7 +1006,7 @@ static int print_ptable(FILE *fd,char *arg) static int print_ptableall(FILE *fd,char *arg) { - register int i; + int i; if (*arg != 0) { i=atoi(arg); if (i <0 || i>=numports) @@ -1034,7 +1034,7 @@ static void portzerocounter(int i) static int portresetcounters(char *arg) { - register int i; + int i; if (*arg != 0) { i=atoi(arg); if (i <0 || i>=numports) @@ -1131,7 +1131,7 @@ static int vlanremove(int vlan) { if (vlan >= 0 && vlan < NUMOFVLAN) { if (bac_check(validvlan,vlan)) { - register int i,used=0; + int i,used=0; ba_FORALL(vlant[vlan].table,numports,used++,i); if (used) return EADDRINUSE; @@ -1206,7 +1206,7 @@ static int vlandelport(char *arg) static void vlanprintactive(int vlan,FILE *fd) { - register int i; + int i; printoutc(fd,"VLAN %04d",vlan); #ifdef FSTP if (pflag & FSTP_TAG) { @@ -1248,7 +1248,7 @@ static void vlanprintactive(int vlan,FILE *fd) static int vlanprint(FILE *fd,char *arg) { if (*arg != 0) { - register int vlan; + int vlan; vlan=atoi(arg); if (vlan >= 0 && vlan < NUMOFVLAN-1) { if (bac_check(validvlan,vlan)) @@ -1264,7 +1264,7 @@ static int vlanprint(FILE *fd,char *arg) static void vlanprintelem(int vlan,FILE *fd) { - register int i; + int i; printoutc(fd,"VLAN %04d",vlan); ba_FORALL(vlant[vlan].table,numports, printoutc(fd," -- Port %04d tagged=%d active=%d status=%s", @@ -1274,7 +1274,7 @@ static void vlanprintelem(int vlan,FILE *fd) static int vlanprintall(FILE *fd,char *arg) { if (*arg != 0) { - register int vlan; + int vlan; vlan=atoi(arg); if (vlan > 0 && vlan < NUMOFVLAN-1) { if (bac_check(validvlan,vlan)) @@ -1302,7 +1302,7 @@ static int setmacaddr(char *strmac) if (rv < 6) return EINVAL; else { - register int i; + int i; for (i=0;i0 && call && times>=0) { qtime_csenter(); if (activeqt >= maxqt) { @@ -96,7 +96,7 @@ unsigned int qtimer_add(time_t period,int times,void (*call)(),void *arg) void qtimer_del(unsigned int n) { - register int i; + int i; for (i=0; iqt_n) { qth[i]->qt_times=0; @@ -107,8 +107,8 @@ void qtimer_del(unsigned int n) static void sig_alarm(int sig) { - register int i; - register int j; + int i; + int j; gqtime++; //printf("%d\n",gqtime); for (i=0,j=0; i PRIOFLAG) { @@ -190,14 +190,14 @@ void add_fd(int fd,unsigned char type,void *private_data) static void file_cleanup(void) { - register int i; + int i; for(i = 0; i < nfds; i++) TYPE2MGR(fdpp[i]->type)->cleanup(fdpp[i]->type,fds[i].fd,fdpp[i]->private_data); } void remove_fd(int fd) { - register int i; + int i; for(i = 0; i < nfds; i++){ if(fds[i].fd == fd) break; @@ -267,7 +267,7 @@ void mainloop_pollmask_set(int fd, short events) static void main_loop() { time_t now; - register int n,i; + int n,i; while(1) { n=poll(fds,nfds,-1); now=qtime(); @@ -277,7 +277,7 @@ static void main_loop() } else { for(i = 0; /*i < nfds &&*/ n>0; i++){ if(fds[i].revents != 0) { - register int prenfds=nfds; + int prenfds=nfds; n--; fdpp[i]->timestamp=now; TYPE2MGR(fdpp[i]->type)->handle_io(fdpp[i]->type,fds[i].fd,fds[i].revents,fdpp[i]->private_data); @@ -289,7 +289,7 @@ static void main_loop() else { if (i < nfds && i > 0 && i != nprio) { - register int i_1=i-1; + int i_1=i-1; if (fdpp[i]->timestamp > fdpp[i_1]->timestamp) { struct pollfd tfds; struct pollplus *tfdpp; @@ -356,7 +356,7 @@ static void version(void) static struct option *optcpy(struct option *tgt, struct option *src, int n, int tag) { - register int i; + int i; memcpy(tgt,src,sizeof(struct option) * n); for (i=0;i>=8) diff --git a/vde-2/src/vde_vxlan/vxlan_hash.c b/vde-2/src/vde_vxlan/vxlan_hash.c index 5d92ac4..3dc1800 100644 --- a/vde-2/src/vde_vxlan/vxlan_hash.c +++ b/vde-2/src/vde_vxlan/vxlan_hash.c @@ -207,8 +207,8 @@ static inline int po2round(int vx) if (vx == 0) return 0; else { - register int i=0; - register int x=vx-1; + int i=0; + int x=vx-1; while (x) { x>>=1; i++; } if (vx != 1< 0) { if (strcmp(argv[0],"-net")==0) netflag=1; @@ -73,7 +73,7 @@ static int countnewnics(int argc,char *argv[]) static int isdaemonize(int argc,char *argv[]) { - register int daemonize=0; + int daemonize=0; if(strcmp(filename,"qemu")==0){ int daemonadds=0; while (argc > 0) { @@ -120,7 +120,7 @@ static void usage(void) static void cleanup() { - register int i; + int i; for (i=0; i0) { - register int amount=MIN(remaining[dir],size); + int amount=MIN(remaining[dir],size); //fprintf(stderr,"%s: fragment amount %d\n",progname,amount); memcpy(fragp[dir],buf,amount); remaining[dir]-=amount; @@ -1679,7 +1679,7 @@ int main(int argc,char *argv[]) int mgmtfdstart=consoleindex; if (mgmtindex >= 0) mgmtfdstart=mgmtindex+1; if (mgmtfdstart >= 0 && npfd > mgmtfdstart) { - register int i; + int i; for (i=mgmtfdstart;i