From nobody Fri Nov 18 16:01:59 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 4NDM3q4vT9z4hlrw; Fri, 18 Nov 2022 16:01:59 +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 4NDM3q47czz40qV; Fri, 18 Nov 2022 16:01:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668787319; 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=rCZwy0HIJirP3rwXKoCgCzQcd11mxE00BPEcr35Achk=; b=CrZDon1EuwcZCj/6XZ3pwlP+sM2+ZXC5m7AB2f3B5WfpAUAZ3K1JObYk0nNHOHE6afj99x murzPbwELUCin6gFpsilH1W07MzN7ornse7+WqxiIB4NURzcGGg07+l4Ore35KRYN8K0Wj BZfs5ZQ19CGRsBfpcfVYh0SyDXT/sGrgx8BBSSyWL747iRdJD72ei0L6szJpzBUj5c/zRQ g5pMc7nous/TmKk2ftTwsb6GA554OLTdvpAkq/6A5mOla50awx8UBNvMAigQ5h7jCEv5tw kgqaHikHU1TZ02zlGBi2jUC9NWiUz+ddmRdR4EARVG6gdsS9XnXtjvUAlRqSWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668787319; 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=rCZwy0HIJirP3rwXKoCgCzQcd11mxE00BPEcr35Achk=; b=yL3NVbN9iOkeSo98qjsV25+a94OQ+JukPoAw+NPkIlNGUWItjW39DREuC2eV9VSNkPr4rW 7mqfGIz95GMdd03WiBbUZfsDPZQkdLtVv5HWrZV9Irgk4xq9L9BwSxPvqmr2+Gzlyurar/ 2G9+mYCsqxaE5f+jFXGDacnNUCYbof820Ctf62XPFxPYIL4/BxpvNySBzxBIOASYS45pPT 9cF5zkfgeF5xED9YCEaZ2n7EF9c4UZIbg9mm7reE+/55d+ILne72ZRfmreL+oYtacAwAZV oSRvartGkk4y8tqWWx2BWAYMhv+jxc4jkRLj4TPkaiznVS5jhkIVWH+Smyi7Mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668787319; a=rsa-sha256; cv=none; b=FYtx0L+Xmn+1AJGCpfYz68tsiNn73AIKhBJnnPuNKpFR4yP2xX7HVJ0SkKqPFMZ6Db3Gq5 J2aW+wm33bog6T1xW0ugWECoXToekyZ+1FK41Y2+nAJbl21f+pNWtndOMox7b6kXQpZX6G KoLZqWWJz370N1Q2zGmh+emuP2Tnn524A7D+jqLCqifYYb66S2Ro13fWnvfRlHWcWfslOV 6uP5pRcTbD5dU7GvPKEkBCXCUCwxTr8n4gJdzdA9RYF5qSb2Zuidvvm1zo0b0317On5NPf 74zq4F2WAn74gaAKLnB9ZqRYymClSFxAxSgquSWWGEHaG3cZc/kEVG56Z9hRug== 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 4NDM3q2vHYz1QsL; Fri, 18 Nov 2022 16:01:59 +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 2AIG1xFb030191; Fri, 18 Nov 2022 16:01:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AIG1x2O030190; Fri, 18 Nov 2022 16:01:59 GMT (envelope-from git) Date: Fri, 18 Nov 2022 16:01:59 GMT Message-Id: <202211181601.2AIG1x2O030190@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: b9fabe997feb - main - tftp: 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: b9fabe997febc799cdaf751bdfb669e3c296e2b3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b9fabe997febc799cdaf751bdfb669e3c296e2b3 commit b9fabe997febc799cdaf751bdfb669e3c296e2b3 Author: Dag-Erling Smørgrav AuthorDate: 2022-11-18 16:01:09 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2022-11-18 16:01:30 +0000 tftp: cleanup Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D37433 --- usr.bin/tftp/main.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c index cfd486fb8418..05d8b31331f6 100644 --- a/usr.bin/tftp/main.c +++ b/usr.bin/tftp/main.c @@ -50,11 +50,10 @@ __FBSDID("$FreeBSD$"); * TFTP User Program -- Command Interface. */ #include -#include -#include -#include #include +#include #include +#include #include #include @@ -67,6 +66,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -126,7 +126,7 @@ static void putusage(char *); static void settftpmode(const char *); static char *tail(char *); -static struct cmd *getcmd(char *); +static const struct cmd *getcmd(const char *); #define HELPINDENT (sizeof("connect")) @@ -743,7 +743,7 @@ command_prompt(void) static void command(bool interactive, EditLine *el, History *hist, HistEvent *hep) { - struct cmd *c; + const struct cmd *c; const char *bp; char *cp; int len, num; @@ -787,21 +787,22 @@ command(bool interactive, EditLine *el, History *hist, HistEvent *hep) } } -static struct cmd * -getcmd(char *name) +static const struct cmd * +getcmd(const char *name) { const char *p, *q; - struct cmd *c, *found; - int nmatches, longest; + const struct cmd *c, *found; + ptrdiff_t longest; + int nmatches; longest = 0; nmatches = 0; found = 0; for (c = cmdtab; (p = c->name) != NULL; c++) { for (q = name; *q == *p++; q++) - if (*q == 0) /* exact match? */ + if (*q == '\0') /* exact match? */ return (c); - if (!*q) { /* the name was a prefix */ + if (*q == '\0') { /* the name was a prefix */ if (q - name > longest) { longest = q - name; nmatches = 1; @@ -856,7 +857,7 @@ quit(int argc __unused, char *argv[] __unused) static void help(int argc, char *argv[]) { - struct cmd *c; + const struct cmd *c; if (argc == 1) { printf("Commands may be abbreviated. Commands are:\n\n");