[src/trunk]: src/dist/nvi Fix all formats for 64bit builds

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

details:   https://anonhg.NetBSD.org/src/rev/8abce4d59fd8
branches:  trunk
changeset: 749057:8abce4d59fd8
user:      dsl <dsl%NetBSD.org@localhost>
date:      Sun Nov 15 18:43:28 2009 +0000

description:
Fix all formats for 64bit builds

diffstat:

 dist/nvi/cl/cl_funcs.c |  4 ++--
 dist/nvi/ex/ex_shell.c |  6 +++---
 dist/nvi/ex/ex_util.c  |  4 ++--
 dist/nvi/vi/vi.c       |  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diffs (81 lines):

diff -r 45eca8cd7a29 -r 8abce4d59fd8 dist/nvi/cl/cl_funcs.c
--- a/dist/nvi/cl/cl_funcs.c    Sun Nov 15 18:41:31 2009 +0000
+++ b/dist/nvi/cl/cl_funcs.c    Sun Nov 15 18:43:28 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cl_funcs.c,v 1.3 2009/11/15 18:23:08 dsl Exp $ */
+/*     $NetBSD: cl_funcs.c,v 1.4 2009/11/15 18:43:28 dsl Exp $ */
 
 /*-
  * Copyright (c) 1993, 1994
@@ -532,7 +532,7 @@
        win = CLSP(sp) ? CLSP(sp) : stdscr;
        /* See the comment in cl_cursor. */
        if (wmove(win, RLNO(sp, lno), RCNO(sp, cno)) == ERR) {
-               msgq(sp, M_ERR, "Error: move: l(%u + %zu) c(%u + %zu)",
+               msgq(sp, M_ERR, "Error: move: l(%zu + %zu) c(%zu + %zu)",
                    lno, sp->roff, cno, sp->coff);
                return (1);
        }
diff -r 45eca8cd7a29 -r 8abce4d59fd8 dist/nvi/ex/ex_shell.c
--- a/dist/nvi/ex/ex_shell.c    Sun Nov 15 18:41:31 2009 +0000
+++ b/dist/nvi/ex/ex_shell.c    Sun Nov 15 18:43:28 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ex_shell.c,v 1.3 2009/01/18 03:45:50 lukem Exp $ */
+/*     $NetBSD: ex_shell.c,v 1.4 2009/11/15 18:43:28 dsl Exp $ */
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -173,7 +173,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)
@@ -195,7 +195,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);
diff -r 45eca8cd7a29 -r 8abce4d59fd8 dist/nvi/ex/ex_util.c
--- a/dist/nvi/ex/ex_util.c     Sun Nov 15 18:41:31 2009 +0000
+++ b/dist/nvi/ex/ex_util.c     Sun Nov 15 18:43:28 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ex_util.c,v 1.2 2008/12/05 22:51:42 christos Exp $ */
+/*     $NetBSD: ex_util.c,v 1.3 2009/11/15 18:43:28 dsl Exp $ */
 
 /*-
  * Copyright (c) 1993, 1994
@@ -111,7 +111,7 @@
 
                for (ap = sp->cargv + 1; *ap != NULL; ++ap);
                msgq(sp, M_ERR,
-                   "167|%d more files to edit", (ap - sp->cargv) - 1);
+                   "167|%zd more files to edit", (ap - sp->cargv) - 1);
 
                return (1);
        }
diff -r 45eca8cd7a29 -r 8abce4d59fd8 dist/nvi/vi/vi.c
--- a/dist/nvi/vi/vi.c  Sun Nov 15 18:41:31 2009 +0000
+++ b/dist/nvi/vi/vi.c  Sun Nov 15 18:43:28 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vi.c,v 1.2 2008/12/05 22:51:43 christos Exp $ */
+/*     $NetBSD: vi.c,v 1.3 2009/11/15 18:43:28 dsl Exp $ */
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -981,7 +981,7 @@
                if (sp->t_rows > sp->rows - 1) {
                        sp->t_minrows = sp->t_rows = sp->rows - 1;
                        msgq(sp, M_INFO,
-                           "214|Windows option value is too large, max is %u",
+                           "214|Windows option value is too large, max is %zu",
                            sp->t_rows);
                }
                sp->t_maxrows = sp->rows - 1;