commit 8df109d54cc11558ec385e060c51d8e2421104c6
author Radek Krejci <rkrejci@cesnet.cz> Fri Apr 23 12:19:08 2021 +0200
committer Michal Vasko <mvasko@cesnet.cz> Mon Apr 26 13:53:18 2021 +0200
tree bb192609893415d1eadd1104d7070e0c921187ac
parent b68ea1485440000e18233b8d96d15b23770f7e4f

libyang REFACTOR rename LY_PREFIX_FORMAT values

Reflect that the value format is the primary concern of the enum, the prefix
interpretation is only based on the format.

src/printer_json.c

diff --git a/src/printer_json.c b/src/printer_json.c
index 5c80863..3ac61c8 100644
--- a/src/printer_json.c
+++ b/src/printer_json.c
@@ -151,9 +151,9 @@
         const struct lys_module *mod;
 
         switch (onode->format) {
-        case LY_PREF_JSON:
+        case LY_VALUE_JSON:
             return onode->name.module_name;
-        case LY_PREF_XML:
+        case LY_VALUE_XML:
             mod = ly_ctx_get_module_implemented_ns(onode->ctx, onode->name.module_ns);
             if (!mod) {
                 return NULL;
@@ -280,7 +280,7 @@
  * @return LY_ERR value.
  */
 static LY_ERR
-json_print_member2(struct jsonpr_ctx *ctx, const struct lyd_node *parent, LY_PREFIX_FORMAT format,
+json_print_member2(struct jsonpr_ctx *ctx, const struct lyd_node *parent, LY_VALUE_FORMAT format,
         const struct ly_opaq_name *name, ly_bool is_attr)
 {
     const char *module_name = NULL, *name_str;
@@ -292,10 +292,10 @@
         const struct lys_module *mod;
 
         switch (format) {
-        case LY_PREF_JSON:
+        case LY_VALUE_JSON:
             module_name = name->module_name;
             break;
-        case LY_PREF_XML:
+        case LY_VALUE_XML:
             mod = ly_ctx_get_module_implemented_ns(ctx->ctx, name->module_ns);
             if (mod) {
                 module_name = mod->name;
@@ -332,7 +332,7 @@
 json_print_value(struct jsonpr_ctx *ctx, const struct lyd_value *val)
 {
     ly_bool dynamic = 0;
-    const char *value = val->realtype->plugin->print(val, LY_PREF_JSON, NULL, &dynamic);
+    const char *value = val->realtype->plugin->print(val, LY_VALUE_JSON, NULL, &dynamic);
 
     /* leafref is not supported */
     switch (val->realtype->basetype) {
@@ -459,7 +459,7 @@
 
     if (node->schema && node->meta) {
         if (inner) {
-            LY_CHECK_RET(json_print_member2(ctx, NULL, LY_PREF_JSON, NULL, 1));
+            LY_CHECK_RET(json_print_member2(ctx, NULL, LY_VALUE_JSON, NULL, 1));
         } else {
             LY_CHECK_RET(json_print_member(ctx, node, 1));
         }
@@ -471,7 +471,7 @@
         LEVEL_PRINTED;
     } else if (!node->schema && ((struct lyd_node_opaq *)node)->attr) {
         if (inner) {
-            LY_CHECK_RET(json_print_member2(ctx, NULL, LY_PREF_JSON, NULL, 1));
+            LY_CHECK_RET(json_print_member2(ctx, NULL, LY_VALUE_JSON, NULL, 1));
         } else {
             LY_CHECK_RET(json_print_member2(ctx, node, ((struct lyd_node_opaq *)node)->format,
                     &((struct lyd_node_opaq *)node)->name, 1));