From nobody Wed Jan 29 12:36:01 2025 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 4YjhTZ6rLnz5mh6K; Wed, 29 Jan 2025 12:36:02 +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 4YjhTZ0J0Vz4JR0; Wed, 29 Jan 2025 12:36:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738154162; 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=TIf9kUgTfwhLu6GRINRCFuYHYxG1kK+uBdf+Z8vm72Y=; b=JcZFKxsufWr7yXeg/qESGgS62/YefGVnq8AyjBdN+52rLwpoxndaePiMEeOQ0hXrLn9Rji YORpzbV9fBw0zZGdxNJ0wmvJSF/WFav5ZTs8NPXJFhky7G9dNoIVHniYheywjnd4hoxvbs pplM6XRPkE1jc7FHDgQe8pVY7KK5Px+VNrT2fzyraEg34sJThteDbyppxjwSSD2p6yqGh/ dgr5U+bd+jMmz0QdSr+EAYjMDUGc7nQqkFK/590PXuLKhoeFykQgONWrfSuAf85944574p Ih5K5fRemmf9jFQD76409t+aN5szszqDkp0qH9kEZ7ZRdI5suLFKdeJB978noA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738154162; 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=TIf9kUgTfwhLu6GRINRCFuYHYxG1kK+uBdf+Z8vm72Y=; b=ySycFz3h3VDd7FGZierxOY+GEEWeaPE/3iNCyzDyW2To8hZ0cllExbqNkAySsmpdu1gE2A a6k/vr0RoXqxgKUBDNzY5wCI0vNzesfFsRhdSrIEagDiBFGioqungoP41XHwl1aN6bZ+b3 ufTHjKnQi0+XW3K8rdjIcKFwSNIF05+U1stUFXp8kkyxZLTM5QMItP+B7qUlM3iYLNfVpE AGNG7R4I1wxR3AdCyzAIkCsM97qIaeQubkaaWGSz5froHS1VckISs202Gewg3ata7vtsPh nYkwIpT7fMUFCg+4dGDIIRXnW3+VEODhDvtuy6GQ3SxQz0MLtBVVKqNEjd6V/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738154162; a=rsa-sha256; cv=none; b=T9Tlvml5U+CYH2YHH8+a2bznqw/Cun3WgzsB+sgrJ8nTiNVGc7Qi5a2YyfgVH9H731OMoZ SM6MXQjxlVYhBwXInp3Wd/7WXno0ELuaCSjqnJoAhgadSp9O538VREpZATiTwPUSinqXDN HPA1k1P2TC8ZCzkkmZFUUfCVANcQ8R7+iIGabrbhdH7UJFcfBZEvvMrbG5rNCTHl4QTYpQ QlO2vgf9aqyTOYQdw2f2SAHlDBnsGIRvM7oBGZEJ1FFbbqT86qpnx5JBRMeAx5Sf/cS2JS x7M7wcz4qSvySry0CTiaORy9SOqpdDq2SqyQL46R45c5ZvtUwzPMoSyKUqXl4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YjhTY6zGvz120r; Wed, 29 Jan 2025 12:36:01 +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 50TCa1ff051479; Wed, 29 Jan 2025 12:36:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50TCa1b3051475; Wed, 29 Jan 2025 12:36:01 GMT (envelope-from git) Date: Wed, 29 Jan 2025 12:36:01 GMT Message-Id: <202501291236.50TCa1b3051475@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mariusz Zaborski Subject: git: 6f34788b4e24 - stable/14 - colrm(1): Replace magic exit codes with standard macros 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6f34788b4e24ecbd6026e2dd9fa213290f31f8d5 Auto-Submitted: auto-generated The branch stable/14 has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=6f34788b4e24ecbd6026e2dd9fa213290f31f8d5 commit 6f34788b4e24ecbd6026e2dd9fa213290f31f8d5 Author: Faraz Vahedi AuthorDate: 2024-10-27 08:59:39 +0000 Commit: Mariusz Zaborski CommitDate: 2025-01-29 09:51:34 +0000 colrm(1): Replace magic exit codes with standard macros Signed-off-by: Faraz Vahedi Reviewed by: markj, oshogbo MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1496 (cherry picked from commit fc26f24b3ef276b2a9f73c9778aecff7377b1aeb) --- usr.bin/colrm/colrm.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c index 6886a6644bf5..b199e052a3a5 100644 --- a/usr.bin/colrm/colrm.c +++ b/usr.bin/colrm/colrm.c @@ -87,12 +87,12 @@ main(int argc, char *argv[]) case 2: stop = strtol(argv[1], &p, 10); if (stop <= 0 || *p) - errx(1, "illegal column -- %s", argv[1]); + errx(EXIT_FAILURE, "illegal column -- %s", argv[1]); /* FALLTHROUGH */ case 1: start = strtol(argv[0], &p, 10); if (start <= 0 || *p) - errx(1, "illegal column -- %s", argv[0]); + errx(EXIT_FAILURE, "illegal column -- %s", argv[0]); break; case 0: break; @@ -101,7 +101,7 @@ main(int argc, char *argv[]) } if (stop && start > stop) - errx(1, "illegal start and stop columns"); + errx(EXIT_FAILURE, "illegal start and stop columns"); for (column = 0;;) { switch (ch = getwchar()) { @@ -134,15 +134,14 @@ void check(FILE *stream) { if (feof(stream)) - exit(0); + exit(EXIT_SUCCESS); if (ferror(stream)) - err(1, "%s", stream == stdin ? "stdin" : "stdout"); + err(EXIT_FAILURE, "%s", stream == stdin ? "stdin" : "stdout"); } void usage(void) { (void)fprintf(stderr, "usage: colrm [start [stop]]\n"); - exit(1); + exit(EXIT_FAILURE); } -