[build] fix compilation warnings and remove unused code (#3468)

Some code from base64 module in ocaml is deprecated but is only used by
the outdated tool broadcaster. Better remove them.

sw/lib/ocaml/Makefile

@@ -34,7 +34,7 @@ PKGCOMMON=pprzlink,xml-light,netclient,nettls-gnutls,glibivy
 XINCLUDES=
 XPKGCOMMON=pprzlink,xml-light,glibivy,$(USE_LABELGTK)
 
-SRC = fig.ml debug.ml base64.ml serial.ml ocaml_tools.ml expr_syntax.ml expr_parser.ml expr_lexer.ml extXml.ml env.ml xml2h.ml latlong.ml egm96.ml srtm.ml http.ml gm.ml iGN.ml geometry_2d.ml cserial.o ubx.ml xmlCom.ml os_calls.ml editAirframe.ml defivybus.ml fp_proc.ml quaternion.ml
+SRC = fig.ml debug.ml serial.ml ocaml_tools.ml expr_syntax.ml expr_parser.ml expr_lexer.ml extXml.ml env.ml xml2h.ml latlong.ml egm96.ml srtm.ml http.ml gm.ml iGN.ml geometry_2d.ml cserial.o ubx.ml xmlCom.ml os_calls.ml editAirframe.ml defivybus.ml fp_proc.ml quaternion.ml
 SRC += gen_common.ml radio.ml settings.ml module.ml flight_plan.ml autopilot.ml airframe.ml telemetry.ml aircraft.ml
 CMO = $(SRC:.ml=.cmo)
 CMX = $(SRC:.ml=.cmx)

sw/lib/ocaml/base64.ml

@@ -1,216 +0,0 @@
-(*
- * Downlink protocol (handling messages.xml)
- *
- * Copyright (c) 2003 Dustin Sallings <dustin@spy.net>
- * Copyright (C) 2007 ENAC, Pascal Brisset, Antoine Drouin
- *
- * This file is part of paparazzi.
- *
- * paparazzi is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * paparazzi is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with paparazzi; see the file COPYING.  If not, write to
- * the Free Software Foundation, 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- *)
-
-(** Base64 stream encoder/decoder. *)
-
-(** Exception raised when there's an attempt to encode a chunk incorrectly *)
-exception Invalid_encode_chunk of int
-
-
-
-(** The character map of all base64 characters *)
-
-let char_map = [|
-  'A'; 'B'; 'C'; 'D'; 'E'; 'F'; 'G'; 'H'; 'I'; 'J'; 'K'; 'L'; 'M';
-  'N'; 'O'; 'P'; 'Q'; 'R'; 'S'; 'T'; 'U'; 'V'; 'W'; 'X'; 'Y'; 'Z';
-  'a'; 'b'; 'c'; 'd'; 'e'; 'f'; 'g'; 'h'; 'i'; 'j'; 'k'; 'l'; 'm';
-  'n'; 'o'; 'p'; 'q'; 'r'; 's'; 't'; 'u'; 'v'; 'w'; 'x'; 'y'; 'z';
-  '0'; '1'; '2'; '3'; '4'; '5'; '6'; '7'; '8'; '9'; '+'; '/'|]
-
-(**
-   Functions for encoding
-*)
-
-
-(** Encode a chunk. The chunk is either a 1, 2, or 3 element array. *)
-
-let encode_chunk chars =
-  let llength = List.length chars in
-  if(llength = 0 || llength > 3) then
-    raise (Invalid_encode_chunk(llength));
-  let chunk = Bytes.make 4 '=' in
-  let a = List.hd chars in
-  let tmpa = (((Char.code a) land 3) lsl 4) in
-  Bytes.set chunk 0 char_map.( (Char.code a) lsr 2);
-  (* Check for another character *)
-  if (llength < 2) then (
-    Bytes.set chunk 1 char_map.(tmpa);
-    Bytes.to_string chunk;
-  ) else (
-    let b = List.nth chars 1 in
-    let tmpb = ((Char.code b) lsr 4) in
-    let tmpa2 = ((Char.code b) land 0x0f) lsl 2 in
-    Bytes.set chunk 1 char_map.(tmpa lor tmpb);
-    if (llength < 3) then (
-      Bytes.set chunk 2 char_map.(tmpa2);
-      Bytes.to_string chunk
-    ) else (
-      let c = List.nth chars 2 in
-      let tmpb2 = ((Char.code c) land 0xc0) lsr 6 in
-      Bytes.set chunk 2 char_map.(tmpa2 lor tmpb2);
-      Bytes.set chunk 3 char_map.((Char.code c) land 0x3f);
-      Bytes.to_string chunk
-    )
-  )
-
-(** Stream chunk encoder.
-
-    Use ``Stream.from'' to produce a stream of encoded data from a data stream. *)
-
-let encode_stream_chunk data_stream cnt =
-  let stream_empty s =
-    try
-      Stream.empty s;
-      true
-    with Stream.Failure -> false in
-  if (stream_empty data_stream) then (
-    None
-  ) else (
-    let next = Stream.npeek 3 data_stream in
-    List.iter (fun x -> Stream.junk data_stream) next;
-    (* We don't do 76 here as they're in blocks of 4. *)
-    Some (encode_chunk next ^
-            (if (((cnt + 1) mod 19) = 0) then "\013\n" else ""))
-  )
-
-(** Get a Stream of encoded data from the given stream of data. *)
-
-let encode data_stream =
-  Stream.from (encode_stream_chunk data_stream)
-
-(** Base64 encode the string data into a base64 encoded string. *)
-
-let encode_to_string data_stream =
-  let buf = Buffer.create 512 in
-  Stream.iter (fun c -> Buffer.add_string buf c) (encode data_stream);
-  Buffer.contents buf
-
-(** Base64 encode a string *)
-
-let encode_string s = encode_to_string (Stream.of_string s)
-
-(* ---------------------------------------------------------------------- *)
-
-(**
-   Functions for decoding
-*)
-
-
-(** Exception raised when there's a problem with the input stream. *)
-
-exception Invalid_decode_chunk of int
-
-(** Reverse mapping of character to its index in the char_map *)
-
-let char_index =
-  let rv = Array.make 256 (-1) in
-  for i = 0 to (Array.length char_map - 1) do
-    let c = char_map.(i) in
-    Array.set rv (Char.code c) i
-  done;
-  rv
-
-(** Is the given character a valid base64 character? *)
-
-let is_base64_char c =
-  char_index.(Char.code c) != -1
-
-(** Decode a chunk represented as a list of characters. The chunk must be 2, 3, or 4 elements large. *)
-
-let decode_chunk chars =
-  let rv = Buffer.create 3 in
-  let fchars = (List.filter (fun c -> c != '=') chars) in
-  let packer = List.fold_left (fun o x -> (o lsl 6) lor x) 0
-    (List.map (fun c -> char_index.(Char.code c)) fchars) in
-  (
-    match List.length fchars with
-      | 4 ->
-        Buffer.add_char rv (Char.chr (0xff land (packer lsr 16)));
-        Buffer.add_char rv (Char.chr (0xff land (packer lsr 8)));
-        Buffer.add_char rv (Char.chr (0xff land packer));
-      | 3 ->
-        Buffer.add_char rv (Char.chr (0xff land ((packer lsl 6) lsr 16)));
-        Buffer.add_char rv (Char.chr (0xff land ((packer lsl 6) lsr 8)));
-      | 2 ->
-        Buffer.add_char rv (Char.chr (0xff land ((packer lsl 12) lsr 16)));
-      | _ -> raise (Invalid_decode_chunk(List.length fchars));
-  );
-  Buffer.contents rv
-
-(** Decode a stream of base64 characters into a stream of 3 or fewer byte strings. *)
-
-let decode data_stream =
-  let rec find_next x =
-    try
-      Stream.empty data_stream;
-      None
-    with Stream.Failure -> (
-      let rv = Stream.next data_stream in
-      if (is_base64_char(rv)) then
-        Some rv
-      else (find_next x)
-    ) in
-  let clean_stream = Stream.from find_next in
-  let get_block x =
-    try
-      let chunk = Stream.npeek 4 clean_stream in
-      List.iter (fun x -> Stream.junk clean_stream) chunk;
-      match chunk with
-          [] -> None
-        | _  -> Some(decode_chunk chunk)
-    with Stream.Failure -> None in
-  Stream.from get_block
-
-(** Base64 decode the stream of base64 encoded data into a string. *)
-
-let decode_to_string data_stream =
-  let buf = Buffer.create 512 in
-  Stream.iter (fun c -> Buffer.add_string buf c) (decode data_stream);
-  Buffer.contents buf
-
-(** Base64 decode a string to a string *)
-
-let decode_string s = decode_to_string (Stream.of_string s)
-
-(**
-   Functions for testing
-*)
-
-
-(** Simple test function. *)
-
-let test() =
-  let wordlist = ["A";"AB";"ABC";"Dustin";Bytes.to_string (Bytes.create 128)] in
-  print_endline("String:");
-  List.iter (fun x -> print_endline(encode_string x))
-    wordlist;
-  print_endline("Stream:");
-  List.iter (fun x ->
-    Stream.iter print_string (encode (Stream.of_string x));
-    print_newline()
-  ) wordlist;
-  print_endline("Decode:");
-  List.iter (fun x -> print_endline(decode_string (encode_string x)))
-    wordlist

sw/lib/ocaml/base64.mli

@@ -1,30 +0,0 @@
-(*
- * Downlink protocol (handling messages.xml)
- *
- * Copyright (c) 2003 Dustin Sallings <dustin@spy.net>
- * Copyright (C) 2007 ENAC, Pascal Brisset, Antoine Drouin
- *
- * This file is part of paparazzi.
- *
- * paparazzi is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * paparazzi is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with paparazzi; see the file COPYING.  If not, write to
- * the Free Software Foundation, 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- *)
-
-exception Invalid_encode_chunk of int
-exception Invalid_decode_chunk of int
-
-val encode_string : string -> string
-val decode_string : string -> string

sw/lib/ocaml/cserial.c

@@ -95,15 +95,15 @@ value c_init_serial(value device, value speed, value hw_flow_control)
 
   int br_idx = Int_val(speed);
   if (br_idx >= sizeof(baudrates)){
-    failwith("Baud rate not supported - are you using MacOS? (br_idx out of bounds)");
+    caml_failwith("Baud rate not supported - are you using MacOS? (br_idx out of bounds)");
   }
   int br = baudrates[br_idx];
 
   int fd = open(String_val(device), O_RDWR|O_NOCTTY|O_NONBLOCK);
 
-  if (fd == -1) failwith("opening modem serial device : fd < 0");
+  if (fd == -1) caml_failwith("opening modem serial device : fd < 0");
 
-  if (tcgetattr(fd, &orig_termios)) failwith("getting modem serial device attr");
+  if (tcgetattr(fd, &orig_termios)) caml_failwith("getting modem serial device attr");
   cur_termios = orig_termios;
 
   /* input modes - turn off input processing */
@@ -129,9 +129,9 @@ value c_init_serial(value device, value speed, value hw_flow_control)
   cur_termios.c_lflag &= ~(ISIG|ICANON|IEXTEN|ECHO|FLUSHO|PENDIN);
   cur_termios.c_lflag |= NOFLSH;
 
-  if (cfsetspeed(&cur_termios, br)) failwith("setting modem serial device speed");
+  if (cfsetspeed(&cur_termios, br)) caml_failwith("setting modem serial device speed");
 
-  if (tcsetattr(fd, TCSADRAIN, &cur_termios)) failwith("setting modem serial device attr");
+  if (tcsetattr(fd, TCSADRAIN, &cur_termios)) caml_failwith("setting modem serial device attr");
 
   CAMLreturn (Val_int(fd));
 }
@@ -160,7 +160,7 @@ value c_serial_set_baudrate(value val_fd, value speed)
   int fd = Int_val(val_fd);
 
   if (tcgetattr(fd, &tio) < 0) {
-    failwith("tcgetattr");
+    caml_failwith("tcgetattr");
   }
   tio.c_iflag = 0;
   tio.c_oflag = 0;
@@ -175,7 +175,7 @@ value c_serial_set_baudrate(value val_fd, value speed)
   cfsetispeed(&tio, br);
   cfsetospeed(&tio, br);
   if (tcsetattr(fd, TCSANOW | TCSAFLUSH, &tio) < 0) {
-    failwith("tcsetattr");
+    caml_failwith("tcsetattr");
   }
   CAMLreturn (Val_unit);
 }