diff options
| author | Igor Ryzhov <iryzhov@nfware.com> | 2021-11-26 17:23:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-26 17:23:45 +0300 |
| commit | e44c9059e0ac1a6966f14b7fc3ae789554792a46 (patch) | |
| tree | 054f2cc6be827661c8e47814fd05be5bdd88810d /lib/srv6.c | |
| parent | 4f037a39f2f32fb557b8da2bfac7853308782de6 (diff) | |
| parent | 746a6eda2f9d6c774d7c96f4e663148f8579776b (diff) | |
Merge pull request #10125 from ton31337/feature/replace_prefix_to_json_object_string_addf
*: Replace prefix2str for JSON to %pFX
Diffstat (limited to 'lib/srv6.c')
| -rw-r--r-- | lib/srv6.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/srv6.c b/lib/srv6.c index ccb94b2f76..aacd30a7af 100644 --- a/lib/srv6.c +++ b/lib/srv6.c @@ -161,12 +161,10 @@ void srv6_locator_chunk_free(struct srv6_locator_chunk *chunk) json_object *srv6_locator_chunk_json(const struct srv6_locator_chunk *chunk) { - char str[256]; json_object *jo_root = NULL; jo_root = json_object_new_object(); - prefix2str(&chunk->prefix, str, sizeof(str)); - json_object_string_add(jo_root, "prefix", str); + json_object_string_addf(jo_root, "prefix", "%pFX", &chunk->prefix); json_object_string_add(jo_root, "proto", zebra_route_string(chunk->proto)); @@ -175,7 +173,6 @@ json_object *srv6_locator_chunk_json(const struct srv6_locator_chunk *chunk) json_object *srv6_locator_json(const struct srv6_locator *loc) { - char str[256]; struct listnode *node; struct srv6_locator_chunk *chunk; json_object *jo_root = NULL; @@ -188,8 +185,7 @@ json_object *srv6_locator_json(const struct srv6_locator *loc) json_object_string_add(jo_root, "name", loc->name); /* set prefix */ - prefix2str(&loc->prefix, str, sizeof(str)); - json_object_string_add(jo_root, "prefix", str); + json_object_string_addf(jo_root, "prefix", "%pFX", &loc->prefix); /* set function_bits_length */ json_object_int_add(jo_root, "functionBitsLength", |