From 7c765a181db7eb72085be85014241aed3db476da Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Thu, 4 Apr 2024 16:27:06 -0400 Subject: [PATCH] remove dead code --- src/core/IO.ml | 25 ------------------------- src/ws/tiny_httpd_ws.ml | 3 +++ 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/src/core/IO.ml b/src/core/IO.ml index 249da955..58771305 100644 --- a/src/core/IO.ml +++ b/src/core/IO.ml @@ -178,31 +178,6 @@ module Input = struct len := !len - n done - let append (i1 : #t) (i2 : #t) : t = - let use_i1 = ref true in - let rec input_rec (slice : Slice.t) = - if !use_i1 then ( - slice.len <- input i1 slice.bytes 0 (Bytes.length slice.bytes); - if slice.len = 0 then ( - use_i1 := false; - input_rec slice - ) - ) else - slice.len <- input i1 slice.bytes 0 (Bytes.length slice.bytes) - in - - object - inherit Iostream.In_buf.t_from_refill () - - method private refill (slice : Slice.t) = - slice.off <- 0; - input_rec slice - - method close () = - close i1; - close i2 - end - let iter_slice (f : Slice.t -> unit) (self : #t) : unit = let continue = ref true in while !continue do diff --git a/src/ws/tiny_httpd_ws.ml b/src/ws/tiny_httpd_ws.ml index dea1704f..3cc33c02 100644 --- a/src/ws/tiny_httpd_ws.ml +++ b/src/ws/tiny_httpd_ws.ml @@ -299,6 +299,9 @@ module Reader = struct let rec read_rec (self : t) buf i len : int = match self.state with | Close -> 0 + | Reading_frame r when r.remaining_bytes = 0 -> + self.state <- Begin; + read_rec self buf i len | Reading_frame r -> let len = min len r.remaining_bytes in let n = IO.Input.input self.ic buf i len in