[ovs-dev] [threads 10/17] route-table: Make 'rtnl_sock' and 'attrs' local variables non-static.

Ben Pfaff blp at nicira.com
Wed Jun 5 22:05:59 UTC 2013


Applied, thanks.

On Wed, Jun 05, 2013 at 02:13:46PM -0700, Ethan Jackson wrote:
> Acked-by: Ethan Jackson <ethan at nicira.com>
> 
> On Wed, Jun 5, 2013 at 1:05 PM, Ben Pfaff <blp at nicira.com> wrote:
> > I don't see any reason for these to be static.
> >
> > CC: Ethan Jackson <ethan at nicira.com>
> > Signed-off-by: Ben Pfaff <blp at nicira.com>
> > ---
> >  lib/route-table.c |    8 ++++----
> >  1 files changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/lib/route-table.c b/lib/route-table.c
> > index 5bdcfb0..5891ae8 100644
> > --- a/lib/route-table.c
> > +++ b/lib/route-table.c
> > @@ -1,5 +1,5 @@
> >  /*
> > - * Copyright (c) 2011, 2012 Nicira, Inc.
> > + * Copyright (c) 2011, 2012, 2013 Nicira, Inc.
> >   *
> >   * Licensed under the Apache License, Version 2.0 (the "License");
> >   * you may not use this file except in compliance with the License.
> > @@ -225,7 +225,7 @@ route_table_reset(void)
> >      struct nl_dump dump;
> >      struct rtgenmsg *rtmsg;
> >      struct ofpbuf request, reply;
> > -    static struct nl_sock *rtnl_sock;
> > +    struct nl_sock *rtnl_sock;
> >
> >      route_map_clear();
> >      route_table_valid = true;
> > @@ -272,7 +272,7 @@ route_table_parse(struct ofpbuf *buf, struct route_table_msg *change)
> >          [RTA_OIF] = { .type = NL_A_U32, .optional = false },
> >      };
> >
> > -    static struct nlattr *attrs[ARRAY_SIZE(policy)];
> > +    struct nlattr *attrs[ARRAY_SIZE(policy)];
> >
> >      parsed = nl_policy_parse(buf, NLMSG_HDRLEN + sizeof(struct rtmsg),
> >                               policy, attrs, ARRAY_SIZE(policy));
> > @@ -421,7 +421,7 @@ name_table_reset(void)
> >      struct nl_dump dump;
> >      struct rtgenmsg *rtmsg;
> >      struct ofpbuf request, reply;
> > -    static struct nl_sock *rtnl_sock;
> > +    struct nl_sock *rtnl_sock;
> >
> >      name_table_valid = true;
> >      name_map_clear();
> > --
> > 1.7.2.5
> >



More information about the dev mailing list