[src/netbsd-1-5]: src/usr.bin/vi/ex Pullup 1.9 [releng]:

[tv <tv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e1e13cc1eda6
branches:  netbsd-1-5
changeset: 489856:e1e13cc1eda6
user:      tv <tv%NetBSD.org@localhost>
date:      Wed Oct 18 01:45:25 2000 +0000

description:
Pullup 1.9 [releng]:
Fix %l[du] formats that have int arguments on ILP32; might break LP64.

diffstat:

 usr.bin/vi/ex/ex.c       |  4 ++--
 usr.bin/vi/ex/ex_read.c  |  5 +++--
 usr.bin/vi/ex/ex_shell.c |  6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diffs (64 lines):

diff -r 0aa1b43a563f -r e1e13cc1eda6 usr.bin/vi/ex/ex.c
--- a/usr.bin/vi/ex/ex.c        Wed Oct 18 01:32:40 2000 +0000
+++ b/usr.bin/vi/ex/ex.c        Wed Oct 18 01:45:25 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ex.c,v 1.8 1998/01/09 08:07:36 perry Exp $     */
+/*     $NetBSD: ex.c,v 1.8.10.1 2000/10/18 01:45:25 tv Exp $   */
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -2308,7 +2308,7 @@
                if (lno != 0) {
                        msgq(sp, M_ERR,
                            "102|Illegal address: only %lu lines in the file",
-                           lno);
+                           (u_long) lno);
                        break;
                }
                /* FALLTHROUGH */
diff -r 0aa1b43a563f -r e1e13cc1eda6 usr.bin/vi/ex/ex_read.c
--- a/usr.bin/vi/ex/ex_read.c   Wed Oct 18 01:32:40 2000 +0000
+++ b/usr.bin/vi/ex/ex_read.c   Wed Oct 18 01:45:25 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ex_read.c,v 1.8 2000/05/31 19:49:25 jdc Exp $  */
+/*     $NetBSD: ex_read.c,v 1.8.2.1 2000/10/18 01:45:26 tv Exp $       */
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -336,7 +336,8 @@
        if (!silent) {
                p = msg_print(sp, name, &nf);
                msgq(sp, M_INFO,
-                   "148|%s: %lu lines, %lu characters", p, lcnt, ccnt);
+                   "148|%s: %lu lines, %lu characters", p,
+                   (unsigned long)lcnt, (unsigned long)ccnt);
                if (nf)
                        FREE_SPACE(sp, p, 0);
        }
diff -r 0aa1b43a563f -r e1e13cc1eda6 usr.bin/vi/ex/ex_shell.c
--- a/usr.bin/vi/ex/ex_shell.c  Wed Oct 18 01:32:40 2000 +0000
+++ b/usr.bin/vi/ex/ex_shell.c  Wed Oct 18 01:45:25 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ex_shell.c,v 1.8 2000/05/31 19:49:25 jdc Exp $ */
+/*     $NetBSD: ex_shell.c,v 1.8.2.1 2000/10/18 01:45:26 tv Exp $      */
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -176,7 +176,7 @@
                p = msg_print(sp, cmd, &nf);
                len = strlen(p);
                msgq(sp, M_ERR, "%.*s%s: received signal: %s%s",
-                   MIN(len, 20), p, len > 20 ? " ..." : "",
+                   (int)MIN(len, 20), p, len > 20 ? " ..." : "",
                    sigmsg(WTERMSIG(pstat)),
                    WCOREDUMP(pstat) ? "; core dumped" : "");
                if (nf)
@@ -198,7 +198,7 @@
                        p = msg_print(sp, cmd, &nf);
                        len = strlen(p);
                        msgq(sp, M_ERR, "%.*s%s: exited with status %d",
-                           MIN(len, 20), p, len > 20 ? " ..." : "",
+                           (int)MIN(len, 20), p, len > 20 ? " ..." : "",
                            WEXITSTATUS(pstat));
                        if (nf)
                                FREE_SPACE(sp, p, 0);