diff options
| author | John Estabrook <jestabro@vyos.io> | 2025-11-20 08:51:17 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-20 08:51:17 -0600 |
| commit | cfb2a5ee7fe9bd68498edbb232c3e71160eaeff3 (patch) | |
| tree | b8c8b46f51e82199791a263a6147026dc6aefaae /libvyosconfig/lib/bindings.ml | |
| parent | b02565cb1ad928926d411fbaa48290c9f347154c (diff) | |
| parent | e74b9a1b4d9dd28cef7cf8455f3a7c81d1afbe4f (diff) | |
| download | vyos-1x-cfb2a5ee7fe9bd68498edbb232c3e71160eaeff3.tar.gz vyos-1x-cfb2a5ee7fe9bd68498edbb232c3e71160eaeff3.zip | |
Merge pull request #4844 from jestabro/show-config
T7988: adjust function name to distinguish compare from show config
Diffstat (limited to 'libvyosconfig/lib/bindings.ml')
| -rw-r--r-- | libvyosconfig/lib/bindings.ml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libvyosconfig/lib/bindings.ml b/libvyosconfig/lib/bindings.ml index 78ce3deab..3510a9016 100644 --- a/libvyosconfig/lib/bindings.ml +++ b/libvyosconfig/lib/bindings.ml @@ -378,7 +378,7 @@ let diff_tree path c_ptr_l c_ptr_r = | CD.Incommensurable -> error_message := "Incommensurable"; Ctypes.null | CD.Empty_comparison -> error_message := "Empty comparison"; Ctypes.null -let show_diff cmds path c_ptr_l c_ptr_r = +let diff_compare cmds path c_ptr_l c_ptr_r = (* alert exn CD.show_diff: [Config_diff.Incommensurable] caught [Config_diff.Empty_comparison] caught @@ -387,7 +387,7 @@ let show_diff cmds path c_ptr_l c_ptr_r = let ct_l = Root.get c_ptr_l in let ct_r = Root.get c_ptr_r in try - (CD.show_diff[@alert "-exn"]) ~cmds:cmds path ct_l ct_r + (CD.diff_compare[@alert "-exn"]) ~cmds:cmds path ct_l ct_r with | CD.Incommensurable -> error_message := "Incommensurable"; "#1@" | CD.Empty_comparison -> error_message := "Empty comparison"; "#1@" @@ -499,7 +499,7 @@ struct let () = I.internal "return_value" ((ptr void) @-> string @-> returning string) return_value let () = I.internal "return_values" ((ptr void) @-> string @-> returning string) return_values let () = I.internal "diff_tree" (string @-> (ptr void) @-> (ptr void) @-> returning (ptr void)) diff_tree - let () = I.internal "show_diff" (bool @-> string @-> (ptr void) @-> (ptr void) @-> returning string) show_diff + let () = I.internal "diff_compare" (bool @-> string @-> (ptr void) @-> (ptr void) @-> returning string) diff_compare let () = I.internal "tree_union" ((ptr void) @-> (ptr void) @-> returning (ptr void)) tree_union let () = I.internal "tree_merge" (bool @-> (ptr void) @-> (ptr void) @-> returning (ptr void)) tree_merge let () = I.internal "reference_tree_to_json" (string @-> string @-> string @-> returning int) reference_tree_to_json |