commit bc39de1f2832e4e12b55a9afcf332ef0369387d2
author aPiecek <piecek@cesnet.cz> Thu Jun 08 08:10:29 2023 +0200
committer Michal Vasko <mvasko@cesnet.cz> Tue Jun 20 11:30:00 2023 +0200
tree dd1e39449f716ccf4228c2448934cbba526de8d8
parent a83b8e00b3ffe0af2fbe69e739c40e4ba7aa7440

yanglint REFACTOR check parameters for cmd data

tools/lint/main_ni.c

diff --git a/tools/lint/main_ni.c b/tools/lint/main_ni.c
index 57a5eb5..0b7494e 100644
--- a/tools/lint/main_ni.c
+++ b/tools/lint/main_ni.c
@@ -27,6 +27,7 @@
 
 #include "libyang.h"
 
+#include "cmd.h"
 #include "common.h"
 #include "out.h"
 #include "tools/config.h"
@@ -290,18 +291,6 @@
         ly_ctx_set_ext_data_clb(*ctx, ext_data_clb, yo->schema_context_filename);
     }
 
-    /* process the operational and/or reply RPC content if any */
-    if (yo->data_operational.path) {
-        if (get_input(yo->data_operational.path, NULL, &yo->data_operational.format, &yo->data_operational.in)) {
-            return -1;
-        }
-    }
-    if (yo->reply_rpc.path) {
-        if (get_input(yo->reply_rpc.path, NULL, &yo->reply_rpc.format, &yo->reply_rpc.in)) {
-            return -1;
-        }
-    }
-
     for (int i = 0; i < argc - optind; i++) {
         LYS_INFORMAT format_schema = LYS_IN_UNKNOWN;
         LYD_FORMAT format_data = yo->data_in_format;
@@ -769,39 +758,7 @@
         return 1;
     }
 
-    if (yo->data_xpath.count) {
-        yo->data_merge = 1;
-    }
-    if (yo->data_xpath.count && (yo->schema_out_format || yo->data_out_format)) {
-        YLMSG_E("The --format option cannot be combined with --data-xpath option.\n");
-        return -1;
-    }
-    if (yo->data_xpath.count && (yo->data_print_options & LYD_PRINT_WD_MASK)) {
-        YLMSG_E("The --default option cannot be combined with --data-xpath option.\n");
-        return -1;
-    }
-
-    if (yo->data_merge) {
-        if (yo->data_type || (yo->data_parse_options & LYD_PARSE_ONLY)) {
-            /* switch off the option, incompatible input data type */
-            YLMSG_W("The --merge option has effect only for 'data' and 'config' TYPEs\n");
-            yo->data_merge = 0;
-        } else {
-            /* postpone validation after the merge of all the input data */
-            yo->data_parse_options |= LYD_PARSE_ONLY;
-        }
-    }
-
-    if (yo->data_operational.path && !yo->data_type) {
-        YLMSG_W("Operational datastore takes effect only with RPCs/Actions/Replies/Notification input data types.\n");
-        yo->data_operational.path = NULL;
-    }
-
-    if (yo->reply_rpc.path && (yo->data_type != LYD_TYPE_REPLY_NETCONF)) {
-        YLMSG_W("Source RPC is needed only for NETCONF Reply input data type.\n");
-        yo->data_operational.path = NULL;
-    } else if (!yo->reply_rpc.path && (yo->data_type == LYD_TYPE_REPLY_NETCONF)) {
-        YLMSG_E("Missing source RPC (-R) for NETCONF Reply input data type.\n");
+    if (cmd_data_dep(yo, 0)) {
         return -1;
     }
 
@@ -809,18 +766,6 @@
         YLMSG_W("--tree-line-length take effect only in case of the tree output format.\n");
     }
 
-    if (!yo->out && (yo->data_out_format == LYD_LYB)) {
-        YLMSG_E("The LYB format requires the -o option specified.\n");
-        return -1;
-    }
-    /* default output stream */
-    if (!yo->out) {
-        if (ly_out_new_file(stdout, &yo->out)) {
-            YLMSG_E("Unable to set stdout as output.\n");
-            return -1;
-        }
-    }
-
     if (yo->schema_out_format == LYS_OUT_TREE) {
         /* print tree from lysc_nodes */
         yo->ctx_options |= LY_CTX_SET_PRIV_PARSED;