diff options
| author | Thomas Graf <tgraf@noironetworks.com> | 2014-12-15 14:10:38 +0100 |
|---|---|---|
| committer | Thomas Graf <tgraf@noironetworks.com> | 2014-12-15 14:14:47 +0100 |
| commit | cab5044987845e66dbe030eb1384d58cc5a66fc9 (patch) | |
| tree | e5cdae4dc1e96f8f67c258f3db5ad8cdf729f415 /lib/ofp-parse.h | |
| parent | 9a8d2f8c49c28ddc77be7011748eef17d949fafe (diff) | |
| download | openvswitch-cab5044987845e66dbe030eb1384d58cc5a66fc9.tar.gz | |
lib: Move compiler.h to <openvswitch/compiler.h>
The following macros are renamed to avoid conflicts with other headers:
* WARN_UNUSED_RESULT to OVS_WARN_UNUSED_RESULT
* PRINTF_FORMAT to OVS_PRINTF_FORMAT
* NO_RETURN to OVS_NO_RETURN
Signed-off-by: Thomas Graf <tgraf@noironetworks.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'lib/ofp-parse.h')
| -rw-r--r-- | lib/ofp-parse.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/lib/ofp-parse.h b/lib/ofp-parse.h index 789febf28..db30f4323 100644 --- a/lib/ofp-parse.h +++ b/lib/ofp-parse.h @@ -39,27 +39,27 @@ enum ofputil_protocol; char *parse_ofp_str(struct ofputil_flow_mod *, int command, const char *str_, enum ofputil_protocol *usable_protocols) - WARN_UNUSED_RESULT; + OVS_WARN_UNUSED_RESULT; char *parse_ofp_flow_mod_str(struct ofputil_flow_mod *, const char *string, uint16_t command, enum ofputil_protocol *usable_protocols) - WARN_UNUSED_RESULT; + OVS_WARN_UNUSED_RESULT; char *parse_ofp_table_mod(struct ofputil_table_mod *, const char *table_id, const char *flow_miss_handling, enum ofputil_protocol *usable_protocols) - WARN_UNUSED_RESULT; + OVS_WARN_UNUSED_RESULT; char *parse_ofp_flow_mod_file(const char *file_name, uint16_t command, struct ofputil_flow_mod **fms, size_t *n_fms, enum ofputil_protocol *usable_protocols) - WARN_UNUSED_RESULT; + OVS_WARN_UNUSED_RESULT; char *parse_ofp_flow_stats_request_str(struct ofputil_flow_stats_request *, bool aggregate, const char *string, enum ofputil_protocol *usable_protocols) - WARN_UNUSED_RESULT; + OVS_WARN_UNUSED_RESULT; char *parse_ofp_exact_flow(struct flow *flow, struct flow *mask, const char *s, const struct simap *portno_names); @@ -67,31 +67,31 @@ char *parse_ofp_exact_flow(struct flow *flow, struct flow *mask, const char *s, char *parse_ofp_meter_mod_str(struct ofputil_meter_mod *, const char *string, int command, enum ofputil_protocol *usable_protocols) - WARN_UNUSED_RESULT; + OVS_WARN_UNUSED_RESULT; char *parse_flow_monitor_request(struct ofputil_flow_monitor_request *, const char *, enum ofputil_protocol *usable_protocols) - WARN_UNUSED_RESULT; + OVS_WARN_UNUSED_RESULT; char *parse_ofp_group_mod_file(const char *file_name, uint16_t command, struct ofputil_group_mod **gms, size_t *n_gms, enum ofputil_protocol *usable_protocols) - WARN_UNUSED_RESULT; + OVS_WARN_UNUSED_RESULT; char *parse_ofp_group_mod_str(struct ofputil_group_mod *, uint16_t command, const char *string, enum ofputil_protocol *usable_protocols) - WARN_UNUSED_RESULT; + OVS_WARN_UNUSED_RESULT; char *str_to_u8(const char *str, const char *name, uint8_t *valuep) - WARN_UNUSED_RESULT; + OVS_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[ETH_ADDR_LEN]) WARN_UNUSED_RESULT; -char *str_to_ip(const char *str, ovs_be32 *ip) WARN_UNUSED_RESULT; + OVS_WARN_UNUSED_RESULT; +char *str_to_u32(const char *str, uint32_t *valuep) OVS_WARN_UNUSED_RESULT; +char *str_to_u64(const char *str, uint64_t *valuep) OVS_WARN_UNUSED_RESULT; +char *str_to_be64(const char *str, ovs_be64 *valuep) OVS_WARN_UNUSED_RESULT; +char *str_to_mac(const char *str, uint8_t mac[ETH_ADDR_LEN]) OVS_WARN_UNUSED_RESULT; +char *str_to_ip(const char *str, ovs_be32 *ip) OVS_WARN_UNUSED_RESULT; #endif /* ofp-parse.h */ |