Clixon release 4.0.0

apps/cli/cli_common.c

@@ -30,7 +30,6 @@
   the terms of any one of the Apache License version 2 or the GPL.
 
   ***** END LICENSE BLOCK *****
-
  * 
  */
 

apps/cli/cli_common.h

@@ -37,24 +37,6 @@
 #ifndef _CLI_COMMON_H_
 #define _CLI_COMMON_H_
 
-/*! macro to create a single-argument callback from multiple */
-#define cb_single_arg(fn) \
-int fn(clicon_handle h, cvec *cvv, cg_var *arg)      \
-{						     \
-    int   retval=-1;				     \
-    cvec *argv = NULL;				     \
-						     \
-    if (arg && (argv = cvec_from_var(arg)) == NULL){ \
-	clicon_err(OE_UNIX, errno, "cvec_from_var"); \
-	goto done;				     \
-    }						     \
-    retval = fn##v(h, cvv, argv);		     \
- done:						     \
-    if (argv) cvec_free(argv);			     \
-      return retval;				     \
-} 
-
-
 void cli_signal_block(clicon_handle h);
 void cli_signal_unblock(clicon_handle h);
 

apps/cli/cli_show.c

@@ -239,17 +239,6 @@ expand_dbvar(void   *h,
     return retval;
 }
 
-int
-expandv_dbvar(void   *h, 
-	      char   *name, 
-	      cvec   *cvv, 
-	      cvec   *argv, 
-	      cvec  *commands,
-	      cvec  *helptexts)
-{
-    return expand_dbvar(h, name, cvv, argv, commands, helptexts);
-}
-
 /*! List files in a directory
  */
 int

apps/cli/clixon_cli.h

@@ -59,14 +59,4 @@ int plugin_start(clicon_handle h, int argc, char **argv);
  */
 int plugin_exit(clicon_handle h);
 
-
-/* Called before prompt is printed, return a customized prompt. */
-char *plugin_prompt_hook(clicon_handle h, char *mode);
-
-/* Called if a command is not matched w current mode. Return name of next syntax mode to check until NULL */
-char *plugin_parse_hook(clicon_handle h, char *cmd, char *name);
-
-/* Called if ^Z entered. Can modify cli command buffer and position */
-int plugin_susp_hook(clicon_handle h, char *buf, int prompt_width, int *cursor_loc);
-
 #endif  /* _CLIXON_CLI_H_ */

apps/cli/clixon_cli_api.h

@@ -129,8 +129,6 @@ int cli_help(clicon_handle h, cvec *vars, cvec *argv);
 int expand_dir(char *dir, int *nr, char ***commands, mode_t flags, int detail);
 int expand_dbvar(void *h, char *name, cvec *cvv, cvec *argv, 
 		  cvec *commands, cvec *helptexts);
-int expandv_dbvar(void *h, char *name, cvec *cvv, cvec *argv, 
-		  cvec *commands, cvec *helptexts);
 
 /* cli_show.c: CLIgen new vector arg callbacks */
 int show_yang(clicon_handle h, cvec *vars, cvec *argv);