xapi-stdext-std: replace String.filter_chars with Astring.filter

The former didn't have any tests and the performance is unknown

Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
Signed-off-by: Pau Ruiz Safont <pau.safont@vates.tech>

Author: psafont

ocaml/libs/tgroup/dune

@@ -2,7 +2,7 @@
  (name tgroup)
  (modules tgroup)
  (public_name tgroup)
- (libraries unix xapi-log xapi-stdext-unix xapi-stdext-std))
+ (libraries astring unix xapi-log xapi-stdext-unix))
 
 (test
  (name test_tgroup)

ocaml/libs/tgroup/tgroup.ml

@@ -70,8 +70,7 @@ module Group = struct
       | _ ->
           false
 
-    let sanitize s =
-      Xapi_stdext_std.Xstringext.String.filter_chars s is_alphanum
+    let sanitize s = Astring.String.filter is_alphanum s
 
     let make ?user_agent subject_sid =
       let user_agent =

ocaml/libs/xapi-stdext/lib/xapi-stdext-std/xstringext.ml

@@ -103,22 +103,6 @@ module String = struct
     ) else
       s
 
-  let filter_chars s valid =
-    let badchars = ref false in
-    let buf = Buffer.create 0 in
-    for i = 0 to String.length s - 1 do
-      if !badchars then (
-        if valid s.[i] then Buffer.add_char buf s.[i]
-      ) else if not (valid s.[i]) then (
-        Buffer.add_substring buf s 0 i ;
-        badchars := true
-      )
-    done ;
-    if !badchars then
-      Buffer.contents buf
-    else
-      s
-
   let map_unlikely s f =
     let changed = ref false in
     let m = ref 0 in

ocaml/libs/xapi-stdext/lib/xapi-stdext-std/xstringext.mli

@@ -34,9 +34,6 @@ module String : sig
   val replace : string -> string -> string -> string
   (** replace all [f] substring in [s] by [t] *)
 
-  val filter_chars : string -> (char -> bool) -> string
-  (** filter chars from a string *)
-
   val map_unlikely : string -> (char -> string option) -> string
   (** map a string trying to fill the buffer by chunk *)
 

ocaml/xe-cli/dune

@@ -17,7 +17,6 @@
     xapi-backtrace
     xapi-cli-protocol
     xapi-stdext-pervasives
-    xapi-stdext-std
     xapi-stdext-unix
   )
 )

ocaml/xe-cli/newcli.ml

@@ -13,7 +13,6 @@
  *)
 (* New cli talking to the in-server cli interface *)
 
-module Stringext = Xapi_stdext_std.Xstringext.String
 open Xapi_stdext_pervasives
 open Cli_protocol
 
@@ -316,7 +315,7 @@ let parse_args =
             || (extra_args.[!i] = ',' && extra_args.[!i - 1] <> '\\')
           then (
           let seg = String.sub extra_args !pos (!i - !pos) in
-          l := Stringext.filter_chars seg (( <> ) '\\') :: !l ;
+          l := Astring.String.filter (( <> ) '\\') seg :: !l ;
           incr i ;
           pos := !i
         ) else