From owner-svn-src-head@freebsd.org Thu Oct 29 23:15:11 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B6DBC44086D; Thu, 29 Oct 2020 23:15:11 +0000 (UTC) (envelope-from glebius@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CMh9q4T1gz4SrY; Thu, 29 Oct 2020 23:15:11 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 784DED713; Thu, 29 Oct 2020 23:15:11 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09TNFBVx014139; Thu, 29 Oct 2020 23:15:11 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09TNFBa9014138; Thu, 29 Oct 2020 23:15:11 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <202010292315.09TNFBa9014138@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Thu, 29 Oct 2020 23:15:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r367150 - head/sbin/savecore X-SVN-Group: head X-SVN-Commit-Author: glebius X-SVN-Commit-Paths: head/sbin/savecore X-SVN-Commit-Revision: 367150 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Oct 2020 23:15:11 -0000 Author: glebius Date: Thu Oct 29 23:15:11 2020 New Revision: 367150 URL: https://svnweb.freebsd.org/changeset/base/367150 Log: Convert flags from int to bool. Some (compress) were already used in comparisons with bool values. No functional changes. Modified: head/sbin/savecore/savecore.c Modified: head/sbin/savecore/savecore.c ============================================================================== --- head/sbin/savecore/savecore.c Thu Oct 29 22:22:27 2020 (r367149) +++ head/sbin/savecore/savecore.c Thu Oct 29 23:15:11 2020 (r367150) @@ -102,7 +102,8 @@ __FBSDID("$FreeBSD$"); static cap_channel_t *capsyslog; static fileargs_t *capfa; -static int checkfor, compress, clear, force, keep, verbose; /* flags */ +static bool checkfor, compress, clear, force, keep; /* flags */ +static int verbose; static int nfound, nsaved, nerr; /* statistics */ static int maxdumps; @@ -676,7 +677,7 @@ DoFile(const char *savedir, int savedirfd, const char dtoh32(kdhl.version), device); status = STATUS_BAD; - if (force == 0) + if (force == false) goto closefd; } } else if (compare_magic(&kdhl, KERNELDUMPMAGIC)) { @@ -686,7 +687,7 @@ DoFile(const char *savedir, int savedirfd, const char dtoh32(kdhl.version), device); status = STATUS_BAD; - if (force == 0) + if (force == false) goto closefd; } switch (kdhl.compression) { @@ -710,7 +711,7 @@ DoFile(const char *savedir, int savedirfd, const char device); status = STATUS_BAD; - if (force == 0) + if (force == false) goto closefd; if (compare_magic(&kdhl, KERNELDUMPMAGIC_CLEARED)) { @@ -727,7 +728,7 @@ DoFile(const char *savedir, int savedirfd, const char dtoh32(kdhl.version), device); status = STATUS_BAD; - if (force == 0) + if (force == false) goto closefd; } } @@ -741,7 +742,7 @@ DoFile(const char *savedir, int savedirfd, const char "parity error on last dump header on %s", device); nerr++; status = STATUS_BAD; - if (force == 0) + if (force == false) goto closefd; } dumpextent = dtoh64(kdhl.dumpextent); @@ -772,7 +773,7 @@ DoFile(const char *savedir, int savedirfd, const char "first and last dump headers disagree on %s", device); nerr++; status = STATUS_BAD; - if (force == 0) + if (force == false) goto closefd; } else { status = STATUS_GOOD; @@ -1110,7 +1111,8 @@ main(int argc, char **argv) char **devs; int i, ch, error, savedirfd; - checkfor = compress = clear = force = keep = verbose = 0; + checkfor = compress = clear = force = keep = false; + verbose = 0; nfound = nsaved = nerr = 0; savedir = "."; @@ -1124,16 +1126,16 @@ main(int argc, char **argv) while ((ch = getopt(argc, argv, "Ccfkm:vz")) != -1) switch(ch) { case 'C': - checkfor = 1; + checkfor = true; break; case 'c': - clear = 1; + clear = true; break; case 'f': - force = 1; + force = true; break; case 'k': - keep = 1; + keep = true; break; case 'm': maxdumps = atoi(optarg);