From 3b5f75162f2307c30443f6175d37080c7f0d7e66 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sat, 24 Aug 2013 17:57:16 +0200 Subject: src: json: s/nft_jansson_value_parse_str/nft_jansson_parse_str/g Remove _value_ infix to make the function name smaller. Signed-off-by: Pablo Neira Ayuso --- src/expr/data_reg.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/expr/data_reg.c') diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c index d0e1a83..3b6a87a 100644 --- a/src/expr/data_reg.c +++ b/src/expr/data_reg.c @@ -32,7 +32,7 @@ static int nft_data_reg_verdict_json_parse(union nft_data_reg *reg, json_t *data int verdict; const char *verdict_str; - verdict_str = nft_jansson_value_parse_str(data, "verdict"); + verdict_str = nft_jansson_parse_str(data, "verdict"); if (verdict_str == NULL) return -1; @@ -47,7 +47,7 @@ static int nft_data_reg_verdict_json_parse(union nft_data_reg *reg, json_t *data static int nft_data_reg_chain_json_parse(union nft_data_reg *reg, json_t *data) { - reg->chain = strdup(nft_jansson_value_parse_str(data, "chain")); + reg->chain = strdup(nft_jansson_parse_str(data, "chain")); if (reg->chain == NULL) { return -1; } @@ -82,10 +82,9 @@ int nft_data_reg_json_parse(union nft_data_reg *reg, json_t *data) const char *type; - type = nft_jansson_value_parse_str(data, "type"); - if (type == NULL) { + type = nft_jansson_parse_str(data, "type"); + if (type == NULL) return -1; - } /* Select what type of parsing is needed */ if (strcmp(type, "value") == 0) { -- cgit v1.2.3