Date: Wed, 15 Sep 2021 23:59:49 GMT From: Piotr Pawel Stefaniak <pstef@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: b5541f456d64 - main - diff: convert boolean flag variables to bool Message-ID: <202109152359.18FNxnij011093@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=b5541f456d641d23e0c46874daff0b62552bf3cb commit b5541f456d641d23e0c46874daff0b62552bf3cb Author: Piotr Pawel Stefaniak <pstef@FreeBSD.org> AuthorDate: 2021-09-04 23:44:26 +0000 Commit: Piotr Pawel Stefaniak <pstef@FreeBSD.org> CommitDate: 2021-09-15 23:36:41 +0000 diff: convert boolean flag variables to bool There will be more boolean flags added in upcoming commits and they would have to be stored in ints in order to be consistent with existing code. Change the existing code to use the bool type. --- usr.bin/diff/diff.c | 23 +++++++++++------------ usr.bin/diff/diff.h | 8 +++++--- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index bfd391a4e3dd..03eb16211e86 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -38,8 +38,9 @@ __FBSDID("$FreeBSD$"); #include "diff.h" #include "xmalloc.h" -int lflag, Nflag, Pflag, rflag, sflag, Tflag, cflag, Wflag; -int diff_format, diff_context, status, ignore_file_case, suppress_common; +bool lflag, Nflag, Pflag, rflag, sflag, Tflag, cflag; +bool ignore_file_case, suppress_common; +int diff_format, diff_context, status; int tabsize = 8, width = 130; char *start, *ifdefname, *diffargs, *label[2], *ignore_pats; char *group_format = NULL; @@ -147,7 +148,6 @@ main(int argc, char **argv) case 'c': if (FORMAT_MISMATCHED(D_CONTEXT)) conflicting_format(); - cflag = 1; diff_format = D_CONTEXT; if (optarg != NULL) { l = strtol(optarg, &ep, 10); @@ -199,10 +199,10 @@ main(int argc, char **argv) usage(); break; case 'l': - lflag = 1; + lflag = true; break; case 'N': - Nflag = 1; + Nflag = true; break; case 'n': if (FORMAT_MISMATCHED(D_NREVERSE)) @@ -213,10 +213,10 @@ main(int argc, char **argv) dflags |= D_PROTOTYPE; break; case 'P': - Pflag = 1; + Pflag = true; break; case 'r': - rflag = 1; + rflag = true; break; case 'q': if (FORMAT_MISMATCHED(D_BRIEF)) @@ -227,10 +227,10 @@ main(int argc, char **argv) start = optarg; break; case 's': - sflag = 1; + sflag = true; break; case 'T': - Tflag = 1; + Tflag = true; break; case 't': dflags |= D_EXPANDTABS; @@ -251,7 +251,6 @@ main(int argc, char **argv) dflags |= D_IGNOREBLANKS; break; case 'W': - Wflag = 1; width = (int) strtonum(optarg, 1, INT_MAX, &errstr); if (errstr) { warnx("Invalid argument for width"); @@ -278,10 +277,10 @@ main(int argc, char **argv) case OPT_HORIZON_LINES: break; /* XXX TODO for compatibility with GNU diff3 */ case OPT_IGN_FN_CASE: - ignore_file_case = 1; + ignore_file_case = true; break; case OPT_NO_IGN_FN_CASE: - ignore_file_case = 0; + ignore_file_case = false; break; case OPT_NORMAL: if (FORMAT_MISMATCHED(D_NORMAL)) diff --git a/usr.bin/diff/diff.h b/usr.bin/diff/diff.h index 28d08288e1e9..04e75e631954 100644 --- a/usr.bin/diff/diff.h +++ b/usr.bin/diff/diff.h @@ -33,6 +33,8 @@ */ #include <sys/types.h> + +#include <stdbool.h> #include <regex.h> /* @@ -90,9 +92,9 @@ struct excludes { struct excludes *next; }; -extern int lflag, Nflag, Pflag, rflag, sflag, Tflag, cflag, Wflag; -extern int diff_format, diff_context, status, ignore_file_case; -extern int suppress_common; +extern bool lflag, Nflag, Pflag, rflag, sflag, Tflag, cflag; +extern bool ignore_file_case, suppress_common; +extern int diff_format, diff_context, status; extern int tabsize, width; extern char *start, *ifdefname, *diffargs, *label[2], *ignore_pats; extern char *group_format;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109152359.18FNxnij011093>