[src/trunk]: src/usr.bin/less fix build errors

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

details:   https://anonhg.NetBSD.org/src/rev/67210f9d9cef
branches:  trunk
changeset: 545663:67210f9d9cef
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Apr 14 03:02:28 2003 +0000

description:
fix build errors

diffstat:

 usr.bin/less/less/linenum.c    |  4 ++--
 usr.bin/less/less/opttbl.c     |  3 +--
 usr.bin/less/less/search.c     |  6 +++---
 usr.bin/less/lesskey/lesskey.c |  4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diffs (73 lines):

diff -r 7c853a6ffd8f -r 67210f9d9cef usr.bin/less/less/linenum.c
--- a/usr.bin/less/less/linenum.c       Mon Apr 14 02:56:45 2003 +0000
+++ b/usr.bin/less/less/linenum.c       Mon Apr 14 03:02:28 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linenum.c,v 1.6 2003/04/14 02:56:47 mrg Exp $  */
+/*     $NetBSD: linenum.c,v 1.7 2003/04/14 03:02:28 mrg Exp $  */
 
 /*
  * Copyright (C) 1984-2002  Mark Nudelman
@@ -73,7 +73,7 @@
 extern int sigs;
 extern int sc_height;
 
-static void calcgap __P((struct linenum *));
+static void calcgap __P((struct linenum_info *));
 static void longloopmessage __P((void));
 static void longish __P((void));
 
diff -r 7c853a6ffd8f -r 67210f9d9cef usr.bin/less/less/opttbl.c
--- a/usr.bin/less/less/opttbl.c        Mon Apr 14 02:56:45 2003 +0000
+++ b/usr.bin/less/less/opttbl.c        Mon Apr 14 03:02:28 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: opttbl.c,v 1.9 2003/04/14 02:56:47 mrg Exp $   */
+/*     $NetBSD: opttbl.c,v 1.10 2003/04/14 03:02:29 mrg Exp $  */
 
 /*
  * Copyright (C) 1984-2002  Mark Nudelman
@@ -509,7 +509,6 @@
        int maxlen = 0;
        int ambig = 0;
        int exact = 0;
-       char *eq;
 
        /*
         * Check all options.
diff -r 7c853a6ffd8f -r 67210f9d9cef usr.bin/less/less/search.c
--- a/usr.bin/less/less/search.c        Mon Apr 14 02:56:45 2003 +0000
+++ b/usr.bin/less/less/search.c        Mon Apr 14 03:02:28 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: search.c,v 1.7 2003/04/14 02:56:48 mrg Exp $   */
+/*     $NetBSD: search.c,v 1.8 2003/04/14 03:02:29 mrg Exp $   */
 
 /*
  * Copyright (C) 1984-2002  Mark Nudelman
@@ -54,8 +54,8 @@
 static int match_pattern __P((char *, char **, char **, int));
 struct hilite;
 static void add_hilite __P((struct hilite *, struct hilite *));
-static void adj_hilite __P((struct hilite *, POSITION));
-static void hilite_line __P((POSITION, char *, char *, char *));
+static void adj_hilite __P((struct hilite *, POSITION, int));
+static void hilite_line __P((POSITION, char *, char *, char *, int));
 static void hilite_screen __P((void));
 static POSITION search_pos __P((int));
 static int search_range __P((POSITION, POSITION, int, int, int, POSITION *, POSITION *));
diff -r 7c853a6ffd8f -r 67210f9d9cef usr.bin/less/lesskey/lesskey.c
--- a/usr.bin/less/lesskey/lesskey.c    Mon Apr 14 02:56:45 2003 +0000
+++ b/usr.bin/less/lesskey/lesskey.c    Mon Apr 14 03:02:28 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lesskey.c,v 1.7 2003/04/14 02:56:49 mrg Exp $  */
+/*     $NetBSD: lesskey.c,v 1.8 2003/04/14 03:02:29 mrg Exp $  */
 
 /*
  * Copyright (C) 1984-2002  Mark Nudelman
@@ -422,7 +422,7 @@
                                case 'e': ch = SK_END; break;
                                case 'x': ch = SK_DELETE; break;
                                default:
-                                       error("illegal char after \\k");
+                                       terror("illegal char after \\k");
                                        *pp = p+1;
                                        return ("");
                                }