From nobody Wed Sep 4 11:43:00 2024 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzLGD5zYgz5TkWc for ; Wed, 04 Sep 2024 11:43:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WzLGD5Mm5z52by; Wed, 4 Sep 2024 11:43:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725450180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hOV+Kxgep4cYOkOnhAYOu8lPgchmkBre9bzakMfi4Lc=; b=OyDNSH9PRdAUExiKz5soIl0GxIbISUZdmucx5ii5wEM6R7BSlLxB2/kiwuZuVAMNw/TILA WVE56Bc/Gyivkv9faU+b0yQCniZwacOJFlfRGeceNZDUYaq8xRHXy+pIbrOV+eCCVE+E6+ 0CDxFXt5CWruySGRQnqL/K92BY3U5AAAN3kHB80HBS7I5glkcnKesJ9czzBiMe5WPIheV1 plVLJcktuSJhwOSK2di/Sy/qswBnvsCPmi/kRfHB2HwwjtBnPHW5gk1Zks7p4h3oQbx7i4 XP3vzNrSYKsd2z1Uvm9mGuQQ+ObymPZe5lDRM38AwzQyfgDwQOaPQ6ITQl6haA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725450180; a=rsa-sha256; cv=none; b=KJGsSKebqMaNB9IBn/6eJZB9vMpfj5L6UhifUH+HXzvZ+7k2voDb77gqOqh8phc4hxD97F 01fqS1RskQK+Gbrk2N1sh6Ac8BxGp7mqDC2XfLQWln8QOez2UOQAjEqMeJe6KSeU/BL7g4 Dp4RMbgsvD2yCFMgqtM2+7lvq1UaG17pT7zvHG9gDHwsQ+ikIUTtTlay3LVE8hz+3oSDOC i8MnpbvfSjy6bM3I0z+qDam9K01d5YLJsXa0WrtcOZ/5SUX8xzT9sMrVwYP3ftTGDzOo85 McUw7Zk2NH4r8LDJO5b7+SuwU5fa6QE3qkRhM29HT+++0BoM5nOFYSdBTCDfsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725450180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hOV+Kxgep4cYOkOnhAYOu8lPgchmkBre9bzakMfi4Lc=; b=gnCkCmP1HTXx6V6ruwUbx1qIc1Ke73Qrg9bHVyz3VWB/+15rx/Jh9wwKQKuXjly8oxGmku t/XCRJ8ysTTmo1jaemMSTf8LoGQ4tXHDCq1TRkgy26vcWDyRiHnLlh1OGeZzbMbzCTzhVi 8TWWs4T+kLYo/QZhehjsva3IPSAprg/n1OCdIajnQRoTIO50fJM3m7kglWmInyaaRo3tVK lOlwSypjT56dX9LfZiWnrhLk1hORoEOVZv/EFE9k+jeKzENbt9h+ELJQVlw668ZcA63nkm LpHqe0rVkhphW59WcQkeSYcCCoVddepFLIuYtsYHX4C2RABNXzRi3crjZ1+wRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WzLGD4tlvzNfR; Wed, 4 Sep 2024 11:43:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 484Bh0OU093898; Wed, 4 Sep 2024 11:43:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484Bh07o093895; Wed, 4 Sep 2024 11:43:00 GMT (envelope-from git) Date: Wed, 4 Sep 2024 11:43:00 GMT Message-Id: <202409041143.484Bh07o093895@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Daniel Ebdrup Jensen Subject: git: 920aa82eb1 - main - sockets(examples): remove unused register, replace bzero with memset List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: debdrup X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 920aa82eb14f94dfd90648617bf6cc3df1e68715 Auto-Submitted: auto-generated The branch main has been updated by debdrup: URL: https://cgit.FreeBSD.org/doc/commit/?id=920aa82eb14f94dfd90648617bf6cc3df1e68715 commit 920aa82eb14f94dfd90648617bf6cc3df1e68715 Author: rilysh AuthorDate: 2024-09-04 04:59:11 +0000 Commit: Daniel Ebdrup Jensen CommitDate: 2024-09-04 11:42:03 +0000 sockets(examples): remove unused register, replace bzero with memset * Remove the redundant register keyword from the variables, as most compilers (GCC/Clang) just ignore them, and they're mostly just noise. * Replace bzero() with memset(). IEEE 1003.1-2008 removes the spec of bzero(), replacing it with memset(). * Use socklen_t (unsigned type) for variable b in the socket bind example. * Add unistd.h header file in the socket connect example (it is used by the write() and read() libc calls). Remove unnecessary (char *) cast from argv[1]. Signed-off-by: rilysh Reviewed-by: emaste@ --- .../books/developers-handbook/sockets/_index.adoc | 24 +++++++++------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/documentation/content/en/books/developers-handbook/sockets/_index.adoc b/documentation/content/en/books/developers-handbook/sockets/_index.adoc index 1a4d4cd522..159fbd6622 100644 --- a/documentation/content/en/books/developers-handbook/sockets/_index.adoc +++ b/documentation/content/en/books/developers-handbook/sockets/_index.adoc @@ -562,8 +562,7 @@ We now know enough to write a very simple client, one that will get current time #include int main() { - register int s; - register int bytes; + int s, bytes; struct sockaddr_in sa; char buffer[BUFSIZ+1]; @@ -572,7 +571,7 @@ int main() { return 1; } - bzero(&sa, sizeof sa); + memset(&sa, '\0', sizeof(sa)); sa.sin_family = AF_INET; sa.sin_port = htons(13); @@ -718,8 +717,8 @@ The child calls `listen`, then starts an endless loop, which accepts a connectio #define BACKLOG 4 int main() { - register int s, c; - int b; + int s, c; + socklen_t b; struct sockaddr_in sa; time_t t; struct tm *tm; @@ -730,7 +729,7 @@ int main() { return 1; } - bzero(&sa, sizeof sa); + memset(&sa, '\0', sizeof(sa)); sa.sin_family = AF_INET; sa.sin_port = htons(13); @@ -747,11 +746,9 @@ int main() { case -1: perror("fork"); return 3; - break; default: close(s); return 0; - break; case 0: break; } @@ -773,7 +770,6 @@ int main() { if ((t = time(NULL)) < 0) { perror("daytimed time"); - return 6; } @@ -976,14 +972,14 @@ This allows us to create a much more flexible-and much more useful-version of ou */ #include #include +#include #include #include #include #include int main(int argc, char *argv[]) { - register int s; - register int bytes; + int s, bytes; struct sockaddr_in sa; struct hostent *he; char buf[BUFSIZ+1]; @@ -994,19 +990,19 @@ int main(int argc, char *argv[]) { return 1; } - bzero(&sa, sizeof sa); + memset(&sa, '\0', sizeof(sa)); sa.sin_family = AF_INET; sa.sin_port = htons(13); - host = (argc > 1) ? (char *)argv[1] : "time.nist.gov"; + host = (argc > 1) ? argv[1] : "time.nist.gov"; if ((he = gethostbyname(host)) == NULL) { herror(host); return 2; } - bcopy(he->h_addr_list[0],&sa.sin_addr, he->h_length); + memcpy(&sa.sin_addr, he->h_addr_list[0], he->h_length); if (connect(s, (struct sockaddr *)&sa, sizeof sa) < 0) { perror("connect");