log UPDATE partially replace ERRARG macro
Added new macro, which works just like ERRARG did before, but it can
take variadic number (up to 5) of arguments and a session the error happened on.
ERRARG still remains and has an extra session argument.
diff --git a/src/config_new.c b/src/config_new.c
index e08c58d..4c30382 100644
--- a/src/config_new.c
+++ b/src/config_new.c
@@ -185,9 +185,7 @@
char *tree_path = NULL;
EVP_PKEY *priv_pkey = NULL;
- if (!privkey_path || !config || !ctx || !endpt_name || !hostkey_name) {
- ERRARG("privkey_path or config or ctx or endpt_name or hostkey_name");
- }
+ NC_CHECK_ARG_RET(NULL, privkey_path, config, ctx, endpt_name, hostkey_name, 1);
/* get the keys as a string from the given files */
ret = nc_server_config_ssh_new_get_keys(privkey_path, pubkey_path, &priv_key, &pub_key, &priv_pkey);
@@ -291,11 +289,7 @@
char *tree_path = NULL;
struct lyd_node *new_tree, *port_node;
- if (!address || !port || !ctx || !endpt_name || !config) {
- ERRARG("args");
- ret = 1;
- goto cleanup;
- }
+ NC_CHECK_ARG_RET(NULL, address, port, ctx, endpt_name, config, 1);
/* prepare path for instertion of leaves later */
asprintf(&tree_path, "/ietf-netconf-server:netconf-server/listen/endpoint[name='%s']/ssh/tcp-server-parameters", endpt_name);