[ovs-dev] [PATCH v2 12/16] ofp-parse: Make string conversion functions available outside this file.

Ben Pfaff blp at nicira.com
Mon Aug 11 19:45:29 UTC 2014


Thanks, applied.

On Mon, Aug 11, 2014 at 09:59:12AM -0700, Jarno Rajahalme wrote:
> Acked-by: Jarno Rajahalme <jrajahalme at nicira.com>
> 
> On Aug 7, 2014, at 4:13 PM, Ben Pfaff <blp at nicira.com> wrote:
> 
> > An upcoming commit will use them from ofp-actions.
> > 
> > Signed-off-by: Ben Pfaff <blp at nicira.com>
> > ---
> > lib/ofp-parse.c |   14 +++++++-------
> > lib/ofp-parse.h |   13 ++++++++++++-
> > 2 files changed, 19 insertions(+), 8 deletions(-)
> > 
> > diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c
> > index 2925157..fa453de 100644
> > --- a/lib/ofp-parse.c
> > +++ b/lib/ofp-parse.c
> > @@ -46,7 +46,7 @@
> >  *
> >  * Returns NULL if successful, otherwise a malloc()'d string describing the
> >  * error.  The caller is responsible for freeing the returned string. */
> > -static char * WARN_UNUSED_RESULT
> > +char * WARN_UNUSED_RESULT
> > str_to_u8(const char *str, const char *name, uint8_t *valuep)
> > {
> >     int value;
> > @@ -64,7 +64,7 @@ str_to_u8(const char *str, const char *name, uint8_t *valuep)
> >  *
> >  * Returns NULL if successful, otherwise a malloc()'d string describing the
> >  * error.  The caller is responsible for freeing the returned string. */
> > -static char * WARN_UNUSED_RESULT
> > +char * WARN_UNUSED_RESULT
> > str_to_u16(const char *str, const char *name, uint16_t *valuep)
> > {
> >     int value;
> > @@ -80,7 +80,7 @@ str_to_u16(const char *str, const char *name, uint16_t *valuep)
> >  *
> >  * Returns NULL if successful, otherwise a malloc()'d string describing the
> >  * error.  The caller is responsible for freeing the returned string. */
> > -static char * WARN_UNUSED_RESULT
> > +char * WARN_UNUSED_RESULT
> > str_to_u32(const char *str, uint32_t *valuep)
> > {
> >     char *tail;
> > @@ -103,7 +103,7 @@ str_to_u32(const char *str, uint32_t *valuep)
> >  *
> >  * Returns NULL if successful, otherwise a malloc()'d string describing the
> >  * error.  The caller is responsible for freeing the returned string. */
> > -static char * WARN_UNUSED_RESULT
> > +char * WARN_UNUSED_RESULT
> > str_to_u64(const char *str, uint64_t *valuep)
> > {
> >     char *tail;
> > @@ -127,7 +127,7 @@ str_to_u64(const char *str, uint64_t *valuep)
> >  *
> >  * Returns NULL if successful, otherwise a malloc()'d string describing the
> >  * error.  The caller is responsible for freeing the returned string. */
> > -static char * WARN_UNUSED_RESULT
> > +char * WARN_UNUSED_RESULT
> > str_to_be64(const char *str, ovs_be64 *valuep)
> > {
> >     uint64_t value = 0;
> > @@ -144,7 +144,7 @@ str_to_be64(const char *str, ovs_be64 *valuep)
> >  *
> >  * Returns NULL if successful, otherwise a malloc()'d string describing the
> >  * error.  The caller is responsible for freeing the returned string. */
> > -static char * WARN_UNUSED_RESULT
> > +char * WARN_UNUSED_RESULT
> > str_to_mac(const char *str, uint8_t mac[6])
> > {
> >     if (!ovs_scan(str, ETH_ADDR_SCAN_FMT, ETH_ADDR_SCAN_ARGS(mac))) {
> > @@ -157,7 +157,7 @@ str_to_mac(const char *str, uint8_t mac[6])
> >  *
> >  * Returns NULL if successful, otherwise a malloc()'d string describing the
> >  * error.  The caller is responsible for freeing the returned string. */
> > -static char * WARN_UNUSED_RESULT
> > +char * WARN_UNUSED_RESULT
> > str_to_ip(const char *str, ovs_be32 *ip)
> > {
> >     struct in_addr in_addr;
> > diff --git a/lib/ofp-parse.h b/lib/ofp-parse.h
> > index 515ccd7..16398a1 100644
> > --- a/lib/ofp-parse.h
> > +++ b/lib/ofp-parse.h
> > @@ -1,5 +1,5 @@
> > /*
> > - * Copyright (c) 2010, 2011, 2012, 2013 Nicira, Inc.
> > + * Copyright (c) 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
> >  *
> >  * Licensed under the Apache License, Version 2.0 (the "License");
> >  * you may not use this file except in compliance with the License.
> > @@ -23,6 +23,7 @@
> > #include <stdint.h>
> > #include <stdio.h>
> > #include "compiler.h"
> > +#include "openvswitch/types.h"
> > 
> > struct flow;
> > struct ofpbuf;
> > @@ -86,4 +87,14 @@ char *parse_ofp_group_mod_str(struct ofputil_group_mod *, uint16_t command,
> >                               enum ofputil_protocol *usable_protocols)
> >     WARN_UNUSED_RESULT;
> > 
> > +char *str_to_u8(const char *str, const char *name, uint8_t *valuep)
> > +    WARN_UNUSED_RESULT;
> > +char *str_to_u16(const char *str, const char *name, uint16_t *valuep)
> > +    WARN_UNUSED_RESULT;
> > +char *str_to_u32(const char *str, uint32_t *valuep) WARN_UNUSED_RESULT;
> > +char *str_to_u64(const char *str, uint64_t *valuep) WARN_UNUSED_RESULT;
> > +char *str_to_be64(const char *str, ovs_be64 *valuep) WARN_UNUSED_RESULT;
> > +char *str_to_mac(const char *str, uint8_t mac[6]) WARN_UNUSED_RESULT;
> > +char *str_to_ip(const char *str, ovs_be32 *ip) WARN_UNUSED_RESULT;
> > +
> > #endif /* ofp-parse.h */
> > -- 
> > 1.7.10.4
> > 
> > _______________________________________________
> > dev mailing list
> > dev at openvswitch.org
> > http://openvswitch.org/mailman/listinfo/dev
> 



More information about the dev mailing list