From 9b4a133777e8d25eda0f9f44095bc4a10d8cce21 Mon Sep 17 00:00:00 2001 From: Philippe Antoine Date: Sun, 24 Jul 2022 21:54:24 +0200 Subject: [PATCH] http2: remove to_vec for comparisons Ticket: #5454 --- rust/src/http2/decompression.rs | 6 +++--- rust/src/http2/detect.rs | 6 +++--- rust/src/http2/http2.rs | 2 +- rust/src/http2/range.rs | 12 ++++++------ 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/rust/src/http2/decompression.rs b/rust/src/http2/decompression.rs index 40ef9b55d3..164ff3224d 100644 --- a/rust/src/http2/decompression.rs +++ b/rust/src/http2/decompression.rs @@ -168,13 +168,13 @@ impl HTTP2DecoderHalf { pub fn http2_encoding_fromvec(&mut self, input: &[u8]) { //use first encoding... if self.encoding == HTTP2ContentEncoding::HTTP2ContentEncodingUnknown { - if *input == "gzip".as_bytes().to_vec() { + if input == b"gzip" { self.encoding = HTTP2ContentEncoding::HTTP2ContentEncodingGzip; self.decoder = HTTP2Decompresser::GZIP(GzDecoder::new(HTTP2cursor::new())); - } else if *input == "deflate".as_bytes().to_vec() { + } else if input == b"deflate" { self.encoding = HTTP2ContentEncoding::HTTP2ContentEncodingDeflate; self.decoder = HTTP2Decompresser::DEFLATE(DeflateDecoder::new(HTTP2cursor::new())); - } else if *input == "br".as_bytes().to_vec() { + } else if input == b"br" { self.encoding = HTTP2ContentEncoding::HTTP2ContentEncodingBr; self.decoder = HTTP2Decompresser::BROTLI(brotli::Decompressor::new( HTTP2cursor::new(), diff --git a/rust/src/http2/detect.rs b/rust/src/http2/detect.rs index eed1999a08..a6452aef21 100644 --- a/rust/src/http2/detect.rs +++ b/rust/src/http2/detect.rs @@ -416,7 +416,7 @@ fn http2_frames_get_header_firstvalue<'a>( for i in 0..frames.len() { if let Some(blocks) = http2_header_blocks(&frames[i]) { for block in blocks.iter() { - if block.name == name.as_bytes().to_vec() { + if block.name == name.as_bytes() { return Ok(&block.value); } } @@ -440,7 +440,7 @@ pub fn http2_frames_get_header_value_vec( for i in 0..frames.len() { if let Some(blocks) = http2_header_blocks(&frames[i]) { for block in blocks.iter() { - if block.name == name.as_bytes().to_vec() { + if block.name == name.as_bytes() { if found == 0 { vec.extend_from_slice(&block.value); found = 1; @@ -477,7 +477,7 @@ fn http2_frames_get_header_value<'a>( for i in 0..frames.len() { if let Some(blocks) = http2_header_blocks(&frames[i]) { for block in blocks.iter() { - if block.name == name.as_bytes().to_vec() { + if block.name == name.as_bytes() { if found == 0 { single = Ok(&block.value); found = 1; diff --git a/rust/src/http2/http2.rs b/rust/src/http2/http2.rs index 3b06e4ed9b..533ea491b0 100644 --- a/rust/src/http2/http2.rs +++ b/rust/src/http2/http2.rs @@ -194,7 +194,7 @@ impl HTTP2Transaction { fn handle_headers(&mut self, blocks: &Vec, dir: Direction) { for i in 0..blocks.len() { - if blocks[i].name == "content-encoding".as_bytes().to_vec() { + if blocks[i].name == b"content-encoding" { self.decoder.http2_encoding_fromvec(&blocks[i].value, dir); } } diff --git a/rust/src/http2/range.rs b/rust/src/http2/range.rs index 34217ed40b..5d42c12f79 100644 --- a/rust/src/http2/range.rs +++ b/rust/src/http2/range.rs @@ -169,12 +169,12 @@ pub fn http2_range_close( ) { let added = if let Some(c) = unsafe { SC } { let added = (c.HTPFileCloseHandleRange)( - files, - flags, - tx.file_range, - data.as_ptr(), - data.len() as u32, - ); + files, + flags, + tx.file_range, + data.as_ptr(), + data.len() as u32, + ); (c.HttpRangeFreeBlock)(tx.file_range); added } else { -- 2.47.2