From nobody Mon Feb 14 19:32:09 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 5FFEC19C88E3; Mon, 14 Feb 2022 19:32:09 +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 4JyDr92HTxz4Y9d; Mon, 14 Feb 2022 19:32:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644867129; 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=HwU3psqsRWHOqsCNCOJZBHjykwbcQdZhU7FRzOs0SI4=; b=OzoMlhUtYUehI2373SbobCX7GemWO/UVrWX0M1306Wtg7DdTcNPBVLj7iey7uJFnL/pY3u JtdbUXOLEoO2hxHxH9bpwZfOvKIllRWbE44q2DV7ERDvoeyyO1+vujlXpJZu5YZ8jSWhpG ukE3OBOkdaHsmWxEQ0GlYJL7FqI0s8VT3EblC2PP3KwjFYh9+tiTbCXtfOqnhvqawk42C+ xBHk8aXl8diyg76yEiqFH+XRSHGfK1aFgNLE4DYKlJ9tZ6TGmDhJ0gq0D4vONp7ftybd0/ LUZDjbtwbNQ/F+JuEg/sVkz8a0eTaWIjf2SQD2UDZICRdjJluonCc+E4xwcnlg== 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 2EBE9149B8; Mon, 14 Feb 2022 19:32:09 +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 21EJW912019438; Mon, 14 Feb 2022 19:32:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21EJW9bX019437; Mon, 14 Feb 2022 19:32:09 GMT (envelope-from git) Date: Mon, 14 Feb 2022 19:32:09 GMT Message-Id: <202202141932.21EJW9bX019437@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wolfram Schneider Subject: git: 047eec4966e3 - main - improve c style 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: wosch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 047eec4966e36dc2175d82e18683a928faafeb26 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644867129; 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=HwU3psqsRWHOqsCNCOJZBHjykwbcQdZhU7FRzOs0SI4=; b=vFqLxzhZrMx/Yg6ApsBSWs1kyAkAnvLRENyQsJPe7w/syt6TEzVEgZXp01HV9tz6TVj5+r qX3kMMZHfofNMJl+z6sLMES+JWrbqFRybx2SttQHOTsF1RjvERcrSsD8R+fgXmHBXmB2wz 9bpZ88Qc5mUqHGgq6mLjtmm8ok558GGk1lTE0qIyAnCd5XufqUg+ruUQHFMxGtPPX40dHn 5zAF7hsXHhuUTeboAYnQ6q9vnzf7rhDN9QHE0f8b07u1N3VJDYw2PKPxh/FLn4iUjntwnP oH0yTrF4N1FxS0hHzeo80/d+3PazH97XmlWZlyQ6Mfdafae4yQa8yr5Ea2RZXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644867129; a=rsa-sha256; cv=none; b=k+5NXWvRTF1E2haDtVFQJGmRcfwJJ37FX+fg/pFZrs4sslLFI/e//sh5XzKOxOaIlPrZJf biKmjFwSf54KGDG8djJeccf9iFxhq3tjnWWtxITzzJiV2ok+vEaYMoY9ROB/QnRvJgCzlQ 2IEPLITS9R4eTsP99f5Uf5O1LcEfvDhQ26Cv8caBppEosS6p8jzDWEeiyhEaJb8vj69j3l HsL1WFL2voNO3ohiZyDEIomr2AidUuvol7BiCWaw3QL5WUXo0tjQgXl8xfJf7L0uu5zVH5 M2gFxBIlXj6HtYKbYEMzejSZ0hY2YXikuTV4IpnKMgoUQofAUcChQjceir26tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=047eec4966e36dc2175d82e18683a928faafeb26 commit 047eec4966e36dc2175d82e18683a928faafeb26 Author: Wolfram Schneider AuthorDate: 2022-02-14 19:30:09 +0000 Commit: Wolfram Schneider CommitDate: 2022-02-14 19:30:09 +0000 improve c style - BSD KNF: return is a native statement and we use a space before the parenthesis - remove superfluous empty lines Reported by: jrtc27 --- usr.bin/locate/locate/locate.c | 1 - usr.bin/locate/locate/util.c | 24 +++++++++++------------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c index 014fa7bcc301..31c74d721c74 100644 --- a/usr.bin/locate/locate/locate.c +++ b/usr.bin/locate/locate/locate.c @@ -270,7 +270,6 @@ search_fopen(char *db, char **s) } #ifdef MMAP - /* * Arguments: * db database diff --git a/usr.bin/locate/locate/util.c b/usr.bin/locate/locate/util.c index 953f51a74d13..13f733314a78 100644 --- a/usr.bin/locate/locate/util.c +++ b/usr.bin/locate/locate/util.c @@ -64,7 +64,7 @@ check_bigram_char(ch) /* legal bigram: 0, ASCII_MIN ... ASCII_MAX */ if (ch == 0 || (ch >= ASCII_MIN && ch <= ASCII_MAX)) - return(ch); + return (ch); errx(1, "locate database header corrupt, bigram char outside 0, %d-%d: %d", @@ -96,7 +96,7 @@ colon(char **dbv, char *path, char *dot) /* empty string */ if (*path == '\0') { warnx("empty database name, ignored"); - return(dbv); + return (dbv); } /* length of string vector */ @@ -187,7 +187,7 @@ patprep(name) *subp++ = *p++; } *subp = '\0'; - return(--subp); + return (--subp); } /* tolower word */ @@ -200,7 +200,7 @@ tolower_word(word) for(p = word; *p != '\0'; p++) *p = TOLOWER(*p); - return(word); + return (word); } @@ -238,9 +238,9 @@ getwm(p) if (hi >= i_max || hi <= i_min) errx(1, "integer out of range: %d < %d < %d", i_min, abs(i) < abs(hi) ? i : hi, i_max); - return(hi); + return (hi); } - return(i); + return (i); } /* @@ -266,12 +266,11 @@ getwf(fp) if (hword >= i_max || hword <= i_min) errx(1, "integer out of range: %d < %d < %d", i_min, abs(word) < abs(hword) ? word : hword, i_max); - return(hword); + return (hword); } - return(word); + return (word); } - void rebuild_message(char *db) { @@ -291,16 +290,15 @@ check_size(char *db) if (stat(db, &sb) == -1) { warnx("the locate database '%s' does not exist.", db); rebuild_message(db); - return(0); + return (0); } len = sb.st_size; if (len < (2 * NBG)) { warnx("the locate database '%s' is smaller than %d bytes large.", db, (2 * NBG)); rebuild_message(db); - return(0); + return (0); } - return(1); + return (1); } -