From 4caacc1e7c36dca8264913689a6a880b69e52b33 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 25 Jul 2014 17:21:14 -0700 Subject: [PATCH] ofp-parse: Make string conversion functions available outside this file. An upcoming commit will use them from ofp-actions. Signed-off-by: Ben Pfaff Acked-by: Jarno Rajahalme --- 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 292515716..fa453de1d 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 515ccd702..16398a10c 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 #include #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 */ -- 2.39.5