commit a9167ef2e5d12024083856a8561a0a4a742574de
author Radek Krejci <rkrejci@cesnet.cz> Mon Aug 03 11:01:11 2015 +0200
committer Radek Krejci <rkrejci@cesnet.cz> Mon Aug 03 11:01:11 2015 +0200
tree fb39632daec3359e386824522a1f1dd4d2c34744
parent 6fcdc901b3301efcb973728e711de1ba034e7110

tree CHANGE unify naming of schema and data in/out formats

add description and unify API naming conventions

src/tree.c

diff --git a/src/tree.c b/src/tree.c
index 7f51bca..b08ed04 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -201,7 +201,7 @@
 }
 
 API struct ly_module *
-lys_parse(struct ly_ctx *ctx, const char *data, LY_MINFORMAT format)
+lys_parse(struct ly_ctx *ctx, const char *data, LYS_INFORMAT format)
 {
     struct unres_item *unres;
     struct ly_module *mod;
@@ -214,10 +214,10 @@
     unres = calloc(1, sizeof *unres);
 
     switch (format) {
-    case LY_IN_YIN:
+    case LYS_IN_YIN:
         mod = yin_read_module(ctx, data, 1, unres);
         break;
-    case LY_IN_YANG:
+    case LYS_IN_YANG:
         /* TODO */
         mod = NULL;
         break;
@@ -242,7 +242,7 @@
 }
 
 struct ly_submodule *
-ly_submodule_read(struct ly_module *module, const char *data, LY_MINFORMAT format, int implement)
+ly_submodule_read(struct ly_module *module, const char *data, LYS_INFORMAT format, int implement)
 {
     struct unres_item *unres;
     struct ly_submodule *submod;
@@ -253,10 +253,10 @@
     unres = calloc(1, sizeof *unres);
 
     switch (format) {
-    case LY_IN_YIN:
+    case LYS_IN_YIN:
         submod = yin_read_submodule(module, data, implement, unres);
         break;
-    case LY_IN_YANG:
+    case LYS_IN_YANG:
         /* TODO */
         submod = NULL;
         break;
@@ -281,7 +281,7 @@
 }
 
 struct ly_module *
-lys_read_import(struct ly_ctx *ctx, int fd, LY_MINFORMAT format)
+lys_read_import(struct ly_ctx *ctx, int fd, LYS_INFORMAT format)
 {
     struct unres_item *unres;
     struct ly_module *module;
@@ -304,10 +304,10 @@
     addr = mmap(NULL, sb.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
 
     switch (format) {
-    case LY_IN_YIN:
+    case LYS_IN_YIN:
         module = yin_read_module(ctx, addr, 0, unres);
         break;
-    case LY_IN_YANG:
+    case LYS_IN_YANG:
     default:
         /* TODO */
         munmap(addr, sb.st_size);
@@ -331,7 +331,7 @@
 }
 
 API struct ly_module *
-lys_read(struct ly_ctx *ctx, int fd, LY_MINFORMAT format)
+lys_read(struct ly_ctx *ctx, int fd, LYS_INFORMAT format)
 {
     struct ly_module *module;
     struct stat sb;
@@ -356,7 +356,7 @@
 }
 
 struct ly_submodule *
-ly_submodule_read_fd(struct ly_module *module, int fd, LY_MINFORMAT format, int implement)
+ly_submodule_read_fd(struct ly_module *module, int fd, LYS_INFORMAT format, int implement)
 {
     struct ly_submodule *submodule;
     struct stat sb;
@@ -1732,7 +1732,7 @@
 }
 
 API struct lyd_node *
-lyd_parse(struct ly_ctx *ctx, const char *data, LY_DFORMAT format)
+lyd_parse(struct ly_ctx *ctx, const char *data, LYD_FORMAT format)
 {
     if (!ctx || !data) {
         LOGERR(LY_EINVAL, "%s: Invalid parameter.", __func__);
@@ -1740,9 +1740,9 @@
     }
 
     switch (format) {
-    case LY_DATA_XML:
+    case LYD_XML:
         return xml_read_data(ctx, data);
-    case LY_DATA_JSON:
+    case LYD_JSON:
     default:
         /* TODO */
         return NULL;