From nobody Tue Jan 4 02:07:40 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 4D6CE191FD56; Tue, 4 Jan 2022 02:07:43 +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 4JSbbx3Gz5z3D5Y; Tue, 4 Jan 2022 02:07:41 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 EA1697E73; Tue, 4 Jan 2022 02:07:40 +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 20427elS042709; Tue, 4 Jan 2022 02:07:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20427e3j042708; Tue, 4 Jan 2022 02:07:40 GMT (envelope-from git) Date: Tue, 4 Jan 2022 02:07:40 GMT Message-Id: <202201040207.20427e3j042708@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 64e8b27096fe - main - ipfilter: Adjust example returns to conform to style(9) 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64e8b27096fecf94d7f9255eae097e44abf4f8ce Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641262061; 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=fC/USxvTNFUaKRkniwm01tpmTOBrogVrJ4bzf4kRJQg=; b=sP6IU6pDAAI9GS7//vBB0OMY/A0oQ2oEQSCazq0PREQ9Q8yLeKMcThGQEjWdrDuYEMVgXO k9sNgnXih2V6vXDuWKBOChASooet0VBM4+CQmGvBD8SQ+rk4XFKQv5ImpR2yu7NeT2qFu9 kXo495z3d3DQOvphFxQGuZbing2JfTfFQpLJlIEAEgELZi3kvs7/ftyCM2pw+2JyVhIy53 p36j91PrjAnOHZjdqBZ+UwXI4SwgPe1dZeZ8h0G/t/nUWDrMfwAcMyGU+iFVgs2PhHe8nJ Hhk6Kk+EOzY8gzqxvmfZ9w8D179u93JDdIyKqyLw/qx05OdknJ67SCEMnvFE3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641262061; a=rsa-sha256; cv=none; b=Q77pImz6jSa2qZmIUrbFJryHODq9WDgBFuzjcFKWU9ae+KeTP/trz0/kWSe07wsCwswn5H V8QOUrRcR9yIiTggt/GLD/Dr14WdAtPKGweV8qxYf+MZdNx1qPYUXSJKM8dwUx4QyJEFeE 7XnC1ChPL/Pp4drmwp5pwNWzTShWQZCN1g0k3ETMesxEZTLa6EW3QhDwD/0WSxPevQMROJ 7nCcj9mYfJMN9KNHZS+BY9HHC385V0CCfKTuRIszt0HeSvk4AYU4AtKa9ymwye9UaVNLX4 sORKltotVOvn1QM/2K9PnC97jDhdQJVVqAfziYGiMDVv4sG59z5CLKLW/P61fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=64e8b27096fecf94d7f9255eae097e44abf4f8ce commit 64e8b27096fecf94d7f9255eae097e44abf4f8ce Author: Cy Schubert AuthorDate: 2021-12-22 02:38:17 +0000 Commit: Cy Schubert CommitDate: 2022-01-04 02:06:43 +0000 ipfilter: Adjust example returns to conform to style(9) Adjust ipfilter's example return statements to conform to style(9). MFC after: 1 month --- share/examples/ipfilter/l4check/l4check.c | 26 +++++++++++++------------- share/examples/ipfilter/mlfk_rule.c | 2 +- share/examples/ipfilter/samples/relay.c | 14 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/share/examples/ipfilter/l4check/l4check.c b/share/examples/ipfilter/l4check/l4check.c index 961eeab934fd..3fc194ee5a3e 100644 --- a/share/examples/ipfilter/l4check/l4check.c +++ b/share/examples/ipfilter/l4check/l4check.c @@ -92,7 +92,7 @@ copystr(char *dst, char *src) else esc = 1; *t = '\0'; - return dst; + return(dst); } void @@ -372,7 +372,7 @@ runconfig(void) i = select(mfd + 1, &rfd, &wfd, NULL, &tv); if (i == -1) { perror("select"); - return -1; + return(-1); } now1 = time(NULL); @@ -396,7 +396,7 @@ runconfig(void) i--; } } - return 0; + return(0); } @@ -424,7 +424,7 @@ gethostport(char *str, int lnum, u_32_t *ipp, u_short *portp) if (!(hp = gethostbyname(host))) { fprintf(stderr, "%d: can't resolve hostname: %s\n", lnum, host); - return 0; + return(0); } *ipp = *(u_32_t *)hp->h_addr; } @@ -439,12 +439,12 @@ gethostport(char *str, int lnum, u_32_t *ipp, u_short *portp) else { fprintf(stderr, "%d: unknown service %s\n", lnum, port); - return 0; + return(0); } } } else *portp = 0; - return 1; + return(1); } @@ -458,24 +458,24 @@ mapfile(char *file, size_t *sizep) fd = open(file, O_RDONLY); if (fd == -1) { perror("open(mapfile)"); - return NULL; + return(NULL); } if (fstat(fd, &sb) == -1) { perror("fstat(mapfile)"); close(fd); - return NULL; + return(NULL); } addr = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0); if (addr == (caddr_t)-1) { perror("mmap(mapfile)"); close(fd); - return NULL; + return(NULL); } close(fd); *sizep = sb.st_size; - return (char *)addr; + return(char *)addr; } @@ -491,7 +491,7 @@ readconfig(char *filename) fp = fopen(filename, "r"); if (!fp) { perror("open(configfile)"); - return -1; + return(-1); } bzero((char *)&template, sizeof(template)); @@ -507,7 +507,7 @@ readconfig(char *filename) if (!s) { fprintf(stderr, "%d: line too long\n", num); fclose(fp); - return -1; + return(-1); } *s = '\0'; @@ -743,7 +743,7 @@ readconfig(char *filename) if (errtxt) fprintf(stderr, "%d: syntax error at \"%s\"\n", num, errtxt); fclose(fp); - return err; + return(err); } diff --git a/share/examples/ipfilter/mlfk_rule.c b/share/examples/ipfilter/mlfk_rule.c index 9f951cf6c31d..7d10d119595f 100644 --- a/share/examples/ipfilter/mlfk_rule.c +++ b/share/examples/ipfilter/mlfk_rule.c @@ -53,7 +53,7 @@ ipfrule_modevent(module_t mod, int type, void *unused) error = EINVAL; break; } - return error; + return(error); } static moduledata_t ipfrulemod = { diff --git a/share/examples/ipfilter/samples/relay.c b/share/examples/ipfilter/samples/relay.c index 11b76b07c509..67ee13a0e534 100644 --- a/share/examples/ipfilter/samples/relay.c +++ b/share/examples/ipfilter/samples/relay.c @@ -60,37 +60,37 @@ int relay(ifd, ofd, rfd) { case -1 : case 0 : - return -1; + return(-1); default : if (FD_ISSET(ifd, &rfds)) { rw = read(ifd, irh, ibuff + RELAY_BUFSZ - irh); if (rw == -1) - return -1; + return(-1); if (rw == 0) - return 0; + return(0); irh += rw; n--; } if (n && FD_ISSET(ofd, &wfds)) { rw = write(ofd, iwt, iwh - iwt); if (rw == -1) - return -1; + return(-1); iwt += rw; n--; } if (n && FD_ISSET(rfd, &rfds)) { rw = read(rfd, iwh, obuff + RELAY_BUFSZ - iwh); if (rw == -1) - return -1; + return(-1); if (rw == 0) - return 0; + return(0); iwh += rw; n--; } if (n && FD_ISSET(rfd, &wfds)) { rw = write(rfd, irt, irh - irt); if (rw == -1) - return -1; + return(-1); irt += rw; n--; }