d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use MAX and MIN macros from sys/param.h

Browse Source
This commit is contained in:
Baptiste Daroussin 2017-03-22 21:35:01 +00:00
parent 67d01c2bab
commit 42c88c4100
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=315743
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
usr.bin/diff/diffreg.c
View File

@ -100,9 +100,6 @@ __FBSDID("$FreeBSD$");
# define TIMESPEC_NS(timespec) 0
#endif
#define MINIMUM(a, b) (((a) < (b)) ? (a) : (b))
#define MAXIMUM(a, b) (((a) > (b)) ? (a) : (b))
/*
* diff - compare two files.
*/
@ -709,7 +706,7 @@ stone(int *a, int n, int *b, int *c, int flags)
bound = UINT_MAX;
else {
sq = isqrt(n);
bound = MAXIMUM(256, sq);
bound = MAX(256, sq);
}
k = 0;
@ -1446,10 +1443,10 @@ dump_context_vec(FILE *f1, FILE *f2, int flags)
return;
b = d = 0; /* gcc */
lowa = MAXIMUM(1, cvp->a - diff_context);
upb = MINIMUM(len[0], context_vec_ptr->b + diff_context);
lowc = MAXIMUM(1, cvp->c - diff_context);
upd = MINIMUM(len[1], context_vec_ptr->d + diff_context);
lowa = MAX(1, cvp->a - diff_context);
upb = MIN(len[0], context_vec_ptr->b + diff_context);
lowc = MAX(1, cvp->c - diff_context);
upd = MIN(len[1], context_vec_ptr->d + diff_context);
diff_output("***************");
if ((flags & D_PROTOTYPE)) {
@ -1549,10 +1546,10 @@ dump_unified_vec(FILE *f1, FILE *f2, int flags)
return;
b = d = 0; /* gcc */
lowa = MAXIMUM(1, cvp->a - diff_context);
upb = MINIMUM(len[0], context_vec_ptr->b + diff_context);
lowc = MAXIMUM(1, cvp->c - diff_context);
upd = MINIMUM(len[1], context_vec_ptr->d + diff_context);
lowa = MAX(1, cvp->a - diff_context);
upb = MIN(len[0], context_vec_ptr->b + diff_context);
lowc = MAX(1, cvp->c - diff_context);
upd = MIN(len[1], context_vec_ptr->d + diff_context);
diff_output("@@ -");
uni_range(lowa, upb);