[ovs-dev] [coverity 06/12] ofp-util: Rename ofputil_port_from_string() variable to avoid hiding param.

[Ethan Jackson]

Acked-by: Ethan Jackson <ethan at nicira.com>

On Thu, Jan 24, 2013 at 2:44 PM, Ben Pfaff <blp at nicira.com> wrote:
> This function has a parameter 's' and a local variable 's', so rename the
> local variable to reduce confusion.
>
> Found by Coverity.
>
> Signed-off-by: Ben Pfaff <blp at nicira.com>
> ---
>  lib/ofp-util.c |   10 +++++-----
>  1 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/lib/ofp-util.c b/lib/ofp-util.c
> index c66cd40..4098350 100644
> --- a/lib/ofp-util.c
> +++ b/lib/ofp-util.c
> @@ -4115,14 +4115,14 @@ ofputil_port_from_string(const char *s, uint16_t *portp)
>              *portp = port32;
>              return true;
>          } else if (port32 <= OFPP_LAST_RESV) {
> -            struct ds s;
> +            struct ds msg;
>
> -            ds_init(&s);
> -            ofputil_format_port(port32, &s);
> +            ds_init(&msg);
> +            ofputil_format_port(port32, &msg);
>              VLOG_WARN_ONCE("referring to port %s as %u is deprecated for "
>                             "compatibility with future versions of OpenFlow",
> -                           ds_cstr(&s), port32);
> -            ds_destroy(&s);
> +                           ds_cstr(&msg), port32);
> +            ds_destroy(&msg);
>
>              *portp = port32;
>              return true;
> --
> 1.7.2.5
>
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev