fix page accounting computation.

SCCS-vsn: old/vfilters/rvcat/rvcat.c 4.7
SCCS-vsn: old/vfilters/vcat/vcat.c 4.7
SCCS-vsn: old/vfilters/vplotf/vplotf.c 4.4
SCCS-vsn: old/vfilters/vpltdmp/vpltdmp.c 4.6

diff --git a/usr/src/old/vfilters/rvcat/rvcat.c b/usr/src/old/vfilters/rvcat/rvcat.c
index 486ee55..9f310d7 100644 (file)
--- a/usr/src/old/vfilters/rvcat/rvcat.c
+++ b/usr/src/old/vfilters/rvcat/rvcat.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)rvcat.c    4.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)rvcat.c    4.7 (Berkeley) %G%";

 #endif
 
 /*
 #endif
 
 /*


@@ -595,7 +595,7 @@ account(who, from, acctfile)
         * Varian accounting is done by 8.5 inch pages;
         * Versatec accounting is by the (12 inch) foot.
         */
         * Varian accounting is done by 8.5 inch pages;
         * Versatec accounting is by the (12 inch) foot.
         */

-       fprintf(a, "t%6.2f\t", (lines / 200.0) / PAGE_LINES);
+       fprintf(a, "t%6.2f\t", (double)lines / (double)PAGE_LINES);

        if (from != NULL)
                fprintf(a, "%s:", from);
        fprintf(a, "%s\n", who);
        if (from != NULL)
                fprintf(a, "%s:", from);
        fprintf(a, "%s\n", who);

diff --git a/usr/src/old/vfilters/vcat/vcat.c b/usr/src/old/vfilters/vcat/vcat.c
index 52325e8..40d8919 100644 (file)
--- a/usr/src/old/vfilters/vcat/vcat.c
+++ b/usr/src/old/vfilters/vcat/vcat.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)vcat.c     4.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)vcat.c     4.7 (Berkeley) %G%";

 #endif
 
 /*
 #endif
 
 /*


@@ -566,7 +566,7 @@ account(who, from, acctfile)
         * Varian accounting is done by 8.5 inch pages;
         * Versatec accounting is by the (12 inch) foot.
         */
         * Varian accounting is done by 8.5 inch pages;
         * Versatec accounting is by the (12 inch) foot.
         */

-       fprintf(a, "t%6.2f\t", (lines / 200.0) / PAGE_LINES);
+       fprintf(a, "t%6.2f\t", (double)lines / (double)PAGE_LINES);

        if (from != NULL)
                fprintf(a, "%s:", from);
        fprintf(a, "%s\n", who);
        if (from != NULL)
                fprintf(a, "%s:", from);
        fprintf(a, "%s\n", who);

diff --git a/usr/src/old/vfilters/vplotf/vplotf.c b/usr/src/old/vfilters/vplotf/vplotf.c
index 08bc1bc..40adec2 100644 (file)
--- a/usr/src/old/vfilters/vplotf/vplotf.c
+++ b/usr/src/old/vfilters/vplotf/vplotf.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)vplotf.c   4.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)vplotf.c   4.4 (Berkeley) %G%";

 #endif
 
 /*
 #endif
 
 /*


@@ -151,7 +151,7 @@ account(who, from, acctfile)
         * Varian accounting is done by 8.5 inch pages;
         * Versatec accounting is by the (12 inch) foot.
         */
         * Varian accounting is done by 8.5 inch pages;
         * Versatec accounting is by the (12 inch) foot.
         */

-       fprintf(a, "t%6.2f\t", (lines / 200.0) / PAGE_LINES);
+       fprintf(a, "t%6.2f\t", (double)lines / (double)PAGE_LINES);

        if (from != NULL)
                fprintf(a, "%s:", from);
        fprintf(a, "%s\n", who);
        if (from != NULL)
                fprintf(a, "%s:", from);
        fprintf(a, "%s\n", who);

diff --git a/usr/src/old/vfilters/vpltdmp/vpltdmp.c b/usr/src/old/vfilters/vpltdmp/vpltdmp.c
index 762c9ec..92fbf47 100644 (file)
--- a/usr/src/old/vfilters/vpltdmp/vpltdmp.c
+++ b/usr/src/old/vfilters/vpltdmp/vpltdmp.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)vpltdmp.c  4.5 (Berkeley) %G%";
+static char sccsid[] = "@(#)vpltdmp.c  4.6 (Berkeley) %G%";

 #endif
 
 /*
 #endif
 
 /*


@@ -16,7 +16,7 @@ static char sccsid[] = "@(#)vpltdmp.c 4.5 (Berkeley) %G%";
 #define IN     0
 #define OUT    1
 
 #define IN     0
 #define OUT    1
 

-static char *Sid = "@(#)vpltdmp.c      4.5\t%G%";
+static char *Sid = "@(#)vpltdmp.c      4.6\t%G%";

 
 int    plotmd[] = { VPLOT };
 int    prtmd[]  = { VPRINT };
 
 int    plotmd[] = { VPLOT };
 int    prtmd[]  = { VPRINT };


@@ -113,7 +113,7 @@ account(who, from, acctfile)
         * Varian accounting is done by 8.5 inch pages;
         * Versatec accounting is by the (12 inch) foot.
         */
         * Varian accounting is done by 8.5 inch pages;
         * Versatec accounting is by the (12 inch) foot.
         */

-       fprintf(a, "t%6.2f\t", (lines / 200.0) / PAGE_LINES);
+       fprintf(a, "t%6.2f\t", (double)lines / (double)PAGE_LINES);

        if (from != NULL)
                fprintf(a, "%s:", from);
        fprintf(a, "%s\n", who);
        if (from != NULL)
                fprintf(a, "%s:", from);
        fprintf(a, "%s\n", who);