C-API: cligen expandv -> expand change

Test: Revert patch for Partial match of expanded command

Author: olofhagsand

apps/backend/backend_client.c

@@ -1933,7 +1933,7 @@ from_client_process_control(clixon_handle h,
 /*! Clixon hello to check liveness
  *
  * @param[in]  h       Clixon handle
- * @param[in]  xn      Request: <rpc><xn></rpc>
+ * @param[in]  xe      Request: <rpc><xn></rpc>
  * @param[out] cbret   Return xml tree, eg <rpc-reply>..., <rpc-error..
  * @param[in]  arg     client-entry
  * @param[in]  regarg  User argument given at rpc_callback_register()

apps/cli/cli_generate.c

@@ -1984,7 +1984,7 @@ yang2cli_grouping(clixon_handle h,
      * handle=NULL for global namespace, this means expand callbacks must be in
      * CLICON namespace, not in a cli frontend plugin.
      */
-    if (cligen_expandv_str2fn(pt0, (expandv_str2fn_t*)clixon_str2fn, NULL) < 0)
+    if (cligen_expand_str2fn(pt0, (expand_str2fn_t*)clixon_str2fn, NULL) < 0)
         goto done;
     /* Append cligen tree and name it */
     if (ph_add_set(cli_cligen(h), treename, pt0) < 0)
@@ -2128,7 +2128,7 @@ yang2cli_yspec(clixon_handle h,
      * handle=NULL for global namespace, this means expand callbacks must be in
      * CLICON namespace, not in a cli frontend plugin.
      */
-    if (cligen_expandv_str2fn(pt0, (expandv_str2fn_t*)clixon_str2fn, NULL) < 0)
+    if (cligen_expand_str2fn(pt0, (expand_str2fn_t*)clixon_str2fn, NULL) < 0)
         goto done;
     /* Append cligen tree and name it */
     if (ph_add_set(cli_cligen(h), treename, pt0) < 0)

apps/cli/cli_plugin.c

@@ -288,11 +288,11 @@ clispec_load_file(clixon_handle h,
                    filename, plgnam, plgnam);
         goto done;
     }
-     if (cligen_expandv_str2fn(pt, (expandv_str2fn_t*)clixon_str2fn, handle) < 0)
-         goto done;
-     /* Variable translation functions */
-     if (cligen_translate_str2fn(pt, (translate_str2fn_t*)clixon_str2fn, handle) < 0)
-         goto done;
+    if (cligen_expand_str2fn(pt, (expand_str2fn_t*)clixon_str2fn, handle) < 0)
+        goto done;
+    /* Variable translation functions */
+    if (cligen_translate_str2fn(pt, (translate_str2fn_t*)clixon_str2fn, handle) < 0)
+        goto done;
 
     /* Make sure we have a syntax mode specified */
     if (mode == NULL || strlen(mode) < 1) { /* may be null if not given in file */
@@ -359,7 +359,7 @@ clispec_load_file(clixon_handle h,
     }
     cligen_parsetree_free(pt, 1);
     retval = 0;
-done:
+ done:
     if (cvv)
         cvec_free(cvv);
     if (vec)

test/test_autocli_preference.sh

@@ -164,8 +164,10 @@ expectpart "$($clixon_cli -1 -f $cfg three bcd 2>&1)" 0 "arg = three"
 new "cli set aa:bb"
 expectpart "$($clixon_cli -1 -f $cfg set twobyte aa:bb 2>&1)" 0 "^$"
 
+if false; then # Only if CLIGEN_DONT_MATCH_PARTIAL_EXPANDS set in cligen_custom.h
 new "cli set aa: should fail"
 expectpart "$($clixon_cli -1 -f $cfg set twobyte aa: 2>&1)" 255 "Partial match"
+fi
 
 if [ $BE -ne 0 ]; then
     new "Kill backend"