empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(check, tryprdiff): Rename. Remove parameter buf, just print.

Browse source 
Callers changed.
This commit is contained in:
Markus Armbruster 2006-01-06 15:48:26 +00:00
parent 53c3101e77
commit 7b7608d5ca
1 changed files with 16 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/lib/commands/repo.c
View file

@ -45,8 +45,7 @@
static void repo_header(void); static void repo_header(void);
static void repo_list(struct natstr *, struct natstr *); static void repo_list(struct natstr *, struct natstr *);
static void printdiff(struct natstr *, struct natstr *, int what); static void printdiff(struct natstr *, struct natstr *, int what);
static int check(char *buf, double theirs, double min, double max, static int tryprdiff(double, double, double, int, int);
int shift, int tolerance);
int int
repo(void) repo(void)
@ -116,7 +115,6 @@ printdiff(struct natstr *plnatp, struct natstr *natp, int what)
double theirs; double theirs;
int shift; int shift;
int tolerance; int tolerance;
char buf[128];
if (ours if (ours
&& plnatp->nat_stat >= STAT_ACTIVE && natp->nat_stat >= STAT_ACTIVE) { && plnatp->nat_stat >= STAT_ACTIVE && natp->nat_stat >= STAT_ACTIVE) {
@ -138,34 +136,31 @@ printdiff(struct natstr *plnatp, struct natstr *natp, int what)
} }
if (tolerance > 2 * ours) if (tolerance > 2 * ours)
tolerance = (int)(2 * ours); tolerance = (int)(2 * ours);
if (check(buf, theirs, 2 * ours, -1.0, shift, tolerance)) if (tryprdiff(theirs, 2 * ours, -1.0, shift, tolerance))
; ;
else if (check(buf, theirs, 1.5 * ours, 2.0 * ours, shift, tolerance)) else if (tryprdiff(theirs, 1.5 * ours, 2.0 * ours, shift, tolerance))
; ;
else if (check(buf, theirs, 1.2 * ours, 1.5 * ours, shift, tolerance)) else if (tryprdiff(theirs, 1.2 * ours, 1.5 * ours, shift, tolerance))
; ;
else if (check(buf, theirs, 1.1 * ours, 1.2 * ours, shift, tolerance)) else if (tryprdiff(theirs, 1.1 * ours, 1.2 * ours, shift, tolerance))
; ;
else if (check(buf, theirs, ours / 1.1, 1.1 * ours, shift, tolerance)) else if (tryprdiff(theirs, ours / 1.1, 1.1 * ours, shift, tolerance))
; ;
else if (check(buf, theirs, ours / 1.2, ours / 1.1, shift, tolerance)) else if (tryprdiff(theirs, ours / 1.2, ours / 1.1, shift, tolerance))
; ;
else if (check(buf, theirs, ours / 1.5, ours / 1.2, shift, tolerance)) else if (tryprdiff(theirs, ours / 1.5, ours / 1.2, shift, tolerance))
; ;
else if (check(buf, theirs, ours / 2.0, ours / 1.5, shift, tolerance)) else if (tryprdiff(theirs, ours / 2.0, ours / 1.5, shift, tolerance))
; ;
else if (check(buf, theirs, -1.0, ours / 2.0, shift, tolerance)) ; else if (tryprdiff(theirs, -1.0, ours / 2.0, shift, tolerance)) ;
else else
sprintf(buf, " n/a"); pr(" n/a ");
} else } else
sprintf(buf, " n/a"); pr(" n/a ");
pr("%-11s ", buf);
} }
static int static int
check(char *buf, double theirs, double min, double max, int shift, tryprdiff(double theirs, double min, double max, int shift, int tolerance)
int tolerance)
{ {
double shove; double shove;
@ -173,12 +168,12 @@ check(char *buf, double theirs, double min, double max, int shift,
if (theirs <= max) { if (theirs <= max) {
if (max < tolerance) if (max < tolerance)
max = tolerance; max = tolerance;
sprintf(buf, " 0 - %d", (int)max + shift); pr(" 0 - %-4d ", (int)max + shift);
return 1; return 1;
} }
} else if (max < 0) { } else if (max < 0) {
if (theirs >= min) { if (theirs >= min) {
sprintf(buf, " >= %d", (int)min + shift); pr(" >= %-4d ", (int)min + shift);
return 1; return 1;
} }
} else if (theirs >= min && theirs <= max) { } else if (theirs >= min && theirs <= max) {
@ -192,7 +187,7 @@ check(char *buf, double theirs, double min, double max, int shift,
max = tolerance; max = tolerance;
} }
} }
sprintf(buf, "%4d - %d", (int)min + shift, (int)max + shift); pr("%4d - %-4d ", (int)min + shift, (int)max + shift);
return 1; return 1;
} }