COPYING duplicates information from README. Remove. Move GPL from

[empserver] / src / lib / commands / repo.c

diff --git a/src/lib/commands/repo.c b/src/lib/commands/repo.c
index b55a58ef725ed6d0e052a8f104775d7327345db5..13864f74bac38ebf30e051ab02db742be1bb8a53 100644 (file)
--- a/src/lib/commands/repo.c
+++ b/src/lib/commands/repo.c
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
@@ -45,8 +45,7 @@
 static void repo_header(void);
 static void repo_list(struct natstr *, struct natstr *);
 static void printdiff(struct natstr *, struct natstr *, int what);
-static int check(char *buf, double theirs, double min, double max,
-                int shift, int tolerance);
+static int tryprdiff(double, double, double, int, int);
 
 int
 repo(void)
@@ -116,12 +115,11 @@ printdiff(struct natstr *plnatp, struct natstr *natp, int what)
     double theirs;
     int shift;
     int tolerance;
-    char buf[128];
 
     if (ours
        && plnatp->nat_stat >= STAT_ACTIVE && natp->nat_stat >= STAT_ACTIVE) {
        theirs = natp->nat_level[what];
-       if ((shift = min((int)theirs, (int)ours) - 100) > 0) {
+       if ((shift = MIN((int)theirs, (int)ours) - 100) > 0) {
            ours -= shift;
            theirs -= shift;
        } else
@@ -138,34 +136,31 @@ printdiff(struct natstr *plnatp, struct natstr *natp, int what)
        }
        if (tolerance > 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
-           sprintf(buf, "    n/a");
+           pr("    n/a     ");
     } else
-       sprintf(buf, "    n/a");
-
-    pr("%-11s ", buf);
+       pr("    n/a     ");
 }
 
 static int
-check(char *buf, double theirs, double min, double max, int shift,
-      int tolerance)
+tryprdiff(double theirs, double min, double max, int shift, int tolerance)
 {
     double shove;
 
@@ -173,12 +168,12 @@ check(char *buf, double theirs, double min, double max, int shift,
        if (theirs <= max) {
            if (max < tolerance)
                max = tolerance;
-           sprintf(buf, "   0 - %d", (int)max + shift);
+           pr("   0 - %-4d ", (int)max + shift);
            return 1;
        }
     } else if (max < 0) {
        if (theirs >= min) {
-           sprintf(buf, "    >= %d", (int)min + shift);
+           pr("    >= %-4d ", (int)min + shift);
            return 1;
        }
     } else if (theirs >= min && theirs <= max) {
@@ -192,7 +187,7 @@ check(char *buf, double theirs, double min, double max, int shift,
                max = tolerance;
            }
        }
-       sprintf(buf, "%4d - %d", (int)min + shift, (int)max + shift);
+       pr("%4d - %-4d ", (int)min + shift, (int)max + shift);
        return 1;
     }