net: fix typos (#18164)

ttytm · web-flow · commit 67e3061ea119 · 2023-05-12T09:31:27.000+03:00
diff --git a/vlib/net/aasocket.c.v b/vlib/net/aasocket.c.v
@@ -53,7 +53,7 @@ fn C.ntohl(net u32) u32
 fn C.ntohs(net u16) u16
 
 // fn C.bind(sockfd int, addr &C.sockaddr, addrlen C.socklen_t) int
-// use voidptr for arg 2 becasue sockaddr is a generic descriptor for any kind of socket operation,
+// use voidptr for arg 2 because sockaddr is a generic descriptor for any kind of socket operation,
 // it can also take sockaddr_in depending on the type of socket used in arg 1
 fn C.bind(sockfd int, addr &Addr, addrlen u32) int
 
diff --git a/vlib/net/ftp/ftp.v b/vlib/net/ftp/ftp.v
@@ -201,7 +201,7 @@ fn (mut zftp FTP) pasv() !&DTP {
 		println('pass: ${data}')
 	}
 	if code != ftp.passive_mode {
-		return error('pasive mode not allowed')
+		return error('passive mode not allowed')
 	}
 	dtp := new_dtp(data)!
 	return dtp
diff --git a/vlib/net/ftp/ftp_test.v b/vlib/net/ftp/ftp_test.v
@@ -1,6 +1,6 @@
 import net.ftp
 
-fn test_ftp_cleint() {
+fn test_ftp_client() {
 	$if !network ? {
 		return
 	}
diff --git a/vlib/net/http/request.v b/vlib/net/http/request.v
@@ -52,7 +52,7 @@ pub fn (mut req Request) add_custom_header(key string, val string) ! {
 	return req.header.add_custom(key, val)
 }
 
-// do will send the HTTP request and returns `http.Response` as soon as the response is recevied
+// do will send the HTTP request and returns `http.Response` as soon as the response is received
 pub fn (req &Request) do() !Response {
 	mut url := urllib.parse(req.url) or { return error('http.Request.do: invalid url ${req.url}') }
 	mut rurl := url
diff --git a/vlib/net/http/server.v b/vlib/net/http/server.v
@@ -76,7 +76,7 @@ pub fn (mut s Server) stop() {
 	s.state = .stopped
 }
 
-// close immediatly closes the port and signals the server that it has been closed.
+// close immediately closes the port and signals the server that it has been closed.
 [inline]
 pub fn (mut s Server) close() {
 	s.state = .closed
diff --git a/vlib/net/openssl/c.v b/vlib/net/openssl/c.v
@@ -1,6 +1,6 @@
 module openssl
 
-// On Linux, prefer a localy built openssl, because it is
+// On Linux, prefer a locally built openssl, because it is
 // much more likely for it to be newer, than the system
 // openssl from libssl-dev. If there is no local openssl,
 // the next #pkgconfig flag is harmless, since it will still
diff --git a/vlib/net/smtp/smtp.v b/vlib/net/smtp/smtp.v
@@ -162,7 +162,7 @@ fn (mut c Client) expect_reply(expected ReplyCode) ! {
 			return error('Received unexpected status code ${status}, expecting ${expected}')
 		}
 	} else {
-		return error('Recieved unexpected SMTP data: ${str}')
+		return error('Received unexpected SMTP data: ${str}')
 	}
 }
 
diff --git a/vlib/net/socket_options.c.v b/vlib/net/socket_options.c.v
@@ -1,7 +1,7 @@
 module net
 
 pub enum SocketOption {
-	// TODO: SO_ACCEPT_CONN is not here because windows doesnt support it
+	// TODO: SO_ACCEPT_CONN is not here because windows doesn't support it
 	// and there is no easy way to define it
 	broadcast = C.SO_BROADCAST
 	debug = C.SO_DEBUG
@@ -11,9 +11,9 @@ pub enum SocketOption {
 	linger = C.SO_LINGER
 	oob_inline = C.SO_OOBINLINE
 	reuse_addr = C.SO_REUSEADDR
-	recieve_buf_size = C.SO_RCVBUF
-	recieve_low_size = C.SO_RCVLOWAT
-	recieve_timeout = C.SO_RCVTIMEO
+	receive_buf_size = C.SO_RCVBUF
+	receive_low_size = C.SO_RCVLOWAT
+	receive_timeout = C.SO_RCVTIMEO
 	send_buf_size = C.SO_SNDBUF
 	send_low_size = C.SO_SNDLOWAT
 	send_timeout = C.SO_SNDTIMEO
@@ -24,9 +24,9 @@ pub enum SocketOption {
 const (
 	opts_bool    = [SocketOption.broadcast, .debug, .dont_route, .error, .keep_alive, .oob_inline]
 	opts_int     = [
-		.recieve_buf_size,
-		.recieve_low_size,
-		.recieve_timeout,
+		.receive_buf_size,
+		.receive_low_size,
+		.receive_timeout,
 		.send_buf_size,
 		.send_low_size,
 		.send_timeout,
@@ -39,9 +39,9 @@ const (
 		.keep_alive,
 		.linger,
 		.oob_inline,
-		.recieve_buf_size,
-		.recieve_low_size,
-		.recieve_timeout,
+		.receive_buf_size,
+		.receive_low_size,
+		.receive_timeout,
 		.send_buf_size,
 		.send_low_size,
 		.send_timeout,
diff --git a/vlib/net/urllib/urllib.v b/vlib/net/urllib/urllib.v
@@ -415,7 +415,7 @@ fn get_scheme(rawurl string) !string {
 	return split[0]
 }
 
-// split slices s into two substrings separated by the first occurence of
+// split slices s into two substrings separated by the first occurrence of
 // sep. If cutc is true then sep is included with the second substring.
 // If sep does not occur in s then s and the empty string is returned.
 fn split(s string, sep u8, cutc bool) (string, string) {
diff --git a/vlib/net/websocket/message.v b/vlib/net/websocket/message.v
@@ -112,7 +112,7 @@ fn (mut ws Client) read_payload(frame &Frame) ![]u8 {
 fn (mut ws Client) validate_utf_8(opcode OPCode, payload []u8) ! {
 	if opcode in [.text_frame, .close] && !utf8.validate(payload.data, payload.len) {
 		ws.logger.error('malformed utf8 payload, payload len: (${payload.len})')
-		ws.send_error_event('Recieved malformed utf8.')
+		ws.send_error_event('Received malformed utf8.')
 		ws.close(1007, 'malformed utf8 payload')!
 		return error('malformed utf8 payload')
 	}
@@ -180,7 +180,7 @@ pub fn (mut ws Client) read_next_message() !Message {
 	return error('none')
 }
 
-// payload_from_fragments returs the whole paylaod from fragmented message
+// payload_from_fragments returns the whole paylaod from fragmented message
 fn (ws Client) payload_from_fragments(fin_payload []u8) ![]u8 {
 	mut total_size := 0
 	for f in ws.fragments {
@@ -231,7 +231,7 @@ pub fn (mut ws Client) parse_frame_header() !Frame {
 			frame.opcode = unsafe { OPCode(int(buffer[0] & 0x7F)) }
 			frame.has_mask = (buffer[1] & 0x80) == 0x80
 			frame.payload_len = buffer[1] & 0x7F
-			// if has mask set the byte postition where mask ends
+			// if the frame has a mask, set the byte position where the mask ends
 			if frame.has_mask {
 				mask_end_byte = if frame.payload_len < 126 {
 					websocket.header_len_offset + 4
diff --git a/vlib/net/websocket/utils.v b/vlib/net/websocket/utils.v
@@ -18,18 +18,18 @@ fn htonl64(payload_len u64) []u8 {
 	return ret
 }
 
-// create_masking_key returs a new masking key to use when masking websocket messages
+// create_masking_key returns a new masking key to use when masking websocket messages
 fn create_masking_key() []u8 {
 	mask_bit := rand.u8()
 	buf := []u8{len: 4, init: `0`}
 	unsafe { C.memcpy(buf.data, &mask_bit, 4) }
 	return buf
 }
 
-// create_key_challenge_response creates a key challange response from security key
+// create_key_challenge_response creates a key challenge response from security key
 fn create_key_challenge_response(seckey string) !string {
 	if seckey.len == 0 {
-		return error('unexpected seckey lengt zero')
+		return error('unexpected seckey length zero')
 	}
 	guid := '258EAFA5-E914-47DA-95CA-C5AB0DC85B11'
 	sha1buf := seckey + guid
diff --git a/vlib/net/websocket/websocket_test.v b/vlib/net/websocket/websocket_test.v
@@ -10,7 +10,7 @@ pub mut:
 	nr_closes        int
 }
 
-// Do not run these tests everytime, since they are flaky.
+// Do not run these tests every time, since they are flaky.
 // They have their own specialized CI runner.
 const github_job = os.getenv('GITHUB_JOB')
 
@@ -129,10 +129,10 @@ fn ws_test(family net.AddrFamily, uri string) ! {
 		client.write(msg.bytes(), .text_frame) or {
 			panic('fail to write to websocket, err: ${err}')
 		}
-		// sleep to give time to recieve response before send a new one
+		// sleep to give time to receive response before send a new one
 		time.sleep(100 * time.millisecond)
 	}
-	// sleep to give time to recieve response before asserts
+	// sleep to give time to receive response before asserts
 	time.sleep(1500 * time.millisecond)
 	// We expect at least 2 pongs, one sent directly and one indirectly
 	assert test_results.nr_pong_received >= 2

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ fn (mut zftp FTP) pasv() !&DTP {`
`201`	`201`	`println('pass: ${data}')`
`202`	`202`	`}`
`203`	`203`	`if code != ftp.passive_mode {`
`204`		`- return error('pasive mode not allowed')`
	`204`	`+ return error('passive mode not allowed')`
`205`	`205`	`}`
`206`	`206`	`dtp := new_dtp(data)!`
`207`	`207`	`return dtp`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import net.ftp`
`2`	`2`
`3`		`-fn test_ftp_cleint() {`
	`3`	`+fn test_ftp_client() {`
`4`	`4`	`$if !network ? {`
`5`	`5`	`return`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ pub fn (mut req Request) add_custom_header(key string, val string) ! {`
`52`	`52`	`return req.header.add_custom(key, val)`
`53`	`53`	`}`
`54`	`54`
`55`		-// do will send the HTTP request and returns `http.Response` as soon as the response is recevied
	`55`	+// do will send the HTTP request and returns `http.Response` as soon as the response is received
`56`	`56`	`pub fn (req &Request) do() !Response {`
`57`	`57`	`mut url := urllib.parse(req.url) or { return error('http.Request.do: invalid url ${req.url}') }`
`58`	`58`	`mut rurl := url`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ pub fn (mut s Server) stop() {`
`76`	`76`	`s.state = .stopped`
`77`	`77`	`}`
`78`	`78`
`79`		`-// close immediatly closes the port and signals the server that it has been closed.`
	`79`	`+// close immediately closes the port and signals the server that it has been closed.`
`80`	`80`	`[inline]`
`81`	`81`	`pub fn (mut s Server) close() {`
`82`	`82`	`s.state = .closed`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ fn (mut c Client) expect_reply(expected ReplyCode) ! {`
`162`	`162`	`return error('Received unexpected status code ${status}, expecting ${expected}')`
`163`	`163`	`}`
`164`	`164`	`} else {`
`165`		`- return error('Recieved unexpected SMTP data: ${str}')`
	`165`	`+ return error('Received unexpected SMTP data: ${str}')`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`
Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,7 @@ fn get_scheme(rawurl string) !string {`
`415`	`415`	`return split[0]`
`416`	`416`	`}`
`417`	`417`
`418`		`-// split slices s into two substrings separated by the first occurence of`
	`418`	`+// split slices s into two substrings separated by the first occurrence of`
`419`	`419`	`// sep. If cutc is true then sep is included with the second substring.`
`420`	`420`	`// If sep does not occur in s then s and the empty string is returned.`
`421`	`421`	`fn split(s string, sep u8, cutc bool) (string, string) {`