From nobody Tue Nov 15 22:38:46 2022 X-Original-To: dev-commits-src-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 4NBh123L5qz4dFwj; Tue, 15 Nov 2022 22:38:46 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NBh122pl8z3JSt; Tue, 15 Nov 2022 22:38:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668551926; 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=PB0z/Y9YukYmIp0oKeXEsLVV1Y2P134BuS/UWrMFp1U=; b=cd/jaAXM9igiy4rnp0DxGYRMJgU/3x/S19BREcKY/75pSwHJf1NvPedVSddlDbrT0ytGny 9c+lumf0ZkgVB3a1iVVHqRIoMAJL46UX3UEwYE9C5GdC+aeNuuSutXcPGy+mLc6Aduyeis QsCKpA5T61qj5KA/7EimkeSjOkRfDzcQXJX3o+aOtWo7EWTQAY2bPTz5ro1V+pzO5x1W3T wtrlqlmEL+ACIrqTX/AeaF75uG9PS7Rc0laTH6faysRQXmK38ekZJUH5Bx2ncqaUefxc3m bBUiswjTvs1HZpb7tO8H9ONfesOzrPAFpxqVu9jXA5BmRs8y4VHmzxHlaZ4AKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668551926; 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=PB0z/Y9YukYmIp0oKeXEsLVV1Y2P134BuS/UWrMFp1U=; b=W27phNLMHZByjrA1ws0zkXmQtx5FgzMcV9CrKfBGTpB5Pzy2yv2UzSUjMKjOHD6f9KmdBn xMIq11CtgOT5hRuRZ+JHhXFjbojORZwqRArBYfoMjeMqyPUBYsxtXrngF8M4PVUCP2Vj+f b3KFs0BnvBDxp62PJbL2nqWbNP6bn9EYXh8S4r+79FBHBo/UNIqhzwPEbwtfJdP/lbqq5Q FuNSIppo2HccqC6FW8mjxtQ3xK49MinLWG0azcpdIYp1H18anD4+/f1pTcQIBIlBhADuIm UEefPHrP9MzOTrEy5zNW3wCOgHfkpARHB1GIROnKupLQd490WcuZZh8doYf2zQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668551926; a=rsa-sha256; cv=none; b=LMk2r2rMHhannwtEP0hHTRChM38QhV01KZkKE0Yk1M18M6c1dg8V2FIP28PI9MzVdKaI/f BUrLljx4FLUWuZilqYmZOoab2jaVWksW9nIvTomieYlwGXmP/cK3xXaBOJCyLtyxYy02lf MXlP90AWzTdyA5ZUsfjqBsZBVVUcv+jEFcySUnVhSWd2VBnsxFKp4WgZbho6ZluqUiUWgz BLK+ZqzVtYzGQQp0gUmI1KlJHcbM7QFU/1+ikPq54sty73j93K99RdRC2oG3lWk8O2yveb EuzbckWDsLVu3ezGrqBbv++b7CTMce1hr/MEu2rp7KE7tc/bpq4kDwCsuwmr2w== 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 4NBh121cSWzdyV; Tue, 15 Nov 2022 22:38:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AFMckOI043417; Tue, 15 Nov 2022 22:38:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AFMckpO043416; Tue, 15 Nov 2022 22:38:46 GMT (envelope-from git) Date: Tue, 15 Nov 2022 22:38:46 GMT Message-Id: <202211152238.2AFMckpO043416@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: eb0292d92974 - main - tftpd: cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eb0292d92974781023999df7f654dbcf1c057960 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=eb0292d92974781023999df7f654dbcf1c057960 commit eb0292d92974781023999df7f654dbcf1c057960 Author: Dag-Erling Smørgrav AuthorDate: 2022-11-15 22:37:54 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2022-11-15 22:37:54 +0000 tftpd: cleanup Sponsored by: Klara, Inc. --- libexec/tftpd/Makefile | 1 - libexec/tftpd/tftp-io.c | 4 ++-- libexec/tftpd/tftp-options.c | 6 +++--- libexec/tftpd/tftp-transfer.c | 4 ++-- libexec/tftpd/tftp-utils.c | 1 + libexec/tftpd/tftpd.c | 4 +++- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/libexec/tftpd/Makefile b/libexec/tftpd/Makefile index b311ac8aa09e..d94df7c27074 100644 --- a/libexec/tftpd/Makefile +++ b/libexec/tftpd/Makefile @@ -7,7 +7,6 @@ PROG= tftpd MAN= tftpd.8 SRCS= tftp-file.c tftp-io.c tftp-options.c tftp-transfer.c tftp-utils.c SRCS+= tftpd.c -WFORMAT=0 .if ${MK_TCP_WRAPPERS} != "no" CFLAGS+= -DLIBWRAP diff --git a/libexec/tftpd/tftp-io.c b/libexec/tftpd/tftp-io.c index 459a81508e2b..71fd57c6a7be 100644 --- a/libexec/tftpd/tftp-io.c +++ b/libexec/tftpd/tftp-io.c @@ -28,13 +28,13 @@ #include __FBSDID("$FreeBSD$"); -#include #include #include +#include #include -#include #include +#include #include #include diff --git a/libexec/tftpd/tftp-options.c b/libexec/tftpd/tftp-options.c index 10fb112654fd..a2dd1019f811 100644 --- a/libexec/tftpd/tftp-options.c +++ b/libexec/tftpd/tftp-options.c @@ -28,10 +28,10 @@ #include __FBSDID("$FreeBSD$"); -#include #include -#include +#include #include +#include #include #include @@ -91,7 +91,7 @@ option_tsize(int peer __unused, struct tftphdr *tp __unused, int mode, if (mode == RRQ) asprintf(&options[OPT_TSIZE].o_reply, - "%ju", stbuf->st_size); + "%ju", (uintmax_t)stbuf->st_size); else /* XXX Allows writes of all sizes. */ options[OPT_TSIZE].o_reply = diff --git a/libexec/tftpd/tftp-transfer.c b/libexec/tftpd/tftp-transfer.c index 0a0c099e4c33..5c037bc38f86 100644 --- a/libexec/tftpd/tftp-transfer.c +++ b/libexec/tftpd/tftp-transfer.c @@ -28,11 +28,11 @@ #include __FBSDID("$FreeBSD$"); -#include #include #include -#include #include +#include +#include #include #include diff --git a/libexec/tftpd/tftp-utils.c b/libexec/tftpd/tftp-utils.c index d706639d51e8..24ce505ab812 100644 --- a/libexec/tftpd/tftp-utils.c +++ b/libexec/tftpd/tftp-utils.c @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c index 02fbaaf0d371..02df60c87734 100644 --- a/libexec/tftpd/tftpd.c +++ b/libexec/tftpd/tftpd.c @@ -52,8 +52,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include +#include +#include #include #include @@ -68,6 +69,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include "tftp-file.h"