parser CHANGE LYD_OPT_NOAUTODEL flag allowed for operations too

Author: michalvasko

src/parser.c

@@ -217,13 +217,13 @@ lyp_is_rpc_action(struct lys_node *node)
 }
 
 int
-lyp_check_options(int options, const char *func)
+lyp_data_check_options(int options, const char *func)
 {
     int x = options & LYD_OPT_TYPEMASK;
 
     /* LYD_OPT_NOAUTODEL can be used only with LYD_OPT_DATA or LYD_OPT_CONFIG */
     if (options & LYD_OPT_NOAUTODEL) {
-        if (x != LYD_OPT_DATA && x != LYD_OPT_CONFIG) {
+        if ((x == LYD_OPT_EDIT) || (x == LYD_OPT_NOTIF_FILTER)) {
             LOGERR(LY_EINVAL, "%s: Invalid options 0x%x (LYD_OPT_DATA_NOAUTODEL can be used only with LYD_OPT_DATA or LYD_OPT_CONFIG)", func, options);
             return 1;
         }
@@ -1267,7 +1267,7 @@ make_canonical(struct ly_ctx *ctx, int type, const char **value, void *data1, vo
         c = *((uint8_t *)data2);
         if (num) {
             count = sprintf(buf, "%"PRId64" ", num);
-            if ( (num > 0 && (count - 1) <= c) 
+            if ( (num > 0 && (count - 1) <= c)
                  || (count - 2) <= c ) {
                 /* we have 0. value, print the value with the leading zeros
                  * (one for 0. and also keep the correct with of num according

src/parser.h

@@ -118,13 +118,13 @@ int dup_identities_check(const char *id, struct lys_module *module);
 int lyp_is_rpc_action(struct lys_node *node);
 
 /**
- * @brief Check validity of parser options.
+ * @brief Check validity of data parser options.
  *
  * @param options Parser options to be checked.
  * @param func name of the function where called
  * @return 0 for ok, 1 when multiple data types bits are set, or incompatible options are used together.
  */
-int lyp_check_options(int options, const char *func);
+int lyp_data_check_options(int options, const char *func);
 
 int lyp_check_identifier(const char *id, enum LY_IDENT type, struct lys_module *module, struct lys_node *parent);
 int lyp_check_date(const char *date);

src/parser_xml.c

@@ -551,7 +551,7 @@ lyd_parse_xml(struct ly_ctx *ctx, struct lyxml_elem **root, int options, ...)
         return NULL;
     }
 
-    if (lyp_check_options(options, __func__)) {
+    if (lyp_data_check_options(options, __func__)) {
         return NULL;
     }
 

src/tree_data.c

@@ -449,7 +449,7 @@ lyd_parse_data_(struct ly_ctx *ctx, const char *data, LYD_FORMAT format, int opt
 {
     const struct lyd_node *rpc_act = NULL, *data_tree = NULL, *iter;
 
-    if (lyp_check_options(options, __func__)) {
+    if (lyp_data_check_options(options, __func__)) {
         return NULL;
     }
 
@@ -4131,7 +4131,7 @@ lyd_validate(struct lyd_node **node, int options, void *var_arg)
         return EXIT_FAILURE;
     }
 
-    if (lyp_check_options(options, __func__)) {
+    if (lyp_data_check_options(options, __func__)) {
         return EXIT_FAILURE;
     }