From 7f13edd14a36e76cfec0e05e1ec85b7840f972fe Mon Sep 17 00:00:00 2001 From: Arash Hatami Date: Sun, 14 Nov 2021 18:52:05 +0330 Subject: [PATCH] Fix misspelled words --- libs/hbb_common/protos/rendezvous.proto | 4 ++-- libs/hbb_common/src/fs.rs | 10 +++++----- libs/hbb_common/src/tcp.rs | 2 +- libs/hbb_common/src/udp.rs | 2 +- src/client.rs | 2 +- src/ipc.rs | 4 ++-- src/rendezvous_mediator.rs | 8 ++++---- src/ui.rs | 2 +- src/ui/remote.rs | 15 ++++++++------- src/windows.cc | 2 +- 10 files changed, 26 insertions(+), 25 deletions(-) diff --git a/libs/hbb_common/protos/rendezvous.proto b/libs/hbb_common/protos/rendezvous.proto index bd058ac4d..e38dbb84c 100644 --- a/libs/hbb_common/protos/rendezvous.proto +++ b/libs/hbb_common/protos/rendezvous.proto @@ -75,8 +75,8 @@ message PunchHoleResponse { enum Failure { ID_NOT_EXIST = 1; OFFLINE = 2; - LICENCE_MISMATCH = 3; - LICENCE_OVERUSE = 4; + LICENSE_MISMATCH = 3; + LICENSE_OVERUSE = 4; } Failure failure = 3; string relay_server = 4; diff --git a/libs/hbb_common/src/fs.rs b/libs/hbb_common/src/fs.rs index 2a3a6c9f4..99e594751 100644 --- a/libs/hbb_common/src/fs.rs +++ b/libs/hbb_common/src/fs.rs @@ -193,7 +193,7 @@ pub struct TransferJob { file: Option, total_size: u64, finished_size: u64, - transfered: u64, + transferred: u64, } #[inline] @@ -268,8 +268,8 @@ impl TransferJob { } #[inline] - pub fn transfered(&self) -> u64 { - self.transfered + pub fn transferred(&self) -> u64 { + self.transferred } #[inline] @@ -332,7 +332,7 @@ impl TransferJob { self.file.as_mut().unwrap().write_all(&block.data).await?; self.finished_size += block.data.len() as u64; } - self.transfered += block.data.len() as u64; + self.transferred += block.data.len() as u64; Ok(()) } @@ -398,7 +398,7 @@ impl TransferJob { compressed = true; } } - self.transfered += buf.len() as u64; + self.transferred += buf.len() as u64; } Ok(Some(FileTransferBlock { id: self.id, diff --git a/libs/hbb_common/src/tcp.rs b/libs/hbb_common/src/tcp.rs index a83ae36ab..0789c87f0 100644 --- a/libs/hbb_common/src/tcp.rs +++ b/libs/hbb_common/src/tcp.rs @@ -34,7 +34,7 @@ fn new_socket(addr: std::net::SocketAddr, reuse: bool) -> Result Result { if reuse { // windows has no reuse_port, but it's reuse_address // almost equals to unix's reuse_port + reuse_address, - // though may introduce nondeterministic bahavior + // though may introduce nondeterministic behavior #[cfg(unix)] socket.set_reuse_port(true)?; socket.set_reuse_address(true)?; diff --git a/src/client.rs b/src/client.rs index 0416e8582..4484a8f0a 100644 --- a/src/client.rs +++ b/src/client.rs @@ -141,7 +141,7 @@ impl Client { punch_hole_response::Failure::OFFLINE => { bail!("Remote desktop is offline"); } - punch_hole_response::Failure::LICENCE_MISMATCH => { + punch_hole_response::Failure::LICENSE_MISMATCH => { bail!("Key mismatch"); } _ => { diff --git a/src/ipc.rs b/src/ipc.rs index b4e11e40a..0474e457f 100644 --- a/src/ipc.rs +++ b/src/ipc.rs @@ -147,7 +147,7 @@ pub async fn new_listener(postfix: &str) -> ResultType { } Err(err) => { log::error!( - "Faild to start ipc{} server at path {}: {}", + "Failed to start ipc{} server at path {}: {}", postfix, path, err @@ -374,7 +374,7 @@ pub fn set_password(v: String) -> ResultType<()> { pub fn get_id() -> String { if let Ok(Some(v)) = get_config("id") { - // update salt also, so that nexttime reinstallation not causing first-time auto-login failure + // update salt also, so that next time reinstallation not causing first-time auto-login failure if let Ok(Some(v2)) = get_config("salt") { Config::set_salt(&v2); } diff --git a/src/rendezvous_mediator.rs b/src/rendezvous_mediator.rs index 13f0f605c..a89fca945 100644 --- a/src/rendezvous_mediator.rs +++ b/src/rendezvous_mediator.rs @@ -34,7 +34,7 @@ pub struct RendezvousMediator { host: String, host_prefix: String, rendezvous_servers: Vec, - last_id_pk_registery: String, + last_id_pk_registry: String, } impl RendezvousMediator { @@ -90,7 +90,7 @@ impl RendezvousMediator { host: host.clone(), host_prefix, rendezvous_servers, - last_id_pk_registery: "".to_owned(), + last_id_pk_registry: "".to_owned(), }; allow_err!(rz.dns_check()); let mut socket = FramedSocket::new(Config::get_any_listen_addr()).await?; @@ -377,7 +377,7 @@ impl RendezvousMediator { pk.clone() }; let id = Config::get_id(); - self.last_id_pk_registery = id.clone(); + self.last_id_pk_registry = id.clone(); msg_out.set_register_pk(RegisterPk { id, uuid, @@ -389,7 +389,7 @@ impl RendezvousMediator { } async fn handle_uuid_mismatch(&mut self, socket: &mut FramedSocket) -> ResultType<()> { - if self.last_id_pk_registery != Config::get_id() { + if self.last_id_pk_registry != Config::get_id() { return Ok(()); } { diff --git a/src/ui.rs b/src/ui.rs index 15c2bc9ee..dc229067f 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -621,7 +621,7 @@ pub fn check_zombie(childs: Childs) { } } -// notice: avoiding create ipc connecton repeatly, +// notice: avoiding create ipc connection repeatedly, // because windows named pipe has serious memory leak issue. #[tokio::main(flavor = "current_thread")] async fn check_connect_status_( diff --git a/src/ui/remote.rs b/src/ui/remote.rs index 8cd4b09d8..8c82ce4d5 100644 --- a/src/ui/remote.rs +++ b/src/ui/remote.rs @@ -694,8 +694,8 @@ impl Handler { let mut key_event = KeyEvent::new(); if down_or_up == 2 { /* windows send both keyup/keydown and keychar, so here we avoid keychar - for <= 0xFF, best practise should only avoid those not on keyboard, but - for now, we have no way to test, so avoid <= 0xFF totaly + for <= 0xFF, best practice should only avoid those not on keyboard, but + for now, we have no way to test, so avoid <= 0xFF totally */ if code <= 0xFF { return None; @@ -891,7 +891,8 @@ impl Handler { let mut name = name; #[cfg(target_os = "linux")] - if code == 65383 { // VK_MENU + if code == 65383 { + // VK_MENU name = "Apps".to_owned(); } @@ -1435,16 +1436,16 @@ impl Remote { if elapsed <= 0 { return; } - let transfered = job.transfered(); - let last_transfered = { + let transferred = job.transferred(); + let last_transferred = { if let Some(v) = last_update_jobs_status.1.get(&job.id()) { v.to_owned() } else { 0 } }; - last_update_jobs_status.1.insert(job.id(), transfered); - let speed = (transfered - last_transfered) as f64 / (elapsed as f64 / 1000.); + last_update_jobs_status.1.insert(job.id(), transferred); + let speed = (transferred - last_transferred) as f64 / (elapsed as f64 / 1000.); let file_num = job.file_num() - 1; handler.call( "jobProgress", diff --git a/src/windows.cc b/src/windows.cc index e9a7294cd..162c8a0a7 100644 --- a/src/windows.cc +++ b/src/windows.cc @@ -89,7 +89,7 @@ extern "C" CreateEnvironmentBlock(&lpEnvironment, // Environment block hToken, // New token - TRUE); // Inheritence + TRUE); // Inheritance } if (lpEnvironment) {